Merge branch 'dev' into 'master'

Weekly Merge To Master

See merge request !13

.gitignore

 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
+target/
+.idea/
+*.properties
+*.iml
+bin/
+.settings/
+.classpath
+.project
+
 # User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml

.idea/.gitignore

-# Default ignored files
-/workspace.xml
\ No newline at end of file

.idea/compiler.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <annotationProcessing>
-      <profile name="Maven default annotation processors profile" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <module name="ImageApplication" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
\ No newline at end of file

.idea/encodings.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
-  </component>
-</project>
\ No newline at end of file

.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="MavenProjectsManager">
-    <option name="originalFiles">
-      <list>
-        <option value="$PROJECT_DIR$/pom.xml" />
-      </list>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file

.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

ImageApplication.iml

-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file

README.md

@@ -12,7 +12,7 @@
 
 #### IntelliJ:
 *Follow these steps to run the project:*
-- Open the Maven Projects window in `View -> Tool Windows -> Maven` and click on  `ImageApplication -> Plugins -> javafx -> javafx:run` to execute the project
+- Open the Maven Projects window in `View -> Tool Windows -> Maven` and click on  `ImageApplication -> Plugins -> javafx -> javafx:compile` and then `javafx:run` to execute the project
 
 ## Questions or need help
 *Link to [our wiki](https://gitlab.stud.idi.ntnu.no/eirsteir/team-14-software-engineering/-/wikis/home) page, maybe add contact info*

pom.xml

@@ -10,16 +10,48 @@
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.7.30</version>
+        </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
             <version>13</version>
         </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.19</version>
+        </dependency>
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-fxml</artifactId>
             <version>13</version>
         </dependency>
+        <dependency>
+            <groupId>com.drewnoakes</groupId>
+            <artifactId>metadata-extractor</artifactId>
+            <version>2.13.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>RELEASE</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>3.4.2</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

src/main/java/NTNU/IDATT1002/App.java

 package NTNU.IDATT1002;
 
+import NTNU.IDATT1002.database.DBConnection;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
@@ -8,19 +9,18 @@ import javafx.stage.Stage;
 
 import java.io.IOException;
 
-
 public class App extends Application {
 
     private static Scene scene;
 
     @Override
     public void start(Stage stage) throws IOException {
-        scene = new Scene(loadFXML("primary"));
+        scene = new Scene(loadFXML("login"));
         stage.setScene(scene);
         stage.show();
     }
 
-    static void setRoot(String fxml) throws IOException {
+    public static void setRoot(String fxml) throws IOException {
         scene.setRoot(loadFXML(fxml));
     }
 

src/main/java/NTNU/IDATT1002/PrimaryController.java

-package NTNU.IDATT1002;
-
-import java.io.IOException;
-import javafx.fxml.FXML;
-
-public class PrimaryController {
-
-    @FXML
-    private void switchToSecondary() throws IOException {
-        App.setRoot("secondary");
-    }
-}

src/main/java/NTNU/IDATT1002/SecondaryController.java

-package NTNU.IDATT1002;
-
-import java.io.IOException;
-import javafx.fxml.FXML;
-
-public class SecondaryController {
-
-    @FXML
-    private void switchToPrimary() throws IOException {
-        App.setRoot("primary");
-    }
-}
\ No newline at end of file

src/main/java/NTNU/IDATT1002/controllers/LoggedInController.java

+package NTNU.IDATT1002.controllers;
+
+public class LoggedInController {
+}
\ No newline at end of file

src/main/java/NTNU/IDATT1002/controllers/LoginController.java

+package NTNU.IDATT1002.controllers;
+
+import java.io.IOException;
+
+import NTNU.IDATT1002.App;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+
+public class LoginController {
+
+    @FXML
+    public void switchToSecondary() throws IOException {
+        App.setRoot("signup");
+    }
+
+
+    public void switchToLoggedIn(ActionEvent actionEvent) throws IOException {
+        App.setRoot("logged-in");
+    }
+}

src/main/java/NTNU/IDATT1002/controllers/SignUpController.java

+package NTNU.IDATT1002.controllers;
+
+import java.io.IOException;
+
+import NTNU.IDATT1002.App;
+import javafx.fxml.FXML;
+
+public class SignUpController {
+
+    @FXML
+    public void switchToPrimary() throws IOException {
+        App.setRoot("login");
+    }
+}
\ No newline at end of file

src/main/java/NTNU/IDATT1002/database/DBConnection.java

+package NTNU.IDATT1002.database;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+/**
+ * Class for connecting to the database. This will load configurations and create a connection pool.
+*/
+public class DBConnection {
+
+    private static HikariDataSource dataSource;
+
+    /**
+     * Load configuration and setup the data source
+     */
+    static{
+        HikariConfig config = new HikariConfig("datasource.properties" );
+        dataSource = new HikariDataSource(config);
+    }
+
+    /**
+     * Establish a connection pool to the database
+     *
+     * @return Connection to the database
+     * @throws SQLException
+     */
+    public static Connection getConnection() throws SQLException {
+        return dataSource.getConnection();
+    }
+}
\ No newline at end of file

src/main/java/NTNU/IDATT1002/models/Login.java

+package NTNU.IDATT1002.models;
+
+public class Login {
+
+    private Integer id;
+    private User user;
+    private String password;
+    private String passwordHash;
+    private String passwordSalt;
+
+    public Login() {
+    }
+
+    public Login(int id, User user, String password, String passwordHash, String passwordSalt) {
+        this.id = id;
+        this.user = user;
+        this.password = password;
+        this.passwordHash = passwordHash;
+        this.passwordSalt = passwordSalt;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public User getUser() {
+        return user;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public String getPasswordHash() {
+        return passwordHash;
+    }
+
+    public String getPasswordSalt() {
+        return passwordSalt;
+    }
+}

src/main/java/NTNU/IDATT1002/models/User.java

+package NTNU.IDATT1002.models;
+
+import java.util.Date;
+
+public class User {
+
+    private Integer id;
+    private String email;
+    private String username;
+    private String firstName;
+    private String lastName;
+    private String callingCode;
+    private String phoneNumber;
+    private Date birthDate;
+    private boolean isAdmin;
+    private boolean isActive;
+
+    public User(int id, String email, String username, String firstName, String lastName, String callingCode, String phoneNumber, Date birthDate, boolean isAdmin) {
+        this.id = id;
+        this.email = email;
+        this.username = username;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.callingCode = callingCode;
+        this.phoneNumber = phoneNumber;
+        this.birthDate = birthDate;
+        this.isAdmin = isAdmin;
+        this.isActive = true;
+    }
+
+    public User(User user) {
+        this(user.getId(),
+                user.getEmail(),
+                user.getUsername(),
+                user.getFirstName(),
+                user.getLastName(),
+                user.getCallingCode(),
+                user.getPhoneNumber(),
+                user.getBirthDate(),
+                user.isAdmin());
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public String getCallingCode() {
+        return callingCode;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public Date getBirthDate() {
+        return birthDate;
+    }
+
+    public boolean isAdmin() {
+        return isAdmin;
+    }
+
+    public boolean isActive() {
+        return isActive;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        User user = (User) o;
+        return id.equals(user.id);
+    }
+}

src/main/java/NTNU/IDATT1002/repository/Repository.java

+package NTNU.IDATT1002.repository;
+
+import java.util.Optional;
+
+
+/**
+ * Entity Repository Interface Dummy. Supports regular Create, Read, Update and Delete operations.
+ * @param <T> type of entity
+ * @param <ID> type of entity id
+ */
+public interface Repository<T, ID> {
+
+    /**
+     * Saves a given entity and returns the saved instance.
+     *
+     * @param entity not null
+     * @return the saved entity
+     */
+    T save(T entity) throws IllegalArgumentException;
+
+    /**
+     * Updates the given entity. This will completely override the given instance.
+     *
+     * @param entity not null
+     * @return the updated entity
+     */
+    Optional<T> update(T entity);
+
+    /**
+     * Retrieves all instances of the type.
+     *
+     * @return all entities
+     */
+    Iterable<T> findAll();
+
+    /**
+     * Retrieves an entity with the given id.
+     *
+     * @param id not null
+     * @return the entity with the given id if found, else Optional.empty()
+     */
+    Optional<T> findById(ID id);
+
+    /**
+     * Deletes an entity with the given id.
+     *
+     * @param id not null
+     */
+    void deleteById(ID id);
+
+    /**
+     * Deletes the given entity.
+     *
+     * @param entity not null
+     */
+    void delete(T entity);
+
+    /**
+     * Return the number of entities.
+     *
+     * @return the number of entities.
+     */
+    long count();
+
+    /**
+     * Return whether the given entity exists.
+     *
+     * @param entity not null
+     * @return true if the entity exist, else false
+     */
+    boolean exists(T entity);
+}

src/main/java/NTNU/IDATT1002/repository/UserRepository.java

+package NTNU.IDATT1002.repository;
+
+import NTNU.IDATT1002.models.User;
+
+import java.util.*;
+
+
+/**
+ * User repository to support interacting with a simulated database.
+ */
+public class UserRepository implements Repository<User, Integer> {
+
+    /**
+     * The "database".
+     */
+    private static List<User> users = new ArrayList<>();
+
+    /**
+     * Supply repository with initial test data.
+     */
+    static {
+        users.add(new User(1, "test@mail.com", "test", "Test", "Testesen", "+47", "00000000", new Date(), false));
+        users.add(new User(2, "test2@mail.com", "test2", "Test2", "Testesen2", "+47", "00000001", new Date(), false));
+        users.add(new User(3, "test3@mail.com", "test3", "Test3", "Testesen3", "+47", "00000002", new Date(), false));
+    }
+
+    @Override
+    public User save(User user) throws IllegalArgumentException {
+        if (user == null)
+            throw new IllegalArgumentException("User cannot be null");
+
+        User savedUser = new User(user);
+        users.add(savedUser);
+        return savedUser;
+    }
+
+    @Override
+    public Optional<User> update(User user) {
+        if (user == null)
+            throw new IllegalArgumentException("User cannot be null");
+
+        Optional<User> foundUser = users.stream()
+                .filter(user::equals)
+                .findFirst();
+
+        if (foundUser.isPresent()) {
+            delete(foundUser.get());
+            User updatedUser = save(user);
+            return Optional.of(updatedUser);
+        }
+
+        return Optional.empty();
+    }
+
+    @Override
+    public List<User> findAll() {
+        return users;
+    }
+
+    @Override
+    public Optional<User> findById(Integer id) {
+        return users.stream()
+                .filter(user -> user.getId() == id)
+                .findFirst();
+    }
+
+   public User findByUsername(String username) {
+        return users.stream()
+                .filter(user -> user.getUsername().equals(username))
+                .findFirst()
+                .orElseThrow(NoSuchElementException::new);
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        Optional<User> foundUser = findById(id);
+        foundUser.ifPresent(this::delete);
+    }
+
+    @Override
+    public void delete(User user) {
+        users.remove(user);
+    }
+
+
+    @Override
+    public long count() {
+        return users.size();
+    }
+
+    @Override
+    public boolean exists(User user) {
+        if (user == null)
+            throw new IllegalArgumentException("User cannot be null");
+
+        return users.stream()
+                .anyMatch(user::equals);
+    }
+}