Merge branch 'feature/client_navigation' into feature/client_printExport

client/src/main/java/client/utils/Config.java

@@ -5,14 +5,11 @@ import java.util.List;
 
 public class Config {
 
-    /*
-    Sets parameters for what the config file needs with a config
-     Object that will be used in the ConfigService object
-     */
+
     private String language = "en";
     private String serverUrl = "http://localhost:8080";
 
-    private List<String> favourites = new ArrayList<>();
+    private List<Long> favourites = new ArrayList<>();
     private List<String> shoppingList = new ArrayList<>();
 
     public Config(){}
@@ -25,7 +22,7 @@ public class Config {
         return shoppingList;
     }
 
-    public List<String> getFavourites() {
+    public List<Long> getFavourites() {
         return favourites;
     }
 
@@ -41,7 +38,7 @@ public class Config {
         this.serverUrl = serverUrl;
     }
 
-    public void setFavourites(List<String> favourites) {
+    public void setFavourites(List<Long> favourites) {
         this.favourites = favourites;
     }
 

client/src/main/java/client/utils/ConfigService.java

@@ -1,8 +1,7 @@
 package client.utils;
 
 
-import com.fasterxml.jackson.core.exc.StreamReadException;
-import com.fasterxml.jackson.databind.DatabindException;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 import java.nio.file.Path;
@@ -31,21 +30,18 @@ public class ConfigService {
      */
     private void load(){
         File file = configPath.toFile(); //reads the config file as file
-        if(file.exists()){
+        if (!file.exists()) {           //if file doesn't exist then it creates a config object
+            config = new Config();
+            return;
+        }
+
         try{
             config = mapper.readValue(file, Config.class); //uses Jackson to map the file to the config attribute
 
-            } catch (StreamReadException e) {
-                throw new RuntimeException(e);
-            } catch (DatabindException e) {
-                throw new RuntimeException(e);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
-        }
-        else{
-            config = new Config(); // if file doesn't exist, it creates one
-        }
+
     }
 
     public Path getConfigPath() {

client/src/main/java/client/utils/Navigation.java

@@ -9,17 +9,32 @@ public class Navigation {
     private final MyFXML myFXML;
     private Pane screen;
 
+    /**
+     * Constructs a Navigation Object that uses a fxml object and Pane that will allow to switch UI screens
+     * @param x - a MyFXML Object
+     * @param y - a Pane Object
+     */
     public Navigation(MyFXML x, Pane y){
         this.myFXML = x;
         this.screen = y;
     }
 
+    /**
+     * The show function takes in an FxmlPath and changes the current pane to the value given by the path
+     * using the load function of the myFXML object
+     * @param fxmlpath -  FXML path provided to show the next pane
+     */
     public void show(String fxmlpath){
-        var result = myFXML.load(Object.class, fxmlpath);
-        Parent UIRoot = result.getValue();
-        screen.getChildren().setAll(UIRoot);
-
 
+        try{
+            var result = myFXML.load(Object.class, fxmlpath); //stores the result of the load method in result
+            Parent uiRoot = result.getValue();
+            screen.getChildren().setAll(uiRoot);
+        }
+        catch(Exception e) {        //catches any failures thrown by the load method
+            System.err.println("Failed to load FXML file: " + fxmlpath);
+            throw new IllegalArgumentException("Cannot load FXML file: " + fxmlpath, e);
+        }
     }
 
 

client/src/test/java/client/scenes/ConfigServiceTest.java

@@ -2,10 +2,13 @@ package client.scenes;
 
 import client.utils.Config;
 import client.utils.ConfigService;
+import client.utils.ServerUtils;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.File;
+
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -15,12 +18,23 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ConfigServiceTest {
+    static ServerUtils dv = new ServerUtils();
+
+
+    private static final long TEST_ID_A = 23412L;
+    private static final long TEST_ID_B = 25412L;
+
+    @BeforeEach
+    public void setup(){
+        Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available");
+    }
+
 
     /*
     Tests if the config file loads properly with a prewritten json file
      */
     @Test
-    public void ConfigServiceFileLoadTest(@TempDir Path tempDir) throws IOException {
+    public void configServiceFileLoadTest(@TempDir Path tempDir) throws IOException {
         Path configPath = tempDir.resolve("config.json");
 
         String json = """
@@ -39,9 +53,10 @@ public class ConfigServiceTest {
         assertEquals("de", config.getLanguage());
         assertEquals("http://exmple12.com", config.getServerUrl());
 
-        List<String> x = new ArrayList<>();
-        x.add("banana bread");
-        x.add("pineapple pie");
+        List<Long> x = new ArrayList<>();
+
+        x.add(TEST_ID_A);
+        x.add(TEST_ID_B);
 
         List<String> y = new ArrayList<>();
         y.add("milk");
@@ -56,7 +71,7 @@ public class ConfigServiceTest {
     Tests if the save method saves changes to the config file.
      */
     @Test
-    public void ConfigSaveTest(@TempDir Path tempDir) throws IOException {
+    public void configSaveTest(@TempDir Path tempDir) throws IOException {
         Path configPath = tempDir.resolve("config.json");
         ConfigService configService = new ConfigService(configPath);
 

client/src/test/java/client/scenes/ConfigTest.java

@@ -1,6 +1,9 @@
 package client.scenes;
 
 import client.utils.Config;
+import client.utils.ServerUtils;
+import org.junit.jupiter.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -8,9 +11,21 @@ import java.util.ArrayList;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class ConfigTest {
+    static ServerUtils dv = new ServerUtils();
+
+    private static final long FAV_LIST_ID_1 = 1234L;
+    private static final long FAV_LIST_ID_2 = 1235L;
+
+
+    @BeforeEach
+    public void setup(){
+        Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available");
+    }
+
 
     @Test
-    public void ConfigDefaultValueTest(){
+    public void configDefaultValueTest(){
+
         Config config = new Config();
         assertEquals("en", config.getLanguage());
         assertEquals("http://localhost:8080", config.getServerUrl());
@@ -19,19 +34,19 @@ public class ConfigTest {
     }
 
     @Test
-    public void ConfigGetterTest(){
+    public void configGetterTest(){
         Config config = new Config();
         config.setLanguage("nl");
         config.setServerUrl("http://localhost:8081");
         ArrayList<String> x = new ArrayList<>();
         x.add("Lava Cake");
         x.add("Brownie");
-        config.setFavourites(x);
-        assertEquals(config.getFavourites(), x);
+        ArrayList<Long> y = new ArrayList<>();
+        y.add(FAV_LIST_ID_1);
+        y.add(FAV_LIST_ID_2);
+        config.setFavourites(y);
+        assertEquals(config.getFavourites(), y);
         config.setShoppingList(x);
         assertEquals(config.getShoppingList(), x);
     }
-
-
-
 }