From 0bfff2719e14a62c56633160c545cee3c6eb4b47 Mon Sep 17 00:00:00 2001
From: Rithvik Sriram <r.sriram-1@student.tudelft.nl>
Date: Thu, 4 Dec 2025 22:37:45 +0100
Subject: [PATCH 01/16] fundamental print logic implemented

---
 client/src/main/java/client/utils/PrintExportService.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 client/src/main/java/client/utils/PrintExportService.java

diff --git a/client/src/main/java/client/utils/PrintExportService.java b/client/src/main/java/client/utils/PrintExportService.java
new file mode 100644
index 0000000..cd226fe
--- /dev/null
+++ b/client/src/main/java/client/utils/PrintExportService.java
@@ -0,0 +1,4 @@
+package client.utils;
+
+public class PrintExportService {
+}

From 91fbefb3923d88503ce8e92927809b858c9b9623 Mon Sep 17 00:00:00 2001
From: Rithvik Sriram <r.sriram-1@student.tudelft.nl>
Date: Fri, 5 Dec 2025 13:54:56 +0100
Subject: [PATCH 02/16] Basic print functionality done with comments

---
 .../java/client/utils/PrintExportService.java | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)

diff --git a/client/src/main/java/client/utils/PrintExportService.java b/client/src/main/java/client/utils/PrintExportService.java
index cd226fe..5198c41 100644
--- a/client/src/main/java/client/utils/PrintExportService.java
+++ b/client/src/main/java/client/utils/PrintExportService.java
@@ -1,4 +1,67 @@
 package client.utils;
 
+import commons.Recipe;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
 public class PrintExportService {
+
+    /**
+     * Builds the String with all the recipe data in a human-readable format and returns said string
+     * @param recipe - Recipe Object that needs to be converted
+     * @return - String Result that is the converted recipe object
+     */
+    public static String buildRecipeText(Recipe recipe){
+        String result = "Title: " + recipe.getName() + "\nRecipe ID: " + recipe.getId() + "\n" +
+                "Ingredients: ";  //Starts the string with name and recipe ID
+        for(int i =0; i<recipe.getIngredients().size();i++){ // For loop adding ingredients one by one
+            result +=  recipe.getIngredients().get(i) + ", ";
+        }
+        result += "Steps:\n";
+        for(int i =0; i<recipe.getPreparationSteps().size();i++){ // Preparation Steps separated by new lines
+            result += (i+1) + ": " + recipe.getPreparationSteps().get(i) + "\n";
+        }
+        return result;
+    }
+
+    /**
+     * Method that checks if the directory path of the selected directory is valid and throws and error
+     * if not valid
+     * @param path - Path to directory
+     */
+    public static void validateFolder(Path path){
+        if (path == null) {             //Null path value
+            throw new IllegalArgumentException("Path is empty");
+        }
+        if(!Files.exists(path)){        //If Folder doesn't exist
+            throw new IllegalArgumentException("Folder does not exist");
+        }
+        if(!Files.isDirectory(path)){       // If folder is not directory
+            throw new IllegalArgumentException("Given path is not a folder");
+        }
+    }
+
+    /**
+     * Method that exports a plain-text String of recipe data, into a newly created file from
+     * a selected directory provided as a path to the method and names said file based on the
+     * nameOfFile param
+     * @param recipeData - String containing recipe data that will be written to file
+     * @param dirFilePath - Path to Folder
+     * @param nameOfFile - Name of file to be created
+     */
+    public static void exportToFile(String recipeData, Path dirFilePath, String nameOfFile){
+        validateFolder(dirFilePath); //runs validate Folder method to check if Directory path is valid
+        Path filePath = dirFilePath.resolve(nameOfFile);    //Creates a file with name provided in directory and stores path in PATH object
+        try {
+            Files.writeString(filePath, recipeData); // Writes the recipe data into the File.
+        }
+        catch (IOException e){
+            System.err.println("An error occurred while writing to the file");
+        }
+
+
+    }
 }
+

From 7d32799f13ea19ee1ba559ed38a62adc4d7f04c9 Mon Sep 17 00:00:00 2001
From: Rithvik Sriram <r.sriram-1@student.tudelft.nl>
Date: Fri, 5 Dec 2025 15:21:19 +0100
Subject: [PATCH 03/16] Print export Unit tests are written

---
 .../java/client/utils/PrintExportService.java |  2 +-
 .../java/client/scenes/PrintExportTest.java   | 69 +++++++++++++++++++
 2 files changed, 70 insertions(+), 1 deletion(-)
 create mode 100644 client/src/test/java/client/scenes/PrintExportTest.java

diff --git a/client/src/main/java/client/utils/PrintExportService.java b/client/src/main/java/client/utils/PrintExportService.java
index 5198c41..17c947c 100644
--- a/client/src/main/java/client/utils/PrintExportService.java
+++ b/client/src/main/java/client/utils/PrintExportService.java
@@ -19,7 +19,7 @@ public class PrintExportService {
         for(int i =0; i<recipe.getIngredients().size();i++){ // For loop adding ingredients one by one
             result +=  recipe.getIngredients().get(i) + ", ";
         }
-        result += "Steps:\n";
+        result += "\nSteps:\n";
         for(int i =0; i<recipe.getPreparationSteps().size();i++){ // Preparation Steps separated by new lines
             result += (i+1) + ": " + recipe.getPreparationSteps().get(i) + "\n";
         }
diff --git a/client/src/test/java/client/scenes/PrintExportTest.java b/client/src/test/java/client/scenes/PrintExportTest.java
new file mode 100644
index 0000000..a46be2b
--- /dev/null
+++ b/client/src/test/java/client/scenes/PrintExportTest.java
@@ -0,0 +1,69 @@
+package client.scenes;
+
+import client.utils.PrintExportService;
+import client.utils.ServerUtils;
+import commons.Recipe;
+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.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class PrintExportTest {
+    static ServerUtils dv = new ServerUtils();
+    @BeforeEach
+    public void setup(){
+        Assumptions.assumeTrue(dv.isServerAvailable(), "Server not available");
+    }
+
+    @Test
+    public void buildRecipeTextTest(){
+        List<String> ingredients = new ArrayList<>();
+        ingredients.add("Banana");
+        ingredients.add("Bread");
+        List<String> preparationSteps = new ArrayList<>();
+        preparationSteps.add("Mix Ingredients");
+        preparationSteps.add("Heat in Oven");
+        Recipe recipe1 = new Recipe(1234L, "Banana Bread", ingredients, preparationSteps);
+
+        assertEquals("""
+                Title: Banana Bread
+                Recipe ID: 1234
+                Ingredients: Banana, Bread,\s
+                Steps:
+                1: Mix Ingredients
+                2: Heat in Oven
+                """, PrintExportService.buildRecipeText(recipe1));
+
+    }
+
+    @TempDir
+    Path tempDir;
+    @Test
+    public void validateFolderWithValidFolderTest(){
+        assertDoesNotThrow(() -> PrintExportService.validateFolder(tempDir));
+    }
+
+    @Test
+    public void validateFolderWithNullPathTest(){
+        IllegalArgumentException i = assertThrows(IllegalArgumentException.class,
+                ()->PrintExportService.validateFolder(null));
+        assertEquals("Path is empty", i.getMessage());
+    }
+
+    @Test
+    public void validateFolderWithFilePathTest() throws IOException {
+        Path filePath = Files.createFile(tempDir.resolve("TestFile"));
+        IllegalArgumentException i = assertThrows(IllegalArgumentException.class,
+                ()->PrintExportService.validateFolder(filePath));
+        assertEquals("Given path is not a folder", i.getMessage());
+    }
+
+}

From b38e0e7482d94db613bbcc1b70bad882e8881767 Mon Sep 17 00:00:00 2001
From: Rithvik Sriram <r.sriram-1@student.tudelft.nl>
Date: Fri, 5 Dec 2025 15:27:53 +0100
Subject: [PATCH 04/16] fixed all pipeline errors

---
 client/src/test/java/client/scenes/PrintExportTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/test/java/client/scenes/PrintExportTest.java b/client/src/test/java/client/scenes/PrintExportTest.java
index a46be2b..897c88d 100644
--- a/client/src/test/java/client/scenes/PrintExportTest.java
+++ b/client/src/test/java/client/scenes/PrintExportTest.java
@@ -28,10 +28,11 @@ public class PrintExportTest {
         List<String> ingredients = new ArrayList<>();
         ingredients.add("Banana");
         ingredients.add("Bread");
+        final long testRecipeId = 1234L;
         List<String> preparationSteps = new ArrayList<>();
         preparationSteps.add("Mix Ingredients");
         preparationSteps.add("Heat in Oven");
-        Recipe recipe1 = new Recipe(1234L, "Banana Bread", ingredients, preparationSteps);
+        Recipe recipe1 = new Recipe(testRecipeId, "Banana Bread", ingredients, preparationSteps);
 
         assertEquals("""
                 Title: Banana Bread

From 87f8a883d5197086b0681935a87805103c9dd93c Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Wed, 17 Dec 2025 14:52:40 +0100
Subject: [PATCH 05/16] getUnit() tests

---
 .../java/commons/RecipeIngredientTest.java    | 62 ++++++++++++++++++-
 1 file changed, 61 insertions(+), 1 deletion(-)

diff --git a/commons/src/test/java/commons/RecipeIngredientTest.java b/commons/src/test/java/commons/RecipeIngredientTest.java
index b2d989a..3e516e1 100644
--- a/commons/src/test/java/commons/RecipeIngredientTest.java
+++ b/commons/src/test/java/commons/RecipeIngredientTest.java
@@ -1,4 +1,64 @@
 package commons;
-//should i do it or wait for lines for next week
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 public class RecipeIngredientTest {
+
+    private Recipe recipe;
+    private Ingredient ingredient;
+    private RecipeIngredient recipeIngredient;
+    private RecipeIngredient testIngredient;
+
+    @BeforeEach
+    void setup(){
+        recipe = new Recipe();
+        ingredient = new Ingredient();
+        testIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
+    }
+
+
+    @Test
+    void getFormalUnitTest(){
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"GRAM");
+        assertEquals(Unit.GRAM, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
+        assertEquals(Unit.KILOGRAM, recipeIngredient.getUnit());
+
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"MILLILITER");
+        assertEquals(Unit.MILLILITER, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"LITER");
+        assertEquals(Unit.LITER, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TEASPOON");
+        assertEquals(Unit.TEASPOON, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TABLESPOON");
+        assertEquals(Unit.TABLESPOON, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"CUP");
+        assertEquals(Unit.CUP, recipeIngredient.getUnit());
+
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PIECE");
+        assertEquals(Unit.PIECE, recipeIngredient.getUnit());
+    }
+
+    @Test
+    void getInformalUnitTest(){
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
+        assertEquals(Unit.PINCH, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"HANDFUL");
+        assertEquals(Unit.HANDFUL, recipeIngredient.getUnit());
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
+        assertEquals(Unit.TO_TASTE, recipeIngredient.getUnit());
+    }
+
+    @Test
+    void getUnknownUnitTest(){
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
+        assertNull(recipeIngredient.getUnit());
+    }
+
+
+
 }

From 4a902ead20cf6cd357c76caa24c421bb62e57d8c Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Thu, 18 Dec 2025 00:54:44 +0100
Subject: [PATCH 06/16] ConvertToBaseUnit test + code  fix

---
 commons/src/main/java/commons/RecipeIngredient.java  |  2 +-
 .../src/test/java/commons/RecipeIngredientTest.java  | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/commons/src/main/java/commons/RecipeIngredient.java b/commons/src/main/java/commons/RecipeIngredient.java
index 36488d9..8b18d41 100644
--- a/commons/src/main/java/commons/RecipeIngredient.java
+++ b/commons/src/main/java/commons/RecipeIngredient.java
@@ -69,7 +69,7 @@ public class RecipeIngredient {
 
     public double amountInBaseUnit() {
         Unit unit = getUnit();
-        if (unit == null || unit.isFormal() || unit.conversionFactor <= 0) {
+        if (unit == null || !unit.isFormal() || unit.conversionFactor <= 0) {
             return 0.0;
         }
         return amount * unit.conversionFactor;
diff --git a/commons/src/test/java/commons/RecipeIngredientTest.java b/commons/src/test/java/commons/RecipeIngredientTest.java
index 3e516e1..bdb4c08 100644
--- a/commons/src/test/java/commons/RecipeIngredientTest.java
+++ b/commons/src/test/java/commons/RecipeIngredientTest.java
@@ -11,13 +11,11 @@ public class RecipeIngredientTest {
     private Recipe recipe;
     private Ingredient ingredient;
     private RecipeIngredient recipeIngredient;
-    private RecipeIngredient testIngredient;
 
     @BeforeEach
     void setup(){
         recipe = new Recipe();
         ingredient = new Ingredient();
-        testIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
     }
 
 
@@ -59,6 +57,16 @@ public class RecipeIngredientTest {
         assertNull(recipeIngredient.getUnit());
     }
 
+    @Test
+    void convertToBaseUnit(){
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
+        assertEquals(1000, recipeIngredient.amountInBaseUnit());
 
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
+        assertEquals(0,recipeIngredient.amountInBaseUnit());
+
+        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
+        assertEquals(0,recipeIngredient.amountInBaseUnit());
+    }
 
 }

From fef20ec8760c5ab70334866621c6ff6bb0e6820b Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Thu, 18 Dec 2025 03:35:47 +0100
Subject: [PATCH 07/16] refactor to setters TODO, ingredientController

---
 commons/src/main/java/commons/Ingredient.java             | 4 ++++
 server/src/main/java/server/api/IngredientController.java | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/commons/src/main/java/commons/Ingredient.java b/commons/src/main/java/commons/Ingredient.java
index 23b2223..2ecc532 100644
--- a/commons/src/main/java/commons/Ingredient.java
+++ b/commons/src/main/java/commons/Ingredient.java
@@ -50,6 +50,10 @@ public class Ingredient {
                 + carbsPer100g * KCAL_PER_GRAM_CARBS
                 + fatPer100g * KCAL_PER_GRAM_FAT;
     }
+
+    public void setId(long id) {
+        this.id = id;
+    }
 }
 
 
diff --git a/server/src/main/java/server/api/IngredientController.java b/server/src/main/java/server/api/IngredientController.java
index 7015aca..531b8f3 100644
--- a/server/src/main/java/server/api/IngredientController.java
+++ b/server/src/main/java/server/api/IngredientController.java
@@ -134,8 +134,7 @@ public class IngredientController {
             return ResponseEntity.notFound().build();
         }
 
-        // TODO: Refactor to use setters
-        updated.id = id;
+        updated.setId(id);
         Ingredient savedIngredient = ingredientRepository.save(updated);
         messagingTemplate.convertAndSend(Topics.INGREDIENTS, new CreateIngredientMessage(savedIngredient));
 

From 6794efa3a6e7fe3f213b641ef8d4f2ddb975216a Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Thu, 18 Dec 2025 04:25:42 +0100
Subject: [PATCH 08/16] tested all units conversion and made every unit type a
 field

---
 .../java/commons/RecipeIngredientTest.java    | 97 ++++++++++++-------
 1 file changed, 60 insertions(+), 37 deletions(-)

diff --git a/commons/src/test/java/commons/RecipeIngredientTest.java b/commons/src/test/java/commons/RecipeIngredientTest.java
index bdb4c08..6a08b23 100644
--- a/commons/src/test/java/commons/RecipeIngredientTest.java
+++ b/commons/src/test/java/commons/RecipeIngredientTest.java
@@ -8,65 +8,88 @@ import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class RecipeIngredientTest {
 
-    private Recipe recipe;
-    private Ingredient ingredient;
-    private RecipeIngredient recipeIngredient;
+    private RecipeIngredient gram;
+    private RecipeIngredient kilogram;
+    private RecipeIngredient milliliter;
+    private RecipeIngredient liter;
+    private RecipeIngredient teaspoon;
+    private RecipeIngredient tablespoon;
+    private RecipeIngredient cup;
+    private RecipeIngredient piece;
+    private RecipeIngredient pinch;
+    private RecipeIngredient handful;
+    private RecipeIngredient to_taste;
+    private RecipeIngredient invalid;
 
     @BeforeEach
     void setup(){
-        recipe = new Recipe();
-        ingredient = new Ingredient();
+        Recipe recipe = new Recipe();
+        Ingredient ingredient = new Ingredient();
+        gram = new RecipeIngredient(recipe,ingredient,1,"GRAM");
+        kilogram = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
+
+        milliliter = new RecipeIngredient(recipe,ingredient,1,"MILLILITER");
+        liter = new RecipeIngredient(recipe,ingredient,1,"LITER");
+        teaspoon = new RecipeIngredient(recipe,ingredient,1,"TEASPOON");
+        tablespoon = new RecipeIngredient(recipe,ingredient,1,"TABLESPOON");
+        cup = new RecipeIngredient(recipe,ingredient,1,"CUP");
+        piece = new RecipeIngredient(recipe,ingredient,1,"PIECE");
+        pinch = new RecipeIngredient(recipe,ingredient,1,"PINCH");
+        handful = new RecipeIngredient(recipe,ingredient,1,"HANDFUL");
+        to_taste = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
+
+        invalid = new RecipeIngredient(recipe,ingredient,1,"INVALID");
     }
 
 
     @Test
     void getFormalUnitTest(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"GRAM");
-        assertEquals(Unit.GRAM, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
-        assertEquals(Unit.KILOGRAM, recipeIngredient.getUnit());
+        assertEquals(Unit.GRAM, gram.getUnit());
+        assertEquals(Unit.KILOGRAM, kilogram.getUnit());
+        assertEquals(Unit.MILLILITER, milliliter.getUnit());
+        assertEquals(Unit.LITER, liter.getUnit());
+        assertEquals(Unit.TEASPOON, teaspoon.getUnit());
+        assertEquals(Unit.TABLESPOON, tablespoon.getUnit());
+        assertEquals(Unit.CUP, cup.getUnit());
 
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"MILLILITER");
-        assertEquals(Unit.MILLILITER, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"LITER");
-        assertEquals(Unit.LITER, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TEASPOON");
-        assertEquals(Unit.TEASPOON, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TABLESPOON");
-        assertEquals(Unit.TABLESPOON, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"CUP");
-        assertEquals(Unit.CUP, recipeIngredient.getUnit());
-
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PIECE");
-        assertEquals(Unit.PIECE, recipeIngredient.getUnit());
+        assertEquals(Unit.PIECE, piece.getUnit());
     }
 
     @Test
     void getInformalUnitTest(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
-        assertEquals(Unit.PINCH, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"HANDFUL");
-        assertEquals(Unit.HANDFUL, recipeIngredient.getUnit());
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
-        assertEquals(Unit.TO_TASTE, recipeIngredient.getUnit());
+        assertEquals(Unit.PINCH, pinch.getUnit());
+        assertEquals(Unit.HANDFUL, handful.getUnit());
+        assertEquals(Unit.TO_TASTE, to_taste.getUnit());
     }
 
     @Test
     void getUnknownUnitTest(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
-        assertNull(recipeIngredient.getUnit());
+        assertNull(invalid.getUnit());
     }
 
     @Test
-    void convertToBaseUnit(){
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"KILOGRAM");
-        assertEquals(1000, recipeIngredient.amountInBaseUnit());
+    void convertFormalToBaseUnit(){
+        assertEquals(1000, kilogram.amountInBaseUnit());
 
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"PINCH");
-        assertEquals(0,recipeIngredient.amountInBaseUnit());
+        assertEquals(1,milliliter.amountInBaseUnit());
+        assertEquals(1000.0,liter.amountInBaseUnit());
+        assertEquals(15.0,tablespoon.amountInBaseUnit());
+        assertEquals(5,teaspoon.amountInBaseUnit());
+        assertEquals(240.0,cup.amountInBaseUnit());
 
-        recipeIngredient = new RecipeIngredient(recipe,ingredient,1,"RANDOM");
-        assertEquals(0,recipeIngredient.amountInBaseUnit());
+        assertEquals(1.0,piece.amountInBaseUnit());
+    }
+
+    @Test
+    void convertInformalToBaseUnit(){
+        assertEquals(0,pinch.amountInBaseUnit());
+        assertEquals(0,handful.amountInBaseUnit());
+        assertEquals(0,to_taste.amountInBaseUnit());
+    }
+
+    @Test
+    void convertUnknownToBaseUnit(){
+        assertEquals(0,invalid.amountInBaseUnit());
     }
 
 }

From b553cee6fdb324ba3ee88e714b334656441291e4 Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Thu, 18 Dec 2025 04:27:04 +0100
Subject: [PATCH 09/16] fix checkstyle error

---
 commons/src/test/java/commons/RecipeIngredientTest.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/commons/src/test/java/commons/RecipeIngredientTest.java b/commons/src/test/java/commons/RecipeIngredientTest.java
index 6a08b23..30eb676 100644
--- a/commons/src/test/java/commons/RecipeIngredientTest.java
+++ b/commons/src/test/java/commons/RecipeIngredientTest.java
@@ -18,7 +18,7 @@ public class RecipeIngredientTest {
     private RecipeIngredient piece;
     private RecipeIngredient pinch;
     private RecipeIngredient handful;
-    private RecipeIngredient to_taste;
+    private RecipeIngredient toTaste;
     private RecipeIngredient invalid;
 
     @BeforeEach
@@ -36,7 +36,7 @@ public class RecipeIngredientTest {
         piece = new RecipeIngredient(recipe,ingredient,1,"PIECE");
         pinch = new RecipeIngredient(recipe,ingredient,1,"PINCH");
         handful = new RecipeIngredient(recipe,ingredient,1,"HANDFUL");
-        to_taste = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
+        toTaste = new RecipeIngredient(recipe,ingredient,1,"TO_TASTE");
 
         invalid = new RecipeIngredient(recipe,ingredient,1,"INVALID");
     }
@@ -59,7 +59,7 @@ public class RecipeIngredientTest {
     void getInformalUnitTest(){
         assertEquals(Unit.PINCH, pinch.getUnit());
         assertEquals(Unit.HANDFUL, handful.getUnit());
-        assertEquals(Unit.TO_TASTE, to_taste.getUnit());
+        assertEquals(Unit.TO_TASTE, toTaste.getUnit());
     }
 
     @Test
@@ -84,7 +84,7 @@ public class RecipeIngredientTest {
     void convertInformalToBaseUnit(){
         assertEquals(0,pinch.amountInBaseUnit());
         assertEquals(0,handful.amountInBaseUnit());
-        assertEquals(0,to_taste.amountInBaseUnit());
+        assertEquals(0, toTaste.amountInBaseUnit());
     }
 
     @Test

From bb5e4a85a48ac8462b0f0d0422bcafcc842844fb Mon Sep 17 00:00:00 2001
From: Mei Chang van der Werff <m.c.l.werff@student.tudelft.nl>
Date: Fri, 19 Dec 2025 21:37:15 +0100
Subject: [PATCH 10/16] minutes for meeting week 6

---
 docs/agenda/agenda-05.md | 155 ++++++++++++++++++++++++++++++++-------
 1 file changed, 128 insertions(+), 27 deletions(-)

diff --git a/docs/agenda/agenda-05.md b/docs/agenda/agenda-05.md
index 195b56c..1ddc728 100644
--- a/docs/agenda/agenda-05.md
+++ b/docs/agenda/agenda-05.md
@@ -1,33 +1,134 @@
 # Week 6 meeting agenda
 
-| Key          | Value                                                                                   |
-| ------------ |-----------------------------------------------------------------------------------------|
-| Date         | Dec 18th                                                                                |
-| Time         | 14:45                                                                                   |
-| Location     | Hall D                                                                                  |
-| Chair        | Rithvik Sriram                                                                          |
-| Minute Taker | Mei Chang van der Werff                                                                 |
-| Attendees    | Mei Chang van der Werff, Natalia Cholewa, Rithvik Sriram,  Aysegul Aydinlik, Steven Liu |
+| Key          | Value                                                                                            |
+| ------------ |--------------------------------------------------------------------------------------------------|
+| Date         | Dec 18th                                                                                         |
+| Time         | 14:45                                                                                            |
+| Location     | Hall D                                                                                           |
+| Chair        | Rithvik Sriram                                                                                   |
+| Minute Taker | Mei Chang van der Werff                                                                          |
+| Attendees    | Mei Chang van der Werff, Natalia Cholewa, Rithvik Sriram,  Aysegul Aydinlik, Steven Liu (online) |
 ## Table of contents
-1. (1 min) Introduction by chair
-2. (1 min) Any additions to the agenda? 
-3. (1-2 min) TA announcements? 
-4. (1 min) Go over TA feedback given
-5. (33 min) **Meeting content**
-	1. (5 min) Week 6 progress in terms of completion
-        - How far are we in terms of completion?
-  2.  (5 min) Progress check in terms of feature/issue completion
-        - What have we completed/going to complete this week?
-  3. (3 min) Small Showcase of the product
+* (Steven joins the meeting online)
 
-    4. (20 min) **Sprint planning week 7-8**
-       - What needs to be done?
-       - Handle Backend-Server code delegation
-       - How do we do it?
-       - Who does it?
-      5. (2 min) Designate teams.
-      6. (1 min) Who is the next chair and minute taker?
+1. (1 min) Introduction by chair
+> Meeting starts at **14:46**
+ ---
+
+2. (1 min) Any additions to the agenda?
+> Tomorrow is the deadline for technology, it's best to go over the requirements real quick. \
+> To prevent failing this assignment like the previous 2
+---
+3. (1-2 min) TA announcements?
+> If there are any questions about my feedback ask them now
+4. (1 min) Go over TA feedback given
+>*We've made a little summary of our feedback, and had a few questions*
+> ### _Time Tracking_:
+>- **What exactly is expected from us for the time tracking?** \
+   >We need to do an estimate of how long a task/issue might take. And after implementing it, you have to upload the actual taken time
+>-  **Are the Mr and issues time tracking connected?** \
+    >Yes, but not 100% sure. It's better to double-check it yourself
+>
+>### _Milestones_:
+>- **What was the exact issue, they are too big?** \
+   >Our understanding of milestones is wrong, the milestones should be kinda our weekly tasks deadline. \
+   >And when we don't finish a task it should be moved to the next milestone, of the next week.
+>
+> ### _UserStory (backlog)_:
+>- **How should we do this?** \
+   > You can just put it in the issue description.Don't make it your mr title! \
+   >A different groups makes the user story a parent issue and make children issues with the actual code, but we can choose what we want
+>>For now, we will just put the user Story in the issue description, we will discuss it later if we want to change the method or not
+>
+>
+>### _Commit and MR issues_:
+>- Not all commits are related to the Mr
+>- Our commits are too big, editing ±20 files are way too many. Try too keep it to 3-5 files max.
+>- Also do only client or only server in a commit, don't combine them.
+> - `mvn clean verify` before pushing to check whether the pipeline fails or not
+
+---
+5. (33 min) Meeting content
+* (5 min) Week 6 progress in terms of completion
+    - How far are we in terms of completion?
+>* 4.1 We still need to merge to connection of the print function, the Mr needed some changes but we can do that later. But do Rebase the MR as the branch is behind with A LOT of commits
+>* 4.2 We've done the websockets, we only need to merge it
+>* 4.3 We've done some backend parts but they are not yet connected to the client side
+>* 4.4 The favourite button and message were made this week
+>* 4.4 The search bar is currently in prgress on both the client and server side
+>* 4.5 We keep this for week 8 or next week if there are not enough tasks
+> >Let's focus on just connecting everything next week and after that we can start implementing 4.5
+
+* (5 min) Progress check in terms of feature/issue completion
+    - What have we completed/going to complete this week?
+> **Rithvik**: the backend of the searchbar and favourites is in progress. \
+> **Aysegul**: Made the favourite button and some UI elements, sadly enough no penguin icon yet :< \
+> **Oskar**: Finished the websocket implementation, however there is a small TODO left. Steven is going to do that. Also connected the config \
+> **Mei Chang**: Deleted all the left over example code, made the favourite recipe message(backend), created a test class, made unit use enums and did a small TODO about setters.\
+> **Natalia**: Almost finished the search bar (frontend) and improved testing on the client side. Will do some refactoring tomorrow. \
+> **Steven**: Forgot to ask. But did make the language buttons a dropdown box, and did some other things
+* (3 min) Small Showcase of the product
+>We didn't have a lot of time to review and merge our code, so there is not big difference compared to last week. \
+> We've shown the language dropdown box
+* (20 min) Sprint planning week 7-8
+    - What needs to be done?
+    - Handle Backend-Server code delegation
+    - How do we do it?
+    - Who does it?
+>We didn't really divide the tasks, just the roles. We will distribute tasks on the monday meeting. \
+> We did discuss some things general tasks that need to be done
+>
+> ### Server
+> - Testing
+> - Refactoring (Oskar)
+> - Some backend websocket things
+> - Add more endpoints
+>
+> ### Client
+> - Connecting everything to the UI
+> - Some frontend websocket things
+
+
+* (2 min) Designate teams.
+>There is not a lot of server code that needs to be done so we're keeping the 2/4 server/client distribution this week.\
+> Since there are still 3 people who need their LOC in server they have prioriy
+> - Ayse and Oskar will do Server
+> - The others will do Client
+
+* (1 min) Who is the next chair and minute taker?
+> Mei Chang will be the Chair \
+> Aysegul will be the minute taker
+---
+>### Some Questions
+> **What's the criteria of production code in server?**\
+> Answer: recommendation to do 50/50 or 60/40 production/test code.
+>
+> **Can we copy code from the internet?**\
+> Answer: Yes, but do put the link of where you got the code from in comments
+>
+> **For a test I want to change the gitlab UI, is that allowed?**
+> **And I need to write a docx file for this, is the team fine with that?**\
+> Answer TA: Yes, but make sure it doesn't affect the other teammates \
+> Team: Yeah we're fine with that
+
+---
 6. (2 min) Questions
+> #### We haven't yet talked about the technology requirements.
+> We might didn't split the ui correctly, there is too much logic in it.\
+> Server utils isn't server decorated
+>
+> **What is business logic?** \
+> Something about the fact that not everything should be in the same file, but split across files
+---
 7. (1 min) Summarize everything
-8. (1 min) TA remarks
-**Max time:** ~40 minutes
+>- 3 people still need to do server LOC; Aysegul, Oskar, Mei Chang.
+>- Next week our priority is connecting everything
+>- We need to improve our code contribution and planning based on the feedback
+---
+8. (1 min) TA remarks \
+   Max time: ~40 minutes
+
+> Ta will look at technology on Tuesday
+>
+>Meeting ends: **15:18**\
+>Actual meeting time: 32 minutes 

From 6c7a9434ca50e9e9904affa85140e88617aa410f Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:06:45 +0100
Subject: [PATCH 11/16] chore: create display texts for langs

---
 client/src/main/resources/locale/lang.properties    | 4 ++++
 client/src/main/resources/locale/lang_en.properties | 4 ++++
 client/src/main/resources/locale/lang_nl.properties | 4 ++++
 client/src/main/resources/locale/lang_pl.properties | 4 ++++
 4 files changed, 16 insertions(+)

diff --git a/client/src/main/resources/locale/lang.properties b/client/src/main/resources/locale/lang.properties
index d4f71f4..dc22e10 100644
--- a/client/src/main/resources/locale/lang.properties
+++ b/client/src/main/resources/locale/lang.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Remove Step
 menu.button.edit=Edit
 menu.button.clone=Clone
 menu.button.print=Print recipe
+
+lang.en.display=English
+lang.nl.display=Dutch
+lang.pl.display=Polish
\ No newline at end of file
diff --git a/client/src/main/resources/locale/lang_en.properties b/client/src/main/resources/locale/lang_en.properties
index d4f71f4..874d231 100644
--- a/client/src/main/resources/locale/lang_en.properties
+++ b/client/src/main/resources/locale/lang_en.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Remove Step
 menu.button.edit=Edit
 menu.button.clone=Clone
 menu.button.print=Print recipe
+
+lang.en.display=English
+lang.nl.display=Nederlands
+lang.pl.display=Polski
\ No newline at end of file
diff --git a/client/src/main/resources/locale/lang_nl.properties b/client/src/main/resources/locale/lang_nl.properties
index 9ab41ae..7067697 100644
--- a/client/src/main/resources/locale/lang_nl.properties
+++ b/client/src/main/resources/locale/lang_nl.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Stap verwijderen
 menu.button.edit=Bewerken
 menu.button.clone=Dupliceren
 menu.button.print=Recept afdrukken
+
+lang.en.display=English
+lang.nl.display=Nederlands
+lang.pl.display=Polski
diff --git a/client/src/main/resources/locale/lang_pl.properties b/client/src/main/resources/locale/lang_pl.properties
index 10076de..28b1079 100644
--- a/client/src/main/resources/locale/lang_pl.properties
+++ b/client/src/main/resources/locale/lang_pl.properties
@@ -24,3 +24,7 @@ menu.button.remove.step=Usuń instrukcję
 menu.button.edit=Edytuj
 menu.button.clone=Duplikuj
 menu.button.print=Drukuj przepis
+
+lang.en.display=English
+lang.nl.display=Nederlands
+lang.pl.display=Polski
\ No newline at end of file

From f7ff7497a28da5b868a22cca7449bf2028c8be7e Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:07:15 +0100
Subject: [PATCH 12/16] feat: lang button into combo box

---
 .../client/scenes/FoodpalApplication.fxml     | 63 +++----------------
 1 file changed, 10 insertions(+), 53 deletions(-)

diff --git a/client/src/main/resources/client/scenes/FoodpalApplication.fxml b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
index 27b5bc2..a621046 100644
--- a/client/src/main/resources/client/scenes/FoodpalApplication.fxml
+++ b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
@@ -15,6 +15,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
+<?import javafx.scene.control.ComboBox?>
 <BorderPane prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.FoodpalApplicationCtrl">
 
     <!-- TOP BAR -->
@@ -23,58 +24,12 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-            <GridPane>
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="198.0" minWidth="10.0" prefWidth="130.0" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="2.0" prefWidth="70.0" />
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints maxHeight="54.0" minHeight="10.0" prefHeight="54.0" vgrow="SOMETIMES" />
-                    <RowConstraints maxHeight="25.0" minHeight="6.0" prefHeight="6.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                </rowConstraints>
-                <children>
-
-                    <Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
-                        <font>
-                            <Font name="System Bold" size="29.0" />
-                        </font>
-                    </Label>
-                    <ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.rowIndex="2">
-                        <buttons>
-                            <ToolBar prefHeight="35.0" prefWidth="123.0">
-                                <items>
-                                    <Button fx:id="flagEnButton" minWidth="33.0" onAction="#switchLocale" userData="en" prefHeight="25.0" prefWidth="33.0" text="EN" />
-                                    <Button fx:id="flagNlButton" onAction="#switchLocale" userData="nl" text="NL" />
-                                    <Button fx:id="flagPlButton" onAction="#switchLocale" userData="pl" text="PL" />
-                                </items>
-                            </ToolBar>
-                        </buttons>
-                    </ButtonBar>
-                </children>
-            </GridPane>
-
-            <Pane HBox.hgrow="ALWAYS" />
-
-            <HBox spacing="5" />
-            <GridPane prefHeight="90.0" prefWidth="114.0">
-                <columnConstraints>
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="32.1666259765625" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="24.8333740234375" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="173.0" minWidth="10.0" prefWidth="28.6666259765625" />
-                    <ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="10.0" prefWidth="34.0" />
-                </columnConstraints>
-                <rowConstraints>
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                    <RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                </rowConstraints>
-                <children>
-
-                    <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
-                </children>
-            </GridPane>
-        </HBox>
+            <Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
+                <font>
+                    <Font name="System Bold" size="29.0" />
+                </font>
+            </Label>
+            </HBox>
     </top>
 
     <!-- LEFT: RECIPE LIST -->
@@ -83,7 +38,9 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-
+            <ComboBox fx:id="langSelectMenu" onAction="#switchLocale">
+            </ComboBox>
+            <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
             <Label fx:id="recipesLabel" text="Recipes">
                 <font>
                     <Font name="System Bold" size="15.0" />

From 6b0d728ad326152b9dbe4cee4dc4ae9b39433f85 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:07:32 +0100
Subject: [PATCH 13/16] chore: acquired flag images of langs

---
 client/src/main/resources/flag_en.png | Bin 0 -> 995 bytes
 client/src/main/resources/flag_nl.png | Bin 0 -> 266 bytes
 client/src/main/resources/flag_pl.png | Bin 0 -> 241 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 client/src/main/resources/flag_en.png
 create mode 100644 client/src/main/resources/flag_nl.png
 create mode 100644 client/src/main/resources/flag_pl.png

diff --git a/client/src/main/resources/flag_en.png b/client/src/main/resources/flag_en.png
new file mode 100644
index 0000000000000000000000000000000000000000..7dec928a9c6957fddfbb6e8514e81d0f863484da
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm000XU
z000XU0RWnu7ytkRl}SWFRCt{2nNLVlaRA4^d;4vNwYAniWr+PD7#=e750tY*)<KDR
zDG7y$Xe2W)dC7w!Vh6j_A=8S1NT9^>l7yYS<TP-a3N?fdC1a=|!`||+>FiK%uD8AY
zee<_J?{k~{-tT?CpS|~!{eCjpDa$TI=1spDH|oy^Kd%pu;roN$gyuN;v<t^?Uk`qM
zJMkGe+pMBx<X}XfG0Tty&<;QwNdWBtw2=hR4nP}5sgTpoKn<lr4rY0>2QAGt$R`m>
zg&Zx-HCUeP0aL8kVW77O`5+>+_&{$HiuJm^H6WKoL@K`R*@Wv+KL~#?C!)hrhrYoN
z7_!a4=ii}`J7ts#Iqo!GM2Dpg#d;k8VB52a)#tCV`f3CL?^d_~j%*eYPjL=G0UX&R
zB9Y=8F$HjBvWR4gb1+WRU9eM*xNnw8i)FOMZQ)!!+)u26<u%3%l)STou=Y7P8_duc
zD^T>%0!>Y2TsNorM5OYK^Lqwg0Wn3S3o(mx$UYq^jkqP2s0fY~w+BA|HqM+l7W|tS
zTVmgS{De|LL@Ulg7_}<m1gSg`>3|a|R&fqewm5-bA7_DG;k{A+h6g_P8kG8i<kE{p
zAb{WVU!Xc`!0Bf_g2R;h0;sD><C>BXofd~1u8I{gy)X>4SE|LGQq<Y9kh~W_)`!Q^
zeiL?jeqXLh2El)W`9j{m0+ImQ0cax$pdElVk^tHPXd?-r9e_5H0NMd)BU>G^rTw=6
zJ3WsL+xvvBInsCyn(Fd2CEA08?z^RvL<MN7%dsEX^8OXbdjWADjd^F6;B&7<9V1sC
zfcEkQfT8Qv=U#(%b}9NGnG6RnRmB#-PC4LuJP6i4Cpd;tt5A5a8HM+6Q7;et-4#|G
z)xp*G0<2y5*pE@Ggaxp62V8ye7biL`fXD|UV!%HbiG{{kiIQ>azaEiA1iV|}YXEC^
zz-cnWX)+6zXVfa_+s!CjoIp`$8;DMe6}JbiU86A6c4OhIE5UlPS@`OLp|%^XU87iW
zd*Z&16Hzj5g~k|uND^{3C~S&D=o{a!!%?4q2QNpaFl3tvJ0pyR&=Wzjp*SBgMG&XS
zEI2sRit`aeM8rif(~I*-MZ|vsvaL9uWJC}k`-}5QL<G^dn{%c(pLj%&qRut|xmBD`
zG!Z11i}Q&jf*5MMbG|sAP!UYNl@G<|-;wqMBmuMo&_)tKI{<AY0ki|q<_~h4d$(7M
RE(8Do002ovPDHLkV1gSPx_<xw

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/flag_nl.png b/client/src/main/resources/flag_nl.png
new file mode 100644
index 0000000000000000000000000000000000000000..75f9e527498e0a63223903f283ba8f94c9ae6063
GIT binary patch
literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;if@
zi(^Q|oVPa&1(^axjt1B@^GI3stg+k^5V(dR=E9?7$77mtixei$ynW~Eo_qDn56;=z
zu#6$fA(%mTfo6l)1rZ1C46X&NCaf2jW-(<j`Z8_-OB>rA__gob#pN%o`jSf;J_>8#
rRthsI=G%97>ws&y)g@hi#MvO<Q^fn7Q-4km&>sw*u6{1-oD!M<^3+%V

literal 0
HcmV?d00001

diff --git a/client/src/main/resources/flag_pl.png b/client/src/main/resources/flag_pl.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a2c9df1c19d02550bfc413971a207a42cad8f07
GIT binary patch
literal 241
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkP;jxQ
zi(^Q|oVT|e1se<mSR9+!o;<kE5~p|Kh5Is5pSRW5&%Ak^u$}LMlmmMP?*is6Y!?`#
zm|rlgWh`m9#$e@;%^<tLv;nX5+V_>e+2^bwUIUtWxA?!mWLvZ%{^mxYa~V8c{an^L
HB{Ts5hXPI$

literal 0
HcmV?d00001


From 7e69976e5ef918c81b136499439ac62634c49804 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Tue, 16 Dec 2025 13:09:03 +0100
Subject: [PATCH 14/16] feat: controller for language list control

---
 .../client/scenes/FoodpalApplicationCtrl.java | 109 ++++++++++++------
 1 file changed, 73 insertions(+), 36 deletions(-)

diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
index bcb6f44..6dd2841 100644
--- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
+++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
@@ -2,6 +2,7 @@ package client.scenes;
 
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
@@ -9,11 +10,11 @@ import java.util.Locale;
 import client.exception.UpdateException;
 import client.scenes.recipe.IngredientListCtrl;
 import client.scenes.recipe.RecipeStepListCtrl;
+
 import client.utils.DefaultRecipeFactory;
 import client.utils.LocaleAware;
 import client.utils.LocaleManager;
 import client.utils.ServerUtils;
-
 import commons.Recipe;
 
 import jakarta.inject.Inject;
@@ -21,14 +22,18 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
+import javafx.scene.control.ComboBox;
 import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
+import javafx.util.StringConverter;
 
 public class FoodpalApplicationCtrl implements LocaleAware {
     private final ServerUtils server;
@@ -39,21 +44,10 @@ public class FoodpalApplicationCtrl implements LocaleAware {
     public VBox detailsScreen;
     public HBox editableTitleArea;
 
-
-    // all of these aren't used with only my part of the code
-    // everything in the top bar ===
-    @FXML
-    private Button flagEnButton;   //already here for advanced stuff
-
-    @FXML
-    private Button flagNlButton;   //already here for advanced stuff
-
-    @FXML
-    private Button flagPlButton;   //already here for advanced stuff
-
     // everything in the left lane
     @FXML
     public Label recipesLabel;
+    public ComboBox<String> langSelectMenu;
 
     @FXML
     private ListView<Recipe> recipeList;
@@ -90,9 +84,30 @@ public class FoodpalApplicationCtrl implements LocaleAware {
         this.ingredientListCtrl = ingredientListCtrl;
         this.stepListCtrl = stepListCtrl;
     }
-    @Override
-    public void initializeComponents() {
-        // TODO Reduce code duplication??
+    private void initRecipeList() {
+        // Show recipe name in the list
+        recipeList.setCellFactory(list -> new ListCell<>() {
+            @Override
+            protected void updateItem(Recipe item, boolean empty) {
+                super.updateItem(item, empty);
+                setText(empty || item == null ? "" : item.getName());
+            }
+        });
+
+        // When your selection changes, update details in the panel
+        recipeList.getSelectionModel().selectedItemProperty().addListener(
+                (obs, oldRecipe, newRecipe) -> showRecipeDetails(newRecipe)
+        );
+
+        // Double-click to go to detail screen
+        recipeList.setOnMouseClicked(event -> {
+            final int DOUBLE_CLICK = 2;   //to not get magic number:P
+            if (event.getClickCount() == DOUBLE_CLICK) {
+                openSelectedRecipe();
+            }
+        });
+    }
+    private void initStepsIngredientsList() {
         // Initialize callback for ingredient list updates
         this.ingredientListCtrl.setUpdateCallback(newList -> {
             Recipe selectedRecipe = recipeList.getSelectionModel().getSelectedItem();
@@ -122,28 +137,50 @@ public class FoodpalApplicationCtrl implements LocaleAware {
                 throw new UpdateException("Unable to update recipe to server for " + selectedRecipe);
             }
         });
-        // Show recipe name in the list
-        recipeList.setCellFactory(list -> new ListCell<>() {
+    }
+    @Override
+    public void initializeComponents() {
+        // TODO Reduce code duplication??
+        langSelectMenu.getItems().setAll("en", "pl", "nl");
+        langSelectMenu.setConverter(new StringConverter<String>() {
             @Override
-            protected void updateItem(Recipe item, boolean empty) {
+            public String toString(String s) {
+                if (s == null) {
+                    return "";
+                }
+                return getLocaleString("lang." + s + ".display");
+            }
+
+            @Override
+            public String fromString(String s) {
+                return s;
+            }
+        });
+        langSelectMenu.setCellFactory(list -> new ListCell<>() {
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                final int IMAGE_HEIGHT = 32;
+                final int HBOX_SPACING = 10;
                 super.updateItem(item, empty);
-                setText(empty || item == null ? "" : item.getName());
+                if (item == null || empty) {
+                    setText(null);
+                    setGraphic(null);
+                } else {
+                    InputStream imageStream = getClass().getResourceAsStream("/flag_" + item + ".png");
+                    if (imageStream == null) {
+                        setGraphic(new HBox(new Label(getLocaleString("lang." + item + ".display"))));
+                        return;
+                    }
+                    Image img = new Image(imageStream);
+                    ImageView imageView = new ImageView(img);
+                    imageView.setFitHeight(IMAGE_HEIGHT);
+                    imageView.setFitWidth(IMAGE_HEIGHT);
+                    setGraphic(new HBox(HBOX_SPACING, imageView, new Label(getLocaleString("lang." + item + ".display"))));
+                }
             }
         });
-
-        // When your selection changes, update details in the panel
-        recipeList.getSelectionModel().selectedItemProperty().addListener(
-                (obs, oldRecipe, newRecipe) -> showRecipeDetails(newRecipe)
-        );
-
-        // Double-click to go to detail screen
-        recipeList.setOnMouseClicked(event -> {
-            final int DOUBLE_CLICK = 2;   //to not get magic number:P
-            if (event.getClickCount() == DOUBLE_CLICK) {
-                openSelectedRecipe();
-            }
-        });
-
+        initStepsIngredientsList();
+        initRecipeList();
         refresh();
     }
     private void showName(String name) {
@@ -298,8 +335,8 @@ public class FoodpalApplicationCtrl implements LocaleAware {
     // Language buttons
     @FXML
     private void switchLocale(ActionEvent event) {
-        Button button = (Button)event.getSource();
-        String lang = (String)button.getUserData();
+        System.out.println("switching");
+        String lang = langSelectMenu.getSelectionModel().getSelectedItem();
         localeManager.setLocale(Locale.of(lang));
     }
 

From ca7c5cbfb9385dbf370effa9e59336c2ea49c350 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Fri, 19 Dec 2025 23:29:27 +0200
Subject: [PATCH 15/16] fix(logic): immigrates LangSelectMenu to own controller

fix(println): also disappears the debug println statement from prod code
TODO: in the distant future, consider using a nice logging framework
(log4j?? or whatever spring boot is using..)
---
 .../client/scenes/FoodpalApplicationCtrl.java |  52 ---------
 .../client/scenes/LangSelectMenuCtrl.java     | 100 ++++++++++++++++++
 .../client/scenes/FoodpalApplication.fxml     |   3 +-
 .../resources/client/scenes/LangSelect.fxml   |  16 +++
 4 files changed, 117 insertions(+), 54 deletions(-)
 create mode 100644 client/src/main/java/client/scenes/LangSelectMenuCtrl.java
 create mode 100644 client/src/main/resources/client/scenes/LangSelect.fxml

diff --git a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
index 6dd2841..16acd3a 100644
--- a/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
+++ b/client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
@@ -2,10 +2,8 @@ package client.scenes;
 
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Collections;
 import java.util.List;
-import java.util.Locale;
 
 import client.exception.UpdateException;
 import client.scenes.recipe.IngredientListCtrl;
@@ -18,7 +16,6 @@ import client.utils.ServerUtils;
 import commons.Recipe;
 
 import jakarta.inject.Inject;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
@@ -27,13 +24,10 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ListCell;
 import javafx.scene.control.ListView;
 import javafx.scene.control.TextField;
-import javafx.scene.image.Image;
-import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyCode;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Font;
-import javafx.util.StringConverter;
 
 public class FoodpalApplicationCtrl implements LocaleAware {
     private final ServerUtils server;
@@ -141,44 +135,7 @@ public class FoodpalApplicationCtrl implements LocaleAware {
     @Override
     public void initializeComponents() {
         // TODO Reduce code duplication??
-        langSelectMenu.getItems().setAll("en", "pl", "nl");
-        langSelectMenu.setConverter(new StringConverter<String>() {
-            @Override
-            public String toString(String s) {
-                if (s == null) {
-                    return "";
-                }
-                return getLocaleString("lang." + s + ".display");
-            }
 
-            @Override
-            public String fromString(String s) {
-                return s;
-            }
-        });
-        langSelectMenu.setCellFactory(list -> new ListCell<>() {
-            @Override
-            protected void updateItem(String item, boolean empty) {
-                final int IMAGE_HEIGHT = 32;
-                final int HBOX_SPACING = 10;
-                super.updateItem(item, empty);
-                if (item == null || empty) {
-                    setText(null);
-                    setGraphic(null);
-                } else {
-                    InputStream imageStream = getClass().getResourceAsStream("/flag_" + item + ".png");
-                    if (imageStream == null) {
-                        setGraphic(new HBox(new Label(getLocaleString("lang." + item + ".display"))));
-                        return;
-                    }
-                    Image img = new Image(imageStream);
-                    ImageView imageView = new ImageView(img);
-                    imageView.setFitHeight(IMAGE_HEIGHT);
-                    imageView.setFitWidth(IMAGE_HEIGHT);
-                    setGraphic(new HBox(HBOX_SPACING, imageView, new Label(getLocaleString("lang." + item + ".display"))));
-                }
-            }
-        });
         initStepsIngredientsList();
         initRecipeList();
         refresh();
@@ -331,15 +288,6 @@ public class FoodpalApplicationCtrl implements LocaleAware {
         edit.requestFocus();
     }
 
-
-    // Language buttons
-    @FXML
-    private void switchLocale(ActionEvent event) {
-        System.out.println("switching");
-        String lang = langSelectMenu.getSelectionModel().getSelectedItem();
-        localeManager.setLocale(Locale.of(lang));
-    }
-
     @FXML
     private void makePrintable() {
         System.out.println("Recipe printed");
diff --git a/client/src/main/java/client/scenes/LangSelectMenuCtrl.java b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java
new file mode 100644
index 0000000..1df3e54
--- /dev/null
+++ b/client/src/main/java/client/scenes/LangSelectMenuCtrl.java
@@ -0,0 +1,100 @@
+package client.scenes;
+
+import client.utils.LocaleAware;
+import client.utils.LocaleManager;
+import com.google.inject.Inject;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.ComboBox;
+import javafx.scene.control.Label;
+import javafx.scene.control.ListCell;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.util.StringConverter;
+
+import java.io.InputStream;
+import java.util.Locale;
+
+/**
+ * The language selection menu controller.
+ * This needs to implement {@link LocaleAware LocaleAware} so that the
+ * <code>getLocaleString(String)</code> function is available.
+ */
+public class LangSelectMenuCtrl implements LocaleAware {
+    public ComboBox<String> langSelectMenu;
+    private final LocaleManager manager;
+
+    @Inject
+    public LangSelectMenuCtrl(LocaleManager manager) {
+        this.manager = manager;
+    }
+
+    /**
+     * Switches the locale of the application depending on which button the user selects in the list.
+     * @param event The action event triggered by the user.
+     */
+    @FXML
+    private void switchLocale(ActionEvent event) {
+        String lang = langSelectMenu.getSelectionModel().getSelectedItem();
+        manager.setLocale(Locale.of(lang));
+    }
+
+    @Override
+    public void initializeComponents() {
+        langSelectMenu.getItems().setAll("en", "pl", "nl");
+        langSelectMenu.setConverter(new StringConverter<String>() {
+            @Override
+            public String toString(String s) {
+                if (s == null) {
+                    return "";
+                }
+                return getLocaleString("lang." + s + ".display");
+            }
+
+            @Override
+            public String fromString(String s) {
+                return s;
+            }
+        });
+        langSelectMenu.setCellFactory(list -> new ListCell<>() {
+            @Override
+            protected void updateItem(String item, boolean empty) {
+                final int IMAGE_HEIGHT = 32;
+                final int HBOX_SPACING = 10;
+                super.updateItem(item, empty);
+                if (item == null || empty) {
+                    setText(null);
+                    setGraphic(null);
+                    return;
+                }
+                InputStream imageStream = getClass().getResourceAsStream("/flag_" + item + ".png");
+                if (imageStream == null) {
+                    setGraphic(new HBox(new Label(getLocaleString("lang." + item + ".display"))));
+                    return;
+                }
+                Image img = new Image(imageStream);
+                ImageView imageView = new ImageView(img);
+                imageView.setFitHeight(IMAGE_HEIGHT);
+                imageView.setFitWidth(IMAGE_HEIGHT);
+                setGraphic(
+                        new HBox(
+                                HBOX_SPACING,
+                                imageView,
+                                new Label(getLocaleString("lang." + item + ".display"))
+                        )
+                );
+            }
+        });
+    }
+
+    @Override
+    public void updateText() {
+        // doesn't do anything; the text doesn't need to be updated.
+    }
+
+    @Override
+    public LocaleManager getLocaleManager() {
+        return manager;
+    }
+}
diff --git a/client/src/main/resources/client/scenes/FoodpalApplication.fxml b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
index a621046..b9edd58 100644
--- a/client/src/main/resources/client/scenes/FoodpalApplication.fxml
+++ b/client/src/main/resources/client/scenes/FoodpalApplication.fxml
@@ -38,8 +38,7 @@
             <padding>
                 <Insets bottom="10" left="10" right="10" top="10" />
             </padding>
-            <ComboBox fx:id="langSelectMenu" onAction="#switchLocale">
-            </ComboBox>
+            <fx:include source="LangSelect.fxml" />
             <Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
             <Label fx:id="recipesLabel" text="Recipes">
                 <font>
diff --git a/client/src/main/resources/client/scenes/LangSelect.fxml b/client/src/main/resources/client/scenes/LangSelect.fxml
new file mode 100644
index 0000000..b72080d
--- /dev/null
+++ b/client/src/main/resources/client/scenes/LangSelect.fxml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<ComboBox
+        fx:id="langSelectMenu"
+        xmlns="http://javafx.com/javafx/25"
+        xmlns:fx="http://javafx.com/fxml/1"
+        onAction="#switchLocale"
+        fx:controller="client.scenes.LangSelectMenuCtrl"
+>
+</ComboBox>

From dee91f9245d4c700e30f297ee54f6dcca4afb4d8 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Sat, 20 Dec 2025 00:31:44 +0200
Subject: [PATCH 16/16] fix: add period to PrintExportService as MR written
 before new checkstyle

---
 client/src/main/java/client/utils/PrintExportService.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/client/src/main/java/client/utils/PrintExportService.java b/client/src/main/java/client/utils/PrintExportService.java
index 17c947c..624d4d1 100644
--- a/client/src/main/java/client/utils/PrintExportService.java
+++ b/client/src/main/java/client/utils/PrintExportService.java
@@ -9,7 +9,7 @@ import java.nio.file.Path;
 public class PrintExportService {
 
     /**
-     * Builds the String with all the recipe data in a human-readable format and returns said string
+     * Builds the String with all the recipe data in a human-readable format and returns said string.
      * @param recipe - Recipe Object that needs to be converted
      * @return - String Result that is the converted recipe object
      */
@@ -27,7 +27,7 @@ public class PrintExportService {
     }
 
     /**
-     * Method that checks if the directory path of the selected directory is valid and throws and error
+     * Method that checks if the directory path of the selected directory is valid and throws and error.
      * if not valid
      * @param path - Path to directory
      */
@@ -46,7 +46,7 @@ public class PrintExportService {
     /**
      * Method that exports a plain-text String of recipe data, into a newly created file from
      * a selected directory provided as a path to the method and names said file based on the
-     * nameOfFile param
+     * nameOfFile param.
      * @param recipeData - String containing recipe data that will be written to file
      * @param dirFilePath - Path to Folder
      * @param nameOfFile - Name of file to be created