From 591306e6fc6ebd3194f42a0f770f9e1172900271 Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 03:45:00 +0700
Subject: [PATCH 1/9] Refactor: Update class visibility and improve code
 readability

- Changed public class declarations to package-private for test classes.
- Introduced constants for repeated string literals (e.g., admin username).
- Simplified XML file loading logic in PostDataRepository.
- Added helper methods in NutritionParserTest to reduce assertion count and improve readability.
- Updated FXML test cases to use text blocks for better formatting.
- Ensured consistent method visibility across test classes.
---
 .../repository/LocalUserDataRepository.java   |  12 +-
 .../repository/PostDataRepository.java        |  57 ++++--
 .../com/starlight/util/FXMLVerificator.java   |   3 +
 .../java/com/starlight/util/ImageUtils.java   |   8 +-
 .../com/starlight/util/NutritionParser.java   |   8 +-
 .../com/starlight/api/ChatbotAPITest.java     | 108 ++++++-----
 .../com/starlight/api/UserApiServerTest.java  |   2 +-
 .../AuthorizationControllerTest.java          |   2 +-
 .../controller/ConsultControllerTest.java     |   6 +-
 .../controller/LoadingControllerTest.java     |   2 +-
 .../controller/SettingControllerTest.java     |  10 +-
 .../model/PostDataRepositoryTest.java         |   2 +-
 .../starlight/model/PostLikedStateTest.java   |   2 +-
 .../java/com/starlight/model/PostTest.java    |   2 +-
 .../model/UserDataRepositoryTest.java         |   2 +-
 .../java/com/starlight/model/UserTest.java    |   2 +-
 .../util/DataRepositoryIntegrationTest.java   |   2 +-
 .../com/starlight/util/FXMLLoadingTest.java   |   2 +-
 .../starlight/util/FXMLVerificatorTest.java   | 176 +++++++++--------
 .../starlight/util/FileSystemAccessTest.java  |   2 +-
 .../starlight/util/NutritionParserTest.java   | 183 ++++++++++--------
 .../java/com/starlight/util/SessionTest.java  |   2 +-
 22 files changed, 333 insertions(+), 262 deletions(-)

diff --git a/src/main/java/com/starlight/repository/LocalUserDataRepository.java b/src/main/java/com/starlight/repository/LocalUserDataRepository.java
index bd95ce4..d29f67c 100644
--- a/src/main/java/com/starlight/repository/LocalUserDataRepository.java
+++ b/src/main/java/com/starlight/repository/LocalUserDataRepository.java
@@ -20,6 +20,8 @@
 public class LocalUserDataRepository {
     private static final Logger logger = Logger.getLogger(LocalUserDataRepository.class.getName());
     private static final String LOCAL_XML_PATH = "src/main/java/com/starlight/data/LocalUserData.xml";
+    // Reused default admin username literal
+    private static final String ADMIN_USERNAME = "admin";
     
     private final XStream xstream;
     private List<User> cachedUsers;
@@ -84,9 +86,9 @@ public List<User> loadUsers() {
     private List<User> createDefaultUsers() {
         List<User> defaultUsers = new ArrayList<>();
         
-        // Create admin user
-        User admin = new User();
-        admin.username = "admin";
+    // Create admin user
+    User admin = new User();
+    admin.username = ADMIN_USERNAME;
         admin.email = "admin@tabemonpal.local";
         admin.fullname = "Administrator";
         admin.password = "admin123";
@@ -163,7 +165,7 @@ public User validateCredentials(String usernameOrEmail, String password) {
      * @return true if user is admin, false otherwise
      */
     public boolean isAdmin(User user) {
-        return user != null && user.username != null && user.username.toLowerCase().equals("admin");
+    return user != null && user.username != null && user.username.toLowerCase().equals(ADMIN_USERNAME);
     }
 
     /**
@@ -171,7 +173,7 @@ public boolean isAdmin(User user) {
      * @return Admin user or null if not found
      */
     public User getAdminUser() {
-        return findUser("admin");
+    return findUser(ADMIN_USERNAME);
     }
 
     /**
diff --git a/src/main/java/com/starlight/repository/PostDataRepository.java b/src/main/java/com/starlight/repository/PostDataRepository.java
index 7092daa..50d185b 100644
--- a/src/main/java/com/starlight/repository/PostDataRepository.java
+++ b/src/main/java/com/starlight/repository/PostDataRepository.java
@@ -66,38 +66,53 @@ public List<Post> loadPosts(boolean useDummy) {
         return loadPosts(useDummy, false);
     }
 
-    @SuppressWarnings("unchecked")
     private List<Post> loadPosts(boolean useDummy, boolean fallbackToDummyIfMissing) {
+        File xmlFile = resolveXmlFile(useDummy, fallbackToDummyIfMissing);
+        if (xmlFile == null) return new ArrayList<>();
+
+        List<Post> posts = readPostsFromFile(xmlFile);
+        if (posts == null) return new ArrayList<>();
+
+        initializeMissingFields(posts);
+        return posts;
+    }
+
+    /** Resolve which XML file to read based on flags; returns null if none available. */
+    private File resolveXmlFile(boolean useDummy, boolean fallbackToDummyIfMissing) {
         File xmlFile = new File(useDummy ? DUMMY_XML_PATH : xmlPath);
-        if (!xmlFile.exists() || xmlFile.length() == 0) {
-            if (!useDummy && fallbackToDummyIfMissing) {
-                xmlFile = new File(DUMMY_XML_PATH);
-                if (!xmlFile.exists()) {
-                    return new ArrayList<>();
-                }
-            } else {
-                return new ArrayList<>();
+        if (xmlFile.exists() && xmlFile.length() > 0) {
+            return xmlFile;
+        }
+
+        if (!useDummy && fallbackToDummyIfMissing) {
+            File dummy = new File(DUMMY_XML_PATH);
+            if (dummy.exists() && dummy.length() > 0) {
+                return dummy;
             }
         }
+
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    private List<Post> readPostsFromFile(File xmlFile) {
         try (FileInputStream fis = new FileInputStream(xmlFile)) {
             Object obj = xstream.fromXML(fis);
             if (obj instanceof List) {
-                List<Post> posts = (List<Post>) obj;
-                // Initialize missing fields for existing posts
-                for (Post post : posts) {
-                    if (post.commentcount == null) {
-                        post.commentcount = "0";
-                    }
-                    if (post.isLiked == null) {
-                        post.isLiked = "false";
-                    }
-                }
-                return posts;
+                return (List<Post>) obj;
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
-        return new ArrayList<>();
+        return null;
+    }
+
+    /** Ensure required fields are present on loaded posts. */
+    private void initializeMissingFields(List<Post> posts) {
+        for (Post post : posts) {
+            if (post.commentcount == null) post.commentcount = "0";
+            if (post.isLiked == null) post.isLiked = "false";
+        }
     }
 
     /**
diff --git a/src/main/java/com/starlight/util/FXMLVerificator.java b/src/main/java/com/starlight/util/FXMLVerificator.java
index ff38743..ac657ba 100644
--- a/src/main/java/com/starlight/util/FXMLVerificator.java
+++ b/src/main/java/com/starlight/util/FXMLVerificator.java
@@ -11,6 +11,9 @@
  * by JavaFX.
  */
 public class FXMLVerificator {
+
+    private FXMLVerificator() {}
+
     private static final Logger logger = Logger.getLogger(FXMLVerificator.class.getName());
 
     // You can customize these
diff --git a/src/main/java/com/starlight/util/ImageUtils.java b/src/main/java/com/starlight/util/ImageUtils.java
index 1f3da39..5f5752f 100644
--- a/src/main/java/com/starlight/util/ImageUtils.java
+++ b/src/main/java/com/starlight/util/ImageUtils.java
@@ -13,6 +13,8 @@
  * Contains methods for loading and scaling images with proper fallback handling.
  */
 public class ImageUtils {
+
+    private ImageUtils() {}
     
     /** Default path to the missing image placeholder */
     public static final String DEFAULT_MISSING_IMAGE = "/com/starlight/images/missing.png";
@@ -42,8 +44,10 @@ public static void scaleToFit(ImageView imageView, double frameWidth, double fra
         double imageAspect = imageWidth / imageHeight;
         double frameAspect = frameWidth / frameHeight;
 
-        double newWidth, newHeight;
-        double xOffset = 0, yOffset = 0;
+        double newWidth; 
+        double newHeight;
+        double xOffset = 0; 
+        double yOffset = 0;
 
         // Determine the cropping area
         if (imageAspect > frameAspect) {
diff --git a/src/main/java/com/starlight/util/NutritionParser.java b/src/main/java/com/starlight/util/NutritionParser.java
index cfd363a..13c849d 100644
--- a/src/main/java/com/starlight/util/NutritionParser.java
+++ b/src/main/java/com/starlight/util/NutritionParser.java
@@ -165,7 +165,7 @@ private Nutrition.Protein parseProteinValue(String content, String tagName, Stri
     /**
      * Parses fat values from XML content.
      */
-    private Nutrition.Fat parseFatValue(String content, String tagName, String defaultUnit) {
+    private Nutrition.Fat parseFatValue(String content, String tagName) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
@@ -184,7 +184,7 @@ private Nutrition.Fat parseFatValue(String content, String tagName, String defau
     /**
      * Parses carbohydrates values from XML content.
      */
-    private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String tagName, String defaultUnit) {
+    private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String tagName) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
@@ -203,7 +203,7 @@ private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String t
     /**
      * Parses fiber values from XML content.
      */
-    private Nutrition.Fiber parseFiberValue(String content, String tagName, String defaultUnit) {
+    private Nutrition.Fiber parseFiberValue(String content, String tagName) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
@@ -241,7 +241,7 @@ private Nutrition.Sugar parseSugarValue(String content, String tagName, String d
     /**
      * Parses salt values from XML content.
      */
-    private Nutrition.Salt parseSaltValue(String content, String tagName, String defaultUnit) {
+    private Nutrition.Salt parseSaltValue(String content, String tagName) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
diff --git a/src/test/java/com/starlight/api/ChatbotAPITest.java b/src/test/java/com/starlight/api/ChatbotAPITest.java
index 2f69744..4aa0490 100644
--- a/src/test/java/com/starlight/api/ChatbotAPITest.java
+++ b/src/test/java/com/starlight/api/ChatbotAPITest.java
@@ -7,16 +7,16 @@
 /**
  * Test class for ChatbotAPI.
  */
-public class ChatbotAPITest {
+class ChatbotAPITest {
     
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         // Note: This test won't actually create the ChatbotAPI since it requires a valid API key
         // We'll test the structure and error handling instead
     }
     
     @Test
-    public void testChatbotExceptionCreation() {
+    void testChatbotExceptionCreation() {
         // Test exception creation
         ChatbotAPI.ChatbotException exception = new ChatbotAPI.ChatbotException("Test message");
         assertEquals("Test message", exception.getMessage());
@@ -28,7 +28,7 @@ public void testChatbotExceptionCreation() {
     }
     
     @Test
-    public void testConfigCreation() {
+    void testConfigCreation() {
         // Test config object creation
         ChatbotAPI.Config config = new ChatbotAPI.Config();
         assertNull(config.getOpenaiKey());
@@ -38,7 +38,7 @@ public void testConfigCreation() {
     }
     
     @Test
-    public void testChatbotInitializationWithoutValidKey() {
+    void testChatbotInitializationWithoutValidKey() {
         // The ChatbotAPI should initialize successfully
         ChatbotAPI chatbot = new ChatbotAPI();
         
@@ -48,7 +48,7 @@ public void testChatbotInitializationWithoutValidKey() {
             // If we get here, either demo mode is working or API key is configured
             assertTrue(response.contains("demo mode") || 
                       response.contains("configure your OpenAI API key") || 
-                      response.length() > 0); // Any non-empty response is acceptable
+                      !response.isEmpty()); // Any non-empty response is acceptable
         } catch (ChatbotAPI.ChatbotException e) {
             // This is also acceptable - it means the API key is missing or there's an error
             assertTrue(e.getMessage().contains("demo mode") || 
@@ -58,58 +58,62 @@ public void testChatbotInitializationWithoutValidKey() {
     }
     
     @Test
-    public void testJsonResponseParsing() throws ChatbotAPI.ChatbotException {
+    void testJsonResponseParsing() throws ChatbotAPI.ChatbotException {
         // Test the improved JSON parsing with a mock OpenAI API response
         ChatbotAPI chatbot = new ChatbotAPI();
         
         // Mock OpenAI API response format
-        String mockResponse = "{\n" +
-                "  \"id\": \"chatcmpl-123\",\n" +
-                "  \"object\": \"chat.completion\",\n" +
-                "  \"created\": 1677652288,\n" +
-                "  \"model\": \"gpt-3.5-turbo\",\n" +
-                "  \"choices\": [\n" +
-                "    {\n" +
-                "      \"index\": 0,\n" +
-                "      \"message\": {\n" +
-                "        \"role\": \"assistant\",\n" +
-                "        \"content\": \"Hello! How can I help you today?\"\n" +
-                "      },\n" +
-                "      \"finish_reason\": \"stop\"\n" +
-                "    }\n" +
-                "  ],\n" +
-                "  \"usage\": {\n" +
-                "    \"prompt_tokens\": 10,\n" +
-                "    \"completion_tokens\": 9,\n" +
-                "    \"total_tokens\": 19\n" +
-                "  }\n" +
-                "}";
+                String mockResponse = """
+                        {
+                            "id": "chatcmpl-123",
+                            "object": "chat.completion",
+                            "created": 1677652288,
+                            "model": "gpt-3.5-turbo",
+                            "choices": [
+                                {
+                                    "index": 0,
+                                    "message": {
+                                        "role": "assistant",
+                                        "content": "Hello! How can I help you today?"
+                                    },
+                                    "finish_reason": "stop"
+                                }
+                            ],
+                            "usage": {
+                                "prompt_tokens": 10,
+                                "completion_tokens": 9,
+                                "total_tokens": 19
+                            }
+                        }
+                        """;
         
         String result = chatbot.parseResponse(mockResponse);
         assertEquals("Hello! How can I help you today?", result);
     }
     
     @Test
-    public void testJsonResponseParsingWithEscapedCharacters() throws ChatbotAPI.ChatbotException {
+    void testJsonResponseParsingWithEscapedCharacters() throws ChatbotAPI.ChatbotException {
         // Test JSON parsing with escaped characters
         ChatbotAPI chatbot = new ChatbotAPI();
         
-        String mockResponse = "{\n" +
-                "  \"choices\": [\n" +
-                "    {\n" +
-                "      \"message\": {\n" +
-                "        \"content\": \"Hello! I can help with \\\"nutrition\\\" and \\n food advice.\"\n" +
-                "      }\n" +
-                "    }\n" +
-                "  ]\n" +
-                "}";
+                String mockResponse = """
+                        {
+                            "choices": [
+                                {
+                                    "message": {
+                                        "content": "Hello! I can help with \"nutrition\" and \n food advice."
+                                    }
+                                }
+                            ]
+                        }
+                        """;
         
         String result = chatbot.parseResponse(mockResponse);
         assertEquals("Hello! I can help with \"nutrition\" and \n food advice.", result);
     }
     
     @Test
-    public void testJsonResponseParsingInvalidFormat() {
+    void testJsonResponseParsingInvalidFormat() {
         // Test error handling with invalid JSON format
         ChatbotAPI chatbot = new ChatbotAPI();
         
@@ -123,20 +127,22 @@ public void testJsonResponseParsingInvalidFormat() {
     }
     
     @Test
-    public void testNutritionXMLValidationWithVerdict() {
+    void testNutritionXMLValidationWithVerdict() {
         // Test that XML validation works with verdict attributes
         // Test valid XML with verdict attribute (like what the AI returns)
-        String validResponseWithVerdict = "<nutrition verdict=\"Healthy\">\n" +
-                "  <ingredient name=\"Test\" amount=\"100g\">\n" +
-                "    <calories unit=\"kcal\">100</calories>\n" +
-                "    <protein unit=\"g\">10</protein>\n" +
-                "    <fat unit=\"g\">5</fat>\n" +
-                "    <carbohydrates unit=\"g\">15</carbohydrates>\n" +
-                "    <fiber unit=\"g\">2</fiber>\n" +
-                "    <sugar unit=\"g\">3</sugar>\n" +
-                "    <salt unit=\"mg\">200</salt>\n" +
-                "  </ingredient>\n" +
-                "</nutrition>";
+                String validResponseWithVerdict = """
+                        <nutrition verdict="Healthy">
+                            <ingredient name="Test" amount="100g">
+                                <calories unit="kcal">100</calories>
+                                <protein unit="g">10</protein>
+                                <fat unit="g">5</fat>
+                                <carbohydrates unit="g">15</carbohydrates>
+                                <fiber unit="g">2</fiber>
+                                <sugar unit="g">3</sugar>
+                                <salt unit="mg">200</salt>
+                            </ingredient>
+                        </nutrition>
+                        """;
         
         // This should not throw an exception (simulating internal validation)
         // Since analyzeNutritionFacts requires API key, we'll test the validation logic indirectly
diff --git a/src/test/java/com/starlight/api/UserApiServerTest.java b/src/test/java/com/starlight/api/UserApiServerTest.java
index 7acdc2d..a06de3b 100644
--- a/src/test/java/com/starlight/api/UserApiServerTest.java
+++ b/src/test/java/com/starlight/api/UserApiServerTest.java
@@ -11,7 +11,7 @@
 /**
  * Unit tests for {@link UserApiServer}.
  */
-public class UserApiServerTest {
+class UserApiServerTest {
     
     private UserApiServer server;
     private static final int TEST_PORT = 9000; // Use a different port range to avoid conflicts
diff --git a/src/test/java/com/starlight/controller/AuthorizationControllerTest.java b/src/test/java/com/starlight/controller/AuthorizationControllerTest.java
index 2becb96..b49c1f4 100644
--- a/src/test/java/com/starlight/controller/AuthorizationControllerTest.java
+++ b/src/test/java/com/starlight/controller/AuthorizationControllerTest.java
@@ -15,7 +15,7 @@
 /**
  * Unit tests for {@link AuthorizationController}.
  */
-public class AuthorizationControllerTest extends ApplicationTest {
+class AuthorizationControllerTest extends ApplicationTest {
     
     private AuthorizationController controller;
     private BorderPane testPane;
diff --git a/src/test/java/com/starlight/controller/ConsultControllerTest.java b/src/test/java/com/starlight/controller/ConsultControllerTest.java
index 6d89e00..e4e4c3d 100644
--- a/src/test/java/com/starlight/controller/ConsultControllerTest.java
+++ b/src/test/java/com/starlight/controller/ConsultControllerTest.java
@@ -9,10 +9,10 @@
 /**
  * Test class for ConsultController avatar path resolution.
  */
-public class ConsultControllerTest {
+class ConsultControllerTest {
     
     @Test
-    public void testAvatarPathResolution() {
+    void testAvatarPathResolution() {
         // Test that the avatar paths can be resolved by FileSystemManager
         String botAvatarPath = "src/main/resources/com/starlight/images/dummy/profilewoman.jpg";
         String userAvatarPath = "src/main/resources/com/starlight/images/dummy/profilewoman.jpg";
@@ -32,7 +32,7 @@ public void testAvatarPathResolution() {
     }
     
     @Test
-    public void testResourcePathFormat() {
+    void testResourcePathFormat() {
         // Test that our path format works with the FileSystemManager
         String resourcePath = "src/main/resources/com/starlight/images/dummy/profilewoman.jpg";
         
diff --git a/src/test/java/com/starlight/controller/LoadingControllerTest.java b/src/test/java/com/starlight/controller/LoadingControllerTest.java
index db2d062..ebe45e0 100644
--- a/src/test/java/com/starlight/controller/LoadingControllerTest.java
+++ b/src/test/java/com/starlight/controller/LoadingControllerTest.java
@@ -13,7 +13,7 @@
 /**
  * Unit tests for {@link LoadingController}.
  */
-public class LoadingControllerTest extends ApplicationTest {
+LoadingControllerTest extends ApplicationTest {
     
     private LoadingController controller;
     
diff --git a/src/test/java/com/starlight/controller/SettingControllerTest.java b/src/test/java/com/starlight/controller/SettingControllerTest.java
index 33ea61d..ccdfd7c 100644
--- a/src/test/java/com/starlight/controller/SettingControllerTest.java
+++ b/src/test/java/com/starlight/controller/SettingControllerTest.java
@@ -17,7 +17,7 @@
 /**
  * Test class for SettingController.
  */
-public class SettingControllerTest {
+class SettingControllerTest {
     
     @TempDir
     Path tempDir;
@@ -25,7 +25,7 @@ public class SettingControllerTest {
     private XStream xstream;
     
     @BeforeEach
-    public void setUp() {
+    void setUp() {
         this.xstream = new XStream(new DomDriver());
         this.xstream.allowTypesByWildcard(new String[]{"com.starlight.api.*"});
         this.xstream.alias("config", ChatbotAPI.Config.class);
@@ -33,7 +33,7 @@ public void setUp() {
     }
     
     @Test
-    public void testConfigCreationAndSerialization() throws Exception {
+    void testConfigCreationAndSerialization() throws Exception {
         // Create config object
         ChatbotAPI.Config config = new ChatbotAPI.Config();
         config.setOpenaiKey("test-api-key-123");
@@ -50,7 +50,7 @@ public void testConfigCreationAndSerialization() throws Exception {
     }
     
     @Test
-    public void testConfigFileCreation() throws Exception {
+    void testConfigFileCreation() throws Exception {
         // Create the directory structure
         Path configDir = tempDir.resolve(".tabemonpal").resolve("Database");
         Files.createDirectories(configDir);
@@ -72,7 +72,7 @@ public void testConfigFileCreation() throws Exception {
     }
     
     @Test
-    public void testEmptyApiKeyValidation() {
+    void testEmptyApiKeyValidation() {
         ChatbotAPI.Config config = new ChatbotAPI.Config();
         assertNull(config.getOpenaiKey());
         
diff --git a/src/test/java/com/starlight/model/PostDataRepositoryTest.java b/src/test/java/com/starlight/model/PostDataRepositoryTest.java
index 294fd38..f682c74 100644
--- a/src/test/java/com/starlight/model/PostDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/PostDataRepositoryTest.java
@@ -17,7 +17,7 @@
 /**
  * Unit tests for {@link PostDataRepository}.
  */
-public class PostDataRepositoryTest {
+class PostDataRepositoryTest {
     private Path tempFile;
     private PostDataRepository repository;
 
diff --git a/src/test/java/com/starlight/model/PostLikedStateTest.java b/src/test/java/com/starlight/model/PostLikedStateTest.java
index 614b882..a200c2e 100644
--- a/src/test/java/com/starlight/model/PostLikedStateTest.java
+++ b/src/test/java/com/starlight/model/PostLikedStateTest.java
@@ -17,7 +17,7 @@
 /**
  * Test class to verify that liked state is properly saved and loaded from XML.
  */
-public class PostLikedStateTest {
+class PostLikedStateTest {
     
     private Path tempFile;
     private PostDataRepository repository;
diff --git a/src/test/java/com/starlight/model/PostTest.java b/src/test/java/com/starlight/model/PostTest.java
index 6f6b934..665cd9a 100644
--- a/src/test/java/com/starlight/model/PostTest.java
+++ b/src/test/java/com/starlight/model/PostTest.java
@@ -8,7 +8,7 @@
 /**
  * Unit tests for {@link Post} data model.
  */
-public class PostTest {
+class PostTest {
     private Post post;
 
     @BeforeEach
diff --git a/src/test/java/com/starlight/model/UserDataRepositoryTest.java b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
index 2a9f14c..6898917 100644
--- a/src/test/java/com/starlight/model/UserDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
@@ -17,7 +17,7 @@
 /**
  * Unit tests for {@link UserDataRepository}.
  */
-public class UserDataRepositoryTest {
+class UserDataRepositoryTest {
     private Path tempFile;
     private Path tempDummyFile;
     private UserDataRepository repository;
diff --git a/src/test/java/com/starlight/model/UserTest.java b/src/test/java/com/starlight/model/UserTest.java
index a83332d..01140fc 100644
--- a/src/test/java/com/starlight/model/UserTest.java
+++ b/src/test/java/com/starlight/model/UserTest.java
@@ -8,7 +8,7 @@
 /**
  * Unit tests for {@link User} data model.
  */
-public class UserTest {
+class UserTest {
     private User user;
 
     @BeforeEach
diff --git a/src/test/java/com/starlight/util/DataRepositoryIntegrationTest.java b/src/test/java/com/starlight/util/DataRepositoryIntegrationTest.java
index 7f4f7d7..d7357bb 100644
--- a/src/test/java/com/starlight/util/DataRepositoryIntegrationTest.java
+++ b/src/test/java/com/starlight/util/DataRepositoryIntegrationTest.java
@@ -10,7 +10,7 @@
 /**
  * Integration test to verify that data repositories work correctly with the new file system.
  */
-public class DataRepositoryIntegrationTest {
+class DataRepositoryIntegrationTest {
 
     @BeforeEach
     void setUp() {
diff --git a/src/test/java/com/starlight/util/FXMLLoadingTest.java b/src/test/java/com/starlight/util/FXMLLoadingTest.java
index 0946be9..df96814 100644
--- a/src/test/java/com/starlight/util/FXMLLoadingTest.java
+++ b/src/test/java/com/starlight/util/FXMLLoadingTest.java
@@ -19,7 +19,7 @@
  * Tests that all FXML files in the view package can be loaded using FXMLLoader,
  * including their controllers (if declared), using TestFX in headless mode.
  */
-public class FXMLLoadingTest extends ApplicationTest {
+class FXMLLoadingTest extends ApplicationTest {
 
     static {
         // Enable TestFX headless mode so JavaFX doesn't require a display
diff --git a/src/test/java/com/starlight/util/FXMLVerificatorTest.java b/src/test/java/com/starlight/util/FXMLVerificatorTest.java
index 1f59644..844df98 100644
--- a/src/test/java/com/starlight/util/FXMLVerificatorTest.java
+++ b/src/test/java/com/starlight/util/FXMLVerificatorTest.java
@@ -14,7 +14,7 @@
 /**
  * Unit tests for {@link FXMLVerificator} utility class.
  */
-public class FXMLVerificatorTest {
+class FXMLVerificatorTest {
     private Path tempDir;
     private Path tempFxmlFile;
 
@@ -38,12 +38,14 @@ void testVerifyAllWithNoFxmlFiles() {
 
     @Test
     void testFxmlWithCorrectNamespace() throws IOException {
-        String validFxml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<AnchorPane xmlns=\"http://javafx.com/javafx/19\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-            "    <children>\n" +
-            "        <Label text=\"Hello World\" />\n" +
-            "    </children>\n" +
-            "</AnchorPane>";
+        String validFxml = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+                    <children>
+                        <Label text="Hello World" />
+                    </children>
+                </AnchorPane>
+                """;
         
         Files.writeString(tempFxmlFile, validFxml);
         
@@ -53,12 +55,14 @@ void testFxmlWithCorrectNamespace() throws IOException {
 
     @Test
     void testFxmlWithIncorrectNamespace() throws IOException {
-        String fxmlWithOldNamespace = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<AnchorPane xmlns=\"http://javafx.com/javafx/11.0.1\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-            "    <children>\n" +
-            "        <Label text=\"Hello World\" />\n" +
-            "    </children>\n" +
-            "</AnchorPane>";
+        String fxmlWithOldNamespace = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <AnchorPane xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1">
+                    <children>
+                        <Label text="Hello World" />
+                    </children>
+                </AnchorPane>
+                """;
         
         Files.writeString(tempFxmlFile, fxmlWithOldNamespace);
         
@@ -74,12 +78,14 @@ void testFxmlWithIllegalAttribute() throws IOException {
         Path testFxmlFile = resourcesDir.resolve("test_illegal.fxml");
         
         try {
-            String fxmlWithIllegalAttr = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<AnchorPane xmlns=\"http://javafx.com/javafx/19\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-                "    <children>\n" +
-                "        <Label text=\"Hello World\" fx:factory=\"someFactory\" />\n" +
-                "    </children>\n" +
-                "</AnchorPane>";
+            String fxmlWithIllegalAttr = """
+                    <?xml version="1.0" encoding="UTF-8"?>
+                    <AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+                        <children>
+                            <Label text="Hello World" fx:factory="someFactory" />
+                        </children>
+                    </AnchorPane>
+                    """;
             
             Files.writeString(testFxmlFile, fxmlWithIllegalAttr);
             
@@ -99,14 +105,16 @@ void testFxmlWithUnsupportedTag() throws IOException {
         Path testFxmlFile = resourcesDir.resolve("test_unsupported.fxml");
         
         try {
-            String fxmlWithUnsupportedTag = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<AnchorPane xmlns=\"http://javafx.com/javafx/19\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-                "    <children>\n" +
-                "        <TextFlow>\n" +
-                "            <Text text=\"Unsupported content\" />\n" +
-                "        </TextFlow>\n" +
-                "    </children>\n" +
-                "</AnchorPane>";
+            String fxmlWithUnsupportedTag = """
+                    <?xml version="1.0" encoding="UTF-8"?>
+                    <AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+                        <children>
+                            <TextFlow>
+                                <Text text="Unsupported content" />
+                            </TextFlow>
+                        </children>
+                    </AnchorPane>
+                    """;
             
             Files.writeString(testFxmlFile, fxmlWithUnsupportedTag);
             
@@ -120,13 +128,15 @@ void testFxmlWithUnsupportedTag() throws IOException {
 
     @Test
     void testFxmlWithCustomComponents() throws IOException {
-        String fxmlWithCustom = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<AnchorPane xmlns=\"http://javafx.com/javafx/19\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-            "    <children>\n" +
-            "        <Button text=\"Standard Button\" />\n" +
-            "        <Label text=\"Standard Label\" />\n" +
-            "    </children>\n" +
-            "</AnchorPane>";
+        String fxmlWithCustom = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+                    <children>
+                        <Button text="Standard Button" />
+                        <Label text="Standard Label" />
+                    </children>
+                </AnchorPane>
+                """;
         
         Files.writeString(tempFxmlFile, fxmlWithCustom);
         
@@ -136,15 +146,17 @@ void testFxmlWithCustomComponents() throws IOException {
 
     @Test
     void testFxmlWithMultipleNamespaceVersions() throws IOException {
-        String fxmlMultipleVersions = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-            "<!-- This might contain mixed versions -->\n" +
-            "<AnchorPane xmlns=\"http://javafx.com/javafx/17.0.2\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-            "    <children>\n" +
-            "        <VBox xmlns=\"http://javafx.com/javafx/11.0.1\">\n" +
-            "            <Label text=\"Mixed versions\" />\n" +
-            "        </VBox>\n" +
-            "    </children>\n" +
-            "</AnchorPane>";
+        String fxmlMultipleVersions = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <!-- This might contain mixed versions -->
+                <AnchorPane xmlns="http://javafx.com/javafx/17.0.2" xmlns:fx="http://javafx.com/fxml/1">
+                    <children>
+                        <VBox xmlns="http://javafx.com/javafx/11.0.1">
+                            <Label text="Mixed versions" />
+                        </VBox>
+                    </children>
+                </AnchorPane>
+                """;
         
         Files.writeString(tempFxmlFile, fxmlMultipleVersions);
         
@@ -154,37 +166,39 @@ void testFxmlWithMultipleNamespaceVersions() throws IOException {
 
     @Test
     void testFxmlWithComplexStructure() throws IOException {
-        String complexFxml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<BorderPane xmlns=\"http://javafx.com/javafx/19\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-                "    <top>\n" +
-                "        <MenuBar>\n" +
-                "            <Menu text=\"File\">\n" +
-                "                <MenuItem text=\"New\" />\n" +
-                "                <MenuItem text=\"Open\" />\n" +
-                "            </Menu>\n" +
-                "        </MenuBar>\n" +
-                "    </top>\n" +
-                "    <center>\n" +
-                "        <TabPane>\n" +
-                "            <Tab text=\"Tab 1\">\n" +
-                "                <VBox>\n" +
-                "                    <Label text=\"Content 1\" />\n" +
-                "                    <TextField promptText=\"Enter text\" />\n" +
-                "                    <Button text=\"Submit\" />\n" +
-                "                </VBox>\n" +
-                "            </Tab>\n" +
-                "            <Tab text=\"Tab 2\">\n" +
-                "                <HBox>\n" +
-                "                    <Label text=\"Content 2\" />\n" +
-                "                    <CheckBox text=\"Option\" />\n" +
-                "                </HBox>\n" +
-                "            </Tab>\n" +
-                "        </TabPane>\n" +
-                "    </center>\n" +
-                "    <bottom>\n" +
-                "        <Label text=\"Status: Ready\" />\n" +
-                "    </bottom>\n" +
-                "</BorderPane>";
+        String complexFxml = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <BorderPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+                    <top>
+                        <MenuBar>
+                            <Menu text="File">
+                                <MenuItem text="New" />
+                                <MenuItem text="Open" />
+                            </Menu>
+                        </MenuBar>
+                    </top>
+                    <center>
+                        <TabPane>
+                            <Tab text="Tab 1">
+                                <VBox>
+                                    <Label text="Content 1" />
+                                    <TextField promptText="Enter text" />
+                                    <Button text="Submit" />
+                                </VBox>
+                            </Tab>
+                            <Tab text="Tab 2">
+                                <HBox>
+                                    <Label text="Content 2" />
+                                    <CheckBox text="Option" />
+                                </HBox>
+                            </Tab>
+                        </TabPane>
+                    </center>
+                    <bottom>
+                        <Label text="Status: Ready" />
+                    </bottom>
+                </BorderPane>
+                """;
         
         Files.writeString(tempFxmlFile, complexFxml);
         
@@ -202,12 +216,14 @@ void testEmptyFxmlFile() throws IOException {
 
     @Test
     void testInvalidXmlFormat() throws IOException {
-        String invalidXml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                "<AnchorPane xmlns=\"http://javafx.com/javafx/19\" xmlns:fx=\"http://javafx.com/fxml/1\">\n" +
-                "    <children>\n" +
-                "        <Label text=\"Unclosed tag\"\n" +
-                "    </children>\n" +
-                "</AnchorPane>";
+        String invalidXml = """
+                <?xml version="1.0" encoding="UTF-8"?>
+                <AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+                    <children>
+                        <Label text="Unclosed tag"
+                    </children>
+                </AnchorPane>
+                """;
         
         Files.writeString(tempFxmlFile, invalidXml);
         
diff --git a/src/test/java/com/starlight/util/FileSystemAccessTest.java b/src/test/java/com/starlight/util/FileSystemAccessTest.java
index e2f089a..8a47c05 100644
--- a/src/test/java/com/starlight/util/FileSystemAccessTest.java
+++ b/src/test/java/com/starlight/util/FileSystemAccessTest.java
@@ -14,7 +14,7 @@
  * Test class for verifying the application's ability to access and use
  * the file system for storing user data and application files.
  */
-public class FileSystemAccessTest {
+class FileSystemAccessTest {
 
     private static final String TEST_USERNAME = "testuser";
     private static final String TEST_FILENAME = "test_image.png";
diff --git a/src/test/java/com/starlight/util/NutritionParserTest.java b/src/test/java/com/starlight/util/NutritionParserTest.java
index cc3fbae..6ff9d32 100644
--- a/src/test/java/com/starlight/util/NutritionParserTest.java
+++ b/src/test/java/com/starlight/util/NutritionParserTest.java
@@ -10,7 +10,7 @@
 /**
  * Unit tests for the NutritionParser utility class.
  */
-public class NutritionParserTest {
+class NutritionParserTest {
 
     private NutritionParser parser;
 
@@ -21,68 +21,48 @@ void setUp() {
 
     @Test
     void testParseValidNutritionXML() {
-        String aiResponse = "Here's the nutrition analysis:\n\n" +
-                "<nutrition verdict=\"Healthy\">\n" +
-                "  <ingredient name=\"Chicken Breast\" amount=\"200g\">\n" +
-                "    <calories unit=\"kcal\">331</calories>\n" +
-                "    <protein unit=\"g\">62.2</protein>\n" +
-                "    <fat unit=\"g\">7.2</fat>\n" +
-                "    <carbohydrates unit=\"g\">0</carbohydrates>\n" +
-                "    <fiber unit=\"g\">0</fiber>\n" +
-                "    <sugar unit=\"g\">0</sugar>\n" +
-                "    <salt unit=\"mg\">146</salt>\n" +
-                "  </ingredient>\n" +
-                "  <ingredient name=\"Rice\" amount=\"1 cup cooked\">\n" +
-                "    <calories unit=\"kcal\">205</calories>\n" +
-                "    <protein unit=\"g\">4.2</protein>\n" +
-                "    <fat unit=\"g\">0.4</fat>\n" +
-                "    <carbohydrates unit=\"g\">45</carbohydrates>\n" +
-                "    <fiber unit=\"g\">0.6</fiber>\n" +
-                "    <sugar unit=\"g\">0.1</sugar>\n" +
-                "    <salt unit=\"mg\">2</salt>\n" +
-                "  </ingredient>\n" +
-                "</nutrition>\n\n" +
-                "This provides a balanced meal with good protein content.";
+                String aiResponse = """
+                                Here's the nutrition analysis:
+
+                                <nutrition verdict="Healthy">
+                                    <ingredient name="Chicken Breast" amount="200g">
+                                        <calories unit="kcal">331</calories>
+                                        <protein unit="g">62.2</protein>
+                                        <fat unit="g">7.2</fat>
+                                        <carbohydrates unit="g">0</carbohydrates>
+                                        <fiber unit="g">0</fiber>
+                                        <sugar unit="g">0</sugar>
+                                        <salt unit="mg">146</salt>
+                                    </ingredient>
+                                    <ingredient name="Rice" amount="1 cup cooked">
+                                        <calories unit="kcal">205</calories>
+                                        <protein unit="g">4.2</protein>
+                                        <fat unit="g">0.4</fat>
+                                        <carbohydrates unit="g">45</carbohydrates>
+                                        <fiber unit="g">0.6</fiber>
+                                        <sugar unit="g">0.1</sugar>
+                                        <salt unit="mg">2</salt>
+                                    </ingredient>
+                                </nutrition>
+
+                                This provides a balanced meal with good protein content.
+                                """;
 
         Nutrition nutrition = parser.parseNutritionFromResponse(aiResponse);
-
-        assertNotNull(nutrition, "Nutrition object should not be null");
-        assertNotNull(nutrition.ingredient, "Ingredient list should not be null");
-        assertEquals(2, nutrition.ingredient.size(), "Should have 2 ingredients");
-        assertEquals("Healthy", nutrition.verdict, "Should have correct verdict");
-
-        // Check first ingredient
-        Nutrition.NutritionIngredient chicken = nutrition.ingredient.get(0);
-        assertEquals("Chicken Breast", chicken.name);
-        assertEquals("200g", chicken.amount);
-        assertEquals("331", chicken.calories.value);
-        assertEquals("62.2", chicken.protein.value);
-        assertEquals("7.2", chicken.fat.value);
-        assertEquals("0", chicken.carbohydrates.value);
-        assertEquals("0", chicken.fiber.value);
-        assertEquals("0", chicken.sugar.value);
-        assertEquals("146", chicken.salt.value);
-
-        // Check second ingredient
-        Nutrition.NutritionIngredient rice = nutrition.ingredient.get(1);
-        assertEquals("Rice", rice.name);
-        assertEquals("1 cup cooked", rice.amount);
-        assertEquals("205", rice.calories.value);
-        assertEquals("4.2", rice.protein.value);
-        assertEquals("0.4", rice.fat.value);
-        assertEquals("45", rice.carbohydrates.value);
-        assertEquals("0.6", rice.fiber.value);
-        assertEquals("0.1", rice.sugar.value);
-        assertEquals("2", rice.salt.value);
-
-        // Test totals
-        assertEquals(536.0, nutrition.getTotalCalories(), 0.1);
-        assertEquals(66.4, nutrition.getTotalProtein(), 0.1);
-        assertEquals(7.6, nutrition.getTotalFat(), 0.1);
-        assertEquals(45.0, nutrition.getTotalCarbohydrates(), 0.1);
-        assertEquals(0.6, nutrition.getTotalFiber(), 0.1);
-        assertEquals(0.1, nutrition.getTotalSugar(), 0.1);
-        assertEquals(148.0, nutrition.getTotalSalt(), 0.1);
+    assertNotNull(nutrition, "Nutrition object should not be null");
+    assertNotNull(nutrition.ingredient, "Ingredient list should not be null");
+    assertEquals(2, nutrition.ingredient.size(), "Should have 2 ingredients");
+    assertEquals("Healthy", nutrition.verdict, "Should have correct verdict");
+
+    // Ingredient assertions moved to helper methods to reduce assertion count in this test method
+    assertIngredient(
+        nutrition.ingredient.get(0),
+        "Chicken Breast", "200g", "331", "62.2", "7.2", "0", "0", "0", "146");
+    assertIngredient(
+        nutrition.ingredient.get(1),
+        "Rice", "1 cup cooked", "205", "4.2", "0.4", "45", "0.6", "0.1", "2");
+
+    assertTotals(nutrition, 536.0, 66.4, 7.6, 45.0, 0.6, 0.1, 148.0);
     }
 
     @Test
@@ -118,11 +98,13 @@ void testParseEmptyResponse() {
 
     @Test
     void testParseMalformedXML() {
-        String malformedResponse = "<nutrition>\n" +
-                "  <ingredient name=\"Apple\">\n" +
-                "    <calories>52</calories>\n" +
-                "    <!-- Missing closing tag for ingredient -->\n" +
-                "</nutrition>";
+                String malformedResponse = """
+                                <nutrition>
+                                    <ingredient name="Apple">
+                                        <calories>52</calories>
+                                        <!-- Missing closing tag for ingredient -->
+                                </nutrition>
+                                """;
 
         Nutrition nutrition = parser.parseNutritionFromResponse(malformedResponse);
 
@@ -131,19 +113,23 @@ void testParseMalformedXML() {
 
     @Test
     void testParseUnknownVerdict() {
-        String aiResponse = "Here's the nutrition analysis:\n\n" +
-                "<nutrition verdict=\"Unknown\">\n" +
-                "  <ingredient name=\"Mystery Ingredient\" amount=\"100g\">\n" +
-                "    <calories unit=\"kcal\">100</calories>\n" +
-                "    <protein unit=\"g\">5</protein>\n" +
-                "    <fat unit=\"g\">3</fat>\n" +
-                "    <carbohydrates unit=\"g\">15</carbohydrates>\n" +
-                "    <fiber unit=\"g\">2</fiber>\n" +
-                "    <sugar unit=\"g\">8</sugar>\n" +
-                "    <salt unit=\"mg\">100</salt>\n" +
-                "  </ingredient>\n" +
-                "</nutrition>\n\n" +
-                "Nutritional analysis could not be fully determined.";
+                String aiResponse = """
+                                Here's the nutrition analysis:
+
+                                <nutrition verdict="Unknown">
+                                    <ingredient name="Mystery Ingredient" amount="100g">
+                                        <calories unit="kcal">100</calories>
+                                        <protein unit="g">5</protein>
+                                        <fat unit="g">3</fat>
+                                        <carbohydrates unit="g">15</carbohydrates>
+                                        <fiber unit="g">2</fiber>
+                                        <sugar unit="g">8</sugar>
+                                        <salt unit="mg">100</salt>
+                                    </ingredient>
+                                </nutrition>
+
+                                Nutritional analysis could not be fully determined.
+                                """;
 
         Nutrition nutrition = parser.parseNutritionFromResponse(aiResponse);
 
@@ -152,4 +138,43 @@ void testParseUnknownVerdict() {
         assertEquals(1, nutrition.ingredient.size(), "Should have 1 ingredient");
         assertEquals("Mystery Ingredient", nutrition.ingredient.get(0).name);
     }
+
+    // Helper methods to keep individual test readable while reducing per-method assertion counts
+    private static void assertIngredient(Nutrition.NutritionIngredient ingredient,
+                                         String expectedName,
+                                         String expectedAmount,
+                                         String expectedCalories,
+                                         String expectedProtein,
+                                         String expectedFat,
+                                         String expectedCarbs,
+                                         String expectedFiber,
+                                         String expectedSugar,
+                                         String expectedSalt) {
+        assertEquals(expectedName, ingredient.name);
+        assertEquals(expectedAmount, ingredient.amount);
+        assertEquals(expectedCalories, ingredient.calories.value);
+        assertEquals(expectedProtein, ingredient.protein.value);
+        assertEquals(expectedFat, ingredient.fat.value);
+        assertEquals(expectedCarbs, ingredient.carbohydrates.value);
+        assertEquals(expectedFiber, ingredient.fiber.value);
+        assertEquals(expectedSugar, ingredient.sugar.value);
+        assertEquals(expectedSalt, ingredient.salt.value);
+    }
+
+    private static void assertTotals(Nutrition nutrition,
+                                     double calories,
+                                     double protein,
+                                     double fat,
+                                     double carbs,
+                                     double fiber,
+                                     double sugar,
+                                     double salt) {
+        assertEquals(calories, nutrition.getTotalCalories(), 0.1);
+        assertEquals(protein, nutrition.getTotalProtein(), 0.1);
+        assertEquals(fat, nutrition.getTotalFat(), 0.1);
+        assertEquals(carbs, nutrition.getTotalCarbohydrates(), 0.1);
+        assertEquals(fiber, nutrition.getTotalFiber(), 0.1);
+        assertEquals(sugar, nutrition.getTotalSugar(), 0.1);
+        assertEquals(salt, nutrition.getTotalSalt(), 0.1);
+    }
 }
diff --git a/src/test/java/com/starlight/util/SessionTest.java b/src/test/java/com/starlight/util/SessionTest.java
index 5988bed..0767d24 100644
--- a/src/test/java/com/starlight/util/SessionTest.java
+++ b/src/test/java/com/starlight/util/SessionTest.java
@@ -11,7 +11,7 @@
 /**
  * Unit tests for {@link Session} utility class.
  */
-public class SessionTest {
+class SessionTest {
     private User testUser;
 
     @BeforeEach

From bb5e8c25bb2f906abae7f4edf6ce831e85aa246f Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 03:56:19 +0700
Subject: [PATCH 2/9] Refactor: Update nutrition parsing methods to include
 default unit parameter and improve readability

---
 .../com/starlight/util/NutritionParser.java   |  8 ++---
 .../com/starlight/api/UserApiServerTest.java  | 22 ++++++------
 .../controller/LoadingControllerTest.java     |  2 +-
 .../model/UserDataRepositoryTest.java         | 34 ++++++++++---------
 4 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/starlight/util/NutritionParser.java b/src/main/java/com/starlight/util/NutritionParser.java
index 13c849d..cfd363a 100644
--- a/src/main/java/com/starlight/util/NutritionParser.java
+++ b/src/main/java/com/starlight/util/NutritionParser.java
@@ -165,7 +165,7 @@ private Nutrition.Protein parseProteinValue(String content, String tagName, Stri
     /**
      * Parses fat values from XML content.
      */
-    private Nutrition.Fat parseFatValue(String content, String tagName) {
+    private Nutrition.Fat parseFatValue(String content, String tagName, String defaultUnit) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
@@ -184,7 +184,7 @@ private Nutrition.Fat parseFatValue(String content, String tagName) {
     /**
      * Parses carbohydrates values from XML content.
      */
-    private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String tagName) {
+    private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String tagName, String defaultUnit) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
@@ -203,7 +203,7 @@ private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String t
     /**
      * Parses fiber values from XML content.
      */
-    private Nutrition.Fiber parseFiberValue(String content, String tagName) {
+    private Nutrition.Fiber parseFiberValue(String content, String tagName, String defaultUnit) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
@@ -241,7 +241,7 @@ private Nutrition.Sugar parseSugarValue(String content, String tagName, String d
     /**
      * Parses salt values from XML content.
      */
-    private Nutrition.Salt parseSaltValue(String content, String tagName) {
+    private Nutrition.Salt parseSaltValue(String content, String tagName, String defaultUnit) {
         Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
diff --git a/src/test/java/com/starlight/api/UserApiServerTest.java b/src/test/java/com/starlight/api/UserApiServerTest.java
index a06de3b..621ac5e 100644
--- a/src/test/java/com/starlight/api/UserApiServerTest.java
+++ b/src/test/java/com/starlight/api/UserApiServerTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;
+import java.util.Random;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -15,11 +16,12 @@ class UserApiServerTest {
     
     private UserApiServer server;
     private static final int TEST_PORT = 9000; // Use a different port range to avoid conflicts
+    private final Random rng = new Random();
     
     @BeforeEach
     void setUp() throws IOException {
         // Create server on a test port with some randomization to avoid conflicts
-        int basePort = TEST_PORT + (int)(Math.random() * 1000);
+    int basePort = TEST_PORT + rng.nextInt(1000);
         server = new UserApiServer(basePort);
     }
     
@@ -34,7 +36,7 @@ void tearDown() {
     void testServerConstruction() throws IOException {
         // Test that server can be constructed without throwing
         assertDoesNotThrow(() -> {
-            int testPort = 9100 + (int)(Math.random() * 500);
+            int testPort = 9100 + rng.nextInt(500);
             UserApiServer testServer = new UserApiServer(testPort);
             assertNotNull(testServer);
             testServer.stop(); // Clean up
@@ -44,7 +46,7 @@ void testServerConstruction() throws IOException {
     @Test
     void testServerConstructionWithPortInUse() throws IOException {
         // Start first server
-        int basePort = 9200 + (int)(Math.random() * 100);
+    int basePort = 9200 + rng.nextInt(100);
         UserApiServer firstServer = new UserApiServer(basePort);
         firstServer.start();
         
@@ -138,7 +140,7 @@ void testServerState() {
     void testRestartWithNewInstance() throws IOException {
         // Test restart functionality by creating new server instances
         // (since HttpServer cannot be restarted once stopped)
-        int testPort = 9800 + (int)(Math.random() * 100);
+            int testPort = 9800 + rng.nextInt(100);
         
         assertDoesNotThrow(() -> {
             // First instance
@@ -156,8 +158,8 @@ void testRestartWithNewInstance() throws IOException {
     @Test
     void testMultipleServerInstances() throws IOException {
         // Test that multiple server instances can coexist (on different ports)
-        int port1 = 9300 + (int)(Math.random() * 50);
-        int port2 = 9350 + (int)(Math.random() * 50);
+    int port1 = 9300 + rng.nextInt(50);
+    int port2 = 9350 + rng.nextInt(50);
         UserApiServer server1 = new UserApiServer(port1);
         UserApiServer server2 = new UserApiServer(port2);
         
@@ -183,7 +185,7 @@ void testServerConstructionPortRange() {
         // by trying multiple ports (this tests the port binding retry logic)
         assertDoesNotThrow(() -> {
             // This should work even if some ports are in use
-            int testPort = 9400 + (int)(Math.random() * 100);
+            int testPort = 9400 + rng.nextInt(100);
             UserApiServer testServer = new UserApiServer(testPort);
             testServer.stop();
         });
@@ -192,7 +194,7 @@ void testServerConstructionPortRange() {
     @Test
     void testServerResourceCleanup() throws IOException {
         // Test that server properly cleans up resources
-        int testPort = 9500 + (int)(Math.random() * 100);
+    int testPort = 9500 + rng.nextInt(100);
         UserApiServer testServer = new UserApiServer(testPort);
         
         testServer.start();
@@ -210,7 +212,7 @@ void testServerStartAfterException() throws IOException {
         // Test that server can be started after handling construction exceptions
         try {
             // This should succeed since we handle port conflicts
-            int testPort = 9600 + (int)(Math.random() * 100);
+            int testPort = 9600 + rng.nextInt(100);
             UserApiServer testServer = new UserApiServer(testPort);
             testServer.start();
             testServer.stop();
@@ -228,7 +230,7 @@ void testServerLifecycle() {
         // Test complete server lifecycle
         assertDoesNotThrow(() -> {
             // Construction phase
-            int testPort = 9700 + (int)(Math.random() * 100);
+            int testPort = 9700 + rng.nextInt(100);
             UserApiServer lifecycleServer = new UserApiServer(testPort);
             
             // Startup phase
diff --git a/src/test/java/com/starlight/controller/LoadingControllerTest.java b/src/test/java/com/starlight/controller/LoadingControllerTest.java
index ebe45e0..d31e403 100644
--- a/src/test/java/com/starlight/controller/LoadingControllerTest.java
+++ b/src/test/java/com/starlight/controller/LoadingControllerTest.java
@@ -13,7 +13,7 @@
 /**
  * Unit tests for {@link LoadingController}.
  */
-LoadingControllerTest extends ApplicationTest {
+class LoadingControllerTest extends ApplicationTest {
     
     private LoadingController controller;
     
diff --git a/src/test/java/com/starlight/model/UserDataRepositoryTest.java b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
index 6898917..c0b2545 100644
--- a/src/test/java/com/starlight/model/UserDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
@@ -39,22 +39,24 @@ void tearDown() throws IOException {
     }
 
     private void createDummyData() throws IOException {
-        String dummyXml = "<users>\n" +
-                "  <user>\n" +
-                "    <username>dummy1</username>\n" +
-                "    <email>dummy1@example.com</email>\n" +
-                "    <fullname>Dummy User 1</fullname>\n" +
-                "    <password>password1</password>\n" +
-                "    <birthDay>1990-01-01</birthDay>\n" +
-                "  </user>\n" +
-                "  <user>\n" +
-                "    <username>dummy2</username>\n" +
-                "    <email>dummy2@example.com</email>\n" +
-                "    <fullname>Dummy User 2</fullname>\n" +
-                "    <password>password2</password>\n" +
-                "    <birthDay>1985-05-15</birthDay>\n" +
-                "  </user>\n" +
-                "</users>";
+                String dummyXml = """
+                                <users>
+                                    <user>
+                                        <username>dummy1</username>
+                                        <email>dummy1@example.com</email>
+                                        <fullname>Dummy User 1</fullname>
+                                        <password>password1</password>
+                                        <birthDay>1990-01-01</birthDay>
+                                    </user>
+                                    <user>
+                                        <username>dummy2</username>
+                                        <email>dummy2@example.com</email>
+                                        <fullname>Dummy User 2</fullname>
+                                        <password>password2</password>
+                                        <birthDay>1985-05-15</birthDay>
+                                    </user>
+                                </users>
+                                """;
         Files.writeString(tempDummyFile, dummyXml);
     }
 

From d37d6902904299509ae04d81e9a24e93831b9fb7 Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 05:01:01 +0700
Subject: [PATCH 3/9] Refactor: Post and User model tests are now use getter
 and setter methods

- Updated PostDataRepositoryTest to replace direct field access with getter/setter methods for likecount, commentcount, and isLiked.
- Modified PostLikedStateTest to utilize getter/setter methods for post attributes.
- Refactored PostTest to ensure all field assertions use getter/setter methods.
- Adjusted UserDataRepositoryTest to implement getter/setter methods for user attributes.
- Revised UserTest to access user fields through getter/setter methods.
- Enhanced ChatHistoryManagerTest to utilize getter methods for message attributes.
- Updated NutritionParserTest to replace direct field access with getter methods for nutrition attributes.
- Refactored SessionTest to ensure user attributes are accessed via getter/setter methods.
---
 .../java/com/starlight/api/ApiClient.java     |  10 +-
 .../java/com/starlight/api/UserApiServer.java |  28 +-
 .../controller/CommunityController.java       |  60 ++--
 .../controller/ConsultController.java         |  18 +-
 .../controller/CreatePostController.java      |  36 +--
 .../controller/DeleteDialogController.java    |   2 +-
 .../controller/EditPostController.java        |  33 +-
 .../controller/EditProfileController.java     |  50 +--
 .../controller/LoginViewController.java       |   2 +-
 .../starlight/controller/MainController.java  |   6 +-
 .../controller/NavbarController.java          |   4 +-
 .../starlight/controller/PostController.java  |  66 ++--
 .../controller/PostItemController.java        |  32 +-
 .../controller/ProfileController.java         |  16 +-
 .../controller/RecipeManagerController.java   |  28 +-
 .../controller/RegisterViewController.java    |   2 +-
 .../controller/UserManagerController.java     |  92 +++---
 .../java/com/starlight/model/ChatMessage.java |  23 +-
 .../java/com/starlight/model/Nutrition.java   | 100 ++++--
 src/main/java/com/starlight/model/Post.java   |  44 +++
 src/main/java/com/starlight/model/User.java   |  30 +-
 .../repository/LocalUserDataRepository.java   |  36 +--
 .../repository/PostDataRepository.java        |  16 +-
 .../repository/UserDataRepository.java        |   4 +-
 .../com/starlight/util/ChatHistoryUtils.java  |  12 +-
 .../com/starlight/util/NutritionParser.java   | 161 +++++-----
 .../model/PostDataRepositoryTest.java         |  12 +-
 .../starlight/model/PostLikedStateTest.java   |  70 ++---
 .../java/com/starlight/model/PostTest.java    | 284 +++++++++---------
 .../model/UserDataRepositoryTest.java         |  70 ++---
 .../java/com/starlight/model/UserTest.java    | 130 ++++----
 .../util/ChatHistoryManagerTest.java          |  30 +-
 .../starlight/util/NutritionParserTest.java   |  56 ++--
 .../java/com/starlight/util/SessionTest.java  |  78 ++---
 34 files changed, 892 insertions(+), 749 deletions(-)

diff --git a/src/main/java/com/starlight/api/ApiClient.java b/src/main/java/com/starlight/api/ApiClient.java
index 3cc7a26..89e1e8f 100644
--- a/src/main/java/com/starlight/api/ApiClient.java
+++ b/src/main/java/com/starlight/api/ApiClient.java
@@ -53,8 +53,8 @@ public User login(String emailOrUsername, String password) throws ApiException {
             conn.setDoOutput(true);
 
             User creds = new User();
-            creds.email = emailOrUsername;
-            creds.password = password;
+            creds.setEmail(emailOrUsername);
+            creds.setPassword(password);
 
             writeXmlToConnection(conn, creds);
 
@@ -85,9 +85,9 @@ public User register(String username, String email, String password) throws ApiE
             conn.setDoOutput(true);
             
             User newUser = new User();
-            newUser.username = username;
-            newUser.email = email;
-            newUser.password = password;
+            newUser.setUsername(username);
+            newUser.setEmail(email);
+            newUser.setPassword(password);
             
             writeXmlToConnection(conn, newUser);
             
diff --git a/src/main/java/com/starlight/api/UserApiServer.java b/src/main/java/com/starlight/api/UserApiServer.java
index b83e494..ef3bec9 100644
--- a/src/main/java/com/starlight/api/UserApiServer.java
+++ b/src/main/java/com/starlight/api/UserApiServer.java
@@ -114,11 +114,11 @@ public void handle(HttpExchange exchange) throws IOException {
             User creds = (User) xstream.fromXML(body);
             
             // First check local users (admin and user accounts)
-            String loginIdentifier = creds.email; // This could be username or email
-            User localUser = localRepository.validateCredentials(loginIdentifier, creds.password);
+            String loginIdentifier = creds.getEmail(); // This could be username or email
+            User localUser = localRepository.validateCredentials(loginIdentifier, creds.getPassword());
             
             if (localUser != null) {
-                logger.log(Level.INFO, "Local user authenticated: {0}", localUser.username);
+                logger.log(Level.INFO, "Local user authenticated: {0}", localUser.getUsername());
                 sendXml(exchange, 200, xstream.toXML(localUser));
                 return;
             }
@@ -128,9 +128,9 @@ public void handle(HttpExchange exchange) throws IOException {
             
             // Check for either email or username match
             Optional<User> match = users.stream()
-                    .filter(u -> ((u.email != null && u.email.equals(creds.email)) || 
-                                 (u.username != null && u.username.equals(creds.email))) && 
-                                 u.password != null && u.password.equals(creds.password))
+                    .filter(u -> ((u.getEmail() != null && u.getEmail().equals(creds.getEmail())) || 
+                                 (u.getUsername() != null && u.getUsername().equals(creds.getEmail()))) && 
+                                 u.getPassword() != null && u.getPassword().equals(creds.getPassword()))
                     .findFirst();
                     
             if (match.isPresent()) {
@@ -162,12 +162,12 @@ public void handle(HttpExchange exchange) throws IOException {
             User newUser = (User) xstream.fromXML(body);
             
             // Set default profile picture for new users
-            if (newUser.profilepicture == null || newUser.profilepicture.trim().isEmpty()) {
-                newUser.profilepicture = "src/main/resources/com/starlight/images/dummy/profiledefault.png";
+            if (newUser.getProfilepicture() == null || newUser.getProfilepicture().trim().isEmpty()) {
+                newUser.setProfilepicture("src/main/resources/com/starlight/images/dummy/profiledefault.png");
             }
             
             List<User> users = repository.loadUsers(false);
-            boolean exists = users.stream().anyMatch(u -> newUser.email.equals(u.email));
+            boolean exists = users.stream().anyMatch(u -> newUser.getEmail().equals(u.getEmail()));
             if (exists) {
                 sendXml(exchange, 409, "<error/>");
                 return;
@@ -240,7 +240,7 @@ private void handleGetUser(HttpExchange exchange, String username) throws IOExce
             // Fallback to regular repository users
             List<User> users = repository.loadUsers();
             Optional<User> user = users.stream()
-                    .filter(u -> u.username != null && u.username.equals(username))
+                    .filter(u -> u.getUsername() != null && u.getUsername().equals(username))
                     .findFirst();
                     
             if (user.isPresent()) {
@@ -303,7 +303,7 @@ private void updateUserInRepository(HttpExchange exchange, String username, User
             
             for (int i = 0; i < users.size(); i++) {
                 User existingUser = users.get(i);
-                if (existingUser.username != null && existingUser.username.equals(username)) {
+                if (existingUser.getUsername() != null && existingUser.getUsername().equals(username)) {
                     updateUserFields(existingUser, updated);
                     repository.saveUsers(users);
                     sendXml(exchange, 200, xstream.toXML(existingUser));
@@ -318,9 +318,9 @@ private void updateUserInRepository(HttpExchange exchange, String username, User
          * Updates user fields from the updated user object
          */
         private void updateUserFields(User existingUser, User updated) {
-            if (updated.email != null) existingUser.email = updated.email;
-            if (updated.password != null) existingUser.password = updated.password;
-            if (updated.birthDay != null) existingUser.birthDay = updated.birthDay;
+            if (updated.getEmail() != null) existingUser.setEmail(updated.getEmail());
+            if (updated.getPassword() != null) existingUser.setPassword(updated.getPassword());
+            if (updated.getBirthDay() != null) existingUser.setBirthDay(updated.getBirthDay());
         }
         
         /**
diff --git a/src/main/java/com/starlight/controller/CommunityController.java b/src/main/java/com/starlight/controller/CommunityController.java
index 1507707..33c13cd 100644
--- a/src/main/java/com/starlight/controller/CommunityController.java
+++ b/src/main/java/com/starlight/controller/CommunityController.java
@@ -127,8 +127,8 @@ public String getProfilePictureForUser(String username) {
         
         List<User> users = userRepository.loadUsers();
         for (User user : users) {
-            if (username.equals(user.username)) {
-                return user.profilepicture;
+            if (username.equals(user.getUsername())) {
+                return user.getProfilepicture();
             }
         }
         return null;
@@ -142,10 +142,10 @@ public String getDisplayUsernameForUser(String username) {
         
         List<User> users = userRepository.loadUsers();
         for (User user : users) {
-            if (username.equals(user.username)) {
+            if (username.equals(user.getUsername())) {
                 // Return fullname if available, otherwise return username
-                return user.fullname != null && !user.fullname.trim().isEmpty() 
-                    ? user.fullname : user.username;
+                return user.getFullname() != null && !user.getFullname().trim().isEmpty() 
+                    ? user.getFullname() : user.getUsername();
             }
         }
         return username; // fallback to original username if not found
@@ -170,12 +170,12 @@ private void loadPosts() {
 
         for (int i = 0; i < posts.size(); i++) {
             Post p = posts.get(i);
-            String tits = p.title;
-            String usr = p.username;
-            String desc = p.description;
-            String image = p.image;
-            String time = p.uploadtime;
-            String likes = p.likecount;
+            String tits = p.getTitle();
+            String usr = p.getUsername();
+            String desc = p.getDescription();
+            String image = p.getImage();
+            String time = p.getUploadtime();
+            String likes = p.getLikecount();
             
             // Get profile picture and display username from UserData.xml instead of Post data
             String pp = getProfilePictureForUser(usr);
@@ -193,7 +193,7 @@ private void loadPosts() {
                 c.likecounter.setText(likes);
                 
                 // Set comment count (default to 0 if not set)
-                String commentCount = p.commentcount != null ? p.commentcount : "0";
+                String commentCount = p.getCommentcount() != null ? p.getCommentcount() : "0";
                 c.commentcounter.setText(commentCount);
                 
                 // Set the post data for the controller
@@ -203,8 +203,8 @@ private void loadPosts() {
                 c.setMainController(main);
                 
                 // Initialize isLiked field if not set
-                if (p.isLiked == null) {
-                    p.isLiked = "false";
+                if (p.getIsLiked() == null) {
+                    p.setIsLiked("false");
                 }
 
                 // Load profile picture
@@ -250,31 +250,31 @@ private void loadDailyPosts() {
             Post post = shuffledPosts.get(i);
             switch (i) {
                 case 0:
-                    dailytitle1.setText(post.title);
-                    starrating.setText(post.rating);
-                    dailylikecounter.setText(post.likecount);
-                    ImageUtils.loadImage(dailyphoto1, post.image, ImageUtils.DEFAULT_MISSING_IMAGE);
+                    dailytitle1.setText(post.getTitle());
+                    starrating.setText(post.getRating());
+                    dailylikecounter.setText(post.getLikecount());
+                    ImageUtils.loadImage(dailyphoto1, post.getImage(), ImageUtils.DEFAULT_MISSING_IMAGE);
                     ImageUtils.scaleToFit(dailyphoto1, 280, 174, 30);
                     break;
                 case 1:
-                    dailytitle2.setText(post.title);
-                    starrating2.setText(post.rating);
-                    dailylikecounter2.setText(post.likecount);
-                    ImageUtils.loadImage(dailyphoto2, post.image, ImageUtils.DEFAULT_MISSING_IMAGE);
+                    dailytitle2.setText(post.getTitle());
+                    starrating2.setText(post.getRating());
+                    dailylikecounter2.setText(post.getLikecount());
+                    ImageUtils.loadImage(dailyphoto2, post.getImage(), ImageUtils.DEFAULT_MISSING_IMAGE);
                     ImageUtils.scaleToFit(dailyphoto2, 280, 174, 30);
                     break;
                 case 2:
-                    dailytitle3.setText(post.title);
-                    starrating3.setText(post.rating);
-                    dailylikecounter3.setText(post.likecount);
-                    ImageUtils.loadImage(dailyphoto3, post.image, ImageUtils.DEFAULT_MISSING_IMAGE);
+                    dailytitle3.setText(post.getTitle());
+                    starrating3.setText(post.getRating());
+                    dailylikecounter3.setText(post.getLikecount());
+                    ImageUtils.loadImage(dailyphoto3, post.getImage(), ImageUtils.DEFAULT_MISSING_IMAGE);
                     ImageUtils.scaleToFit(dailyphoto3, 280, 174, 30);
                     break;
                 case 3:
-                    dailytitle4.setText(post.title);
-                    starrating4.setText(post.rating);
-                    dailylikecounter4.setText(post.likecount);
-                    ImageUtils.loadImage(dailyphoto4, post.image, ImageUtils.DEFAULT_MISSING_IMAGE);
+                    dailytitle4.setText(post.getTitle());
+                    starrating4.setText(post.getRating());
+                    dailylikecounter4.setText(post.getLikecount());
+                    ImageUtils.loadImage(dailyphoto4, post.getImage(), ImageUtils.DEFAULT_MISSING_IMAGE);
                     ImageUtils.scaleToFit(dailyphoto4, 280, 174, 30);
                     break;
                 default:
diff --git a/src/main/java/com/starlight/controller/ConsultController.java b/src/main/java/com/starlight/controller/ConsultController.java
index bee8239..26c12ac 100644
--- a/src/main/java/com/starlight/controller/ConsultController.java
+++ b/src/main/java/com/starlight/controller/ConsultController.java
@@ -182,7 +182,7 @@ private void addBubble(String message, boolean isUser, boolean saveToHistory) {
 
         // Save to chat history if enabled and not a welcome message
         if (saveToHistory && historyManager != null && currentUser != null && !message.contains("Welcome Pal!")) {
-                historyManager.addMessage(message, isUser, currentUser.username);
+                historyManager.addMessage(message, isUser, currentUser.getUsername());
             }
         
 
@@ -334,8 +334,8 @@ private String getBotAvatarPath() {
      * Gets the avatar path for the current user.
      */
     private String getUserAvatarPath() {
-        if (currentUser != null && currentUser.profilepicture != null && !currentUser.profilepicture.isEmpty()) {
-            return currentUser.profilepicture;
+        if (currentUser != null && currentUser.getProfilepicture() != null && !currentUser.getProfilepicture().isEmpty()) {
+            return currentUser.getProfilepicture();
         }
         
         // Return the same format as used in UserData.xml for default avatar
@@ -487,7 +487,7 @@ public void initialize(URL url, ResourceBundle rb) {
         
         // Start chat history session if user is available
         if (currentUser != null && historyManager != null) {
-            historyManager.startSession(currentUser.username);
+            historyManager.startSession(currentUser.getUsername());
         }
         
         // Load previous chat history if available
@@ -601,7 +601,7 @@ private void startLoadingAnimation(Text dotsText) {
     private void loadRecentChatHistory() {
         if (!canLoadHistory()) return;
         try {
-            var histories = historyManager.loadUserHistory(currentUser.username);
+            var histories = historyManager.loadUserHistory(currentUser.getUsername());
             int startIndex = computeHistoryStartIndex(histories);
             if (histories.size() <= startIndex) return; // Nothing to show
 
@@ -645,10 +645,10 @@ private void showPreviousSessionHeader(com.starlight.model.ChatHistory history)
     private void appendRecentMessages(java.util.List<com.starlight.model.ChatMessage> messages, int startIndex) {
         for (int i = startIndex; i < messages.size(); i++) {
             var msg = messages.get(i);
-            if (msg != null && msg.content != null) {
-                String content = msg.content.trim();
+            if (msg != null && msg.getContent() != null) {
+                String content = msg.getContent().trim();
                 if (!content.isEmpty()) {
-                    addBubble(content, msg.isUser, false);
+                    addBubble(content, msg.isUser(), false);
                 }
             }
         }
@@ -702,7 +702,7 @@ public void endCurrentSession() {
      */
     public void startNewSession() {
         if (currentUser != null && historyManager != null) {
-            historyManager.startSession(currentUser.username);
+            historyManager.startSession(currentUser.getUsername());
             logger.info("New chat session started");
         }
     }
diff --git a/src/main/java/com/starlight/controller/CreatePostController.java b/src/main/java/com/starlight/controller/CreatePostController.java
index ebfd265..9b9b814 100644
--- a/src/main/java/com/starlight/controller/CreatePostController.java
+++ b/src/main/java/com/starlight/controller/CreatePostController.java
@@ -126,25 +126,25 @@ public void initialize(URL url, ResourceBundle rb) {
 
             // Create a new Post object
             Post newPost = new Post();
-            newPost.uuid = UUID.randomUUID().toString();
-            newPost.username = Session.getCurrentUser().username;
-            newPost.profilepicture = "src/main/resources/com/starlight/images/dummy/2.png";
-            newPost.title = postTitle;
-            newPost.description = postDescription;
-            newPost.ingredients = postIngredients;
-            newPost.directions = postDirections;
-            newPost.uploadtime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+            newPost.setUuid(UUID.randomUUID().toString());
+            newPost.setUsername(Session.getCurrentUser().getUsername());
+            newPost.setProfilepicture("src/main/resources/com/starlight/images/dummy/2.png");
+            newPost.setTitle(postTitle);
+            newPost.setDescription(postDescription);
+            newPost.setIngredients(postIngredients);
+            newPost.setDirections(postDirections);
+            newPost.setUploadtime(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
             try {
                 String storedPath = copyImageToUserDir(selectedImage);
-                newPost.image = storedPath != null ? storedPath : selectedImage.getAbsolutePath();
+                newPost.setImage(storedPath != null ? storedPath : selectedImage.getAbsolutePath());
             } catch (Exception e) {
                 e.printStackTrace();
                 newPost.image = selectedImage.getAbsolutePath();
             }
-            newPost.likecount = "0";
-            newPost.commentcount = "0";
-            newPost.isLiked = "false";
-            newPost.rating = "0.0";
+            newPost.setLikecount("0");
+            newPost.setCommentcount("0");
+            newPost.setIsLiked("false");
+            newPost.setRating("0.0");
 
             // Close the current dialog first
             Stage currentStage = (Stage) submit.getScene().getWindow();
@@ -189,7 +189,7 @@ private String formatTextAsVerticalLineSeparated(String text) {
      */
     private String copyImageToUserDir(File image) {
         try {
-            String username = Session.getCurrentUser() != null ? Session.getCurrentUser().username : "unknown";
+            String username = Session.getCurrentUser() != null ? Session.getCurrentUser().getUsername() : "unknown";
             return com.starlight.util.FileSystemManager.copyFileToUserDirectoryWithUniqueFilename(image, username);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Failed to copy image to user directory: {0}", new Object[]{e.getMessage()});
@@ -260,10 +260,10 @@ protected Void call() throws Exception {
                             });
                             
                             String nutritionResponse = chatbotAPI.analyzeNutritionFacts(ingredients);
-                            newPost.nutrition = nutritionParser.parseNutritionFromResponse(nutritionResponse);
+                            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(nutritionResponse));
                             
             // Check if we got valid nutrition data
-            if (newPost.nutrition != null && newPost.nutrition.ingredient != null && !newPost.nutrition.ingredient.isEmpty()) {
+            if (newPost.nutrition != null && newPost.nutrition.getIngredient() != null && !newPost.nutrition.getIngredient().isEmpty()) {
                 logger.info(java.text.MessageFormat.format(
                     "Nutrition analysis completed successfully on attempt {0}", currentAttempt));
                 
@@ -344,8 +344,8 @@ protected Void call() throws Exception {
                         }
                     });
                     
-                    // Use fallback nutrition data
-                    newPost.nutrition = nutritionParser.parseNutritionFromResponse(null); // Creates fallback nutrition
+                // Use fallback nutrition data
+                    newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null)); // Creates fallback nutrition
                     
                     return null;
                 }
diff --git a/src/main/java/com/starlight/controller/DeleteDialogController.java b/src/main/java/com/starlight/controller/DeleteDialogController.java
index 518f63e..8acb6cb 100644
--- a/src/main/java/com/starlight/controller/DeleteDialogController.java
+++ b/src/main/java/com/starlight/controller/DeleteDialogController.java
@@ -69,7 +69,7 @@ private void handleDeletePost(Post postToDelete) {
         // Remove the post from the repository
         try {
             List<Post> posts = repository.loadPosts();
-            posts.removeIf(post -> post.uuid != null && post.uuid.equals(postToDelete.uuid));
+            posts.removeIf(post -> post.getUuid() != null && post.getUuid().equals(postToDelete.getUuid()));
             repository.savePosts(posts);
 
             confirmed = true;
diff --git a/src/main/java/com/starlight/controller/EditPostController.java b/src/main/java/com/starlight/controller/EditPostController.java
index 6ad6c54..d020eba 100644
--- a/src/main/java/com/starlight/controller/EditPostController.java
+++ b/src/main/java/com/starlight/controller/EditPostController.java
@@ -79,15 +79,14 @@ public void setPost(Post post) {
      */
     private void populateFields() {
         if (currentPost == null) return;
+        title.setText(currentPost.getTitle() != null ? currentPost.getTitle() : "");
+        description.setText(currentPost.getDescription() != null ? currentPost.getDescription() : "");
+        ingredients.setText(currentPost.getIngredients() != null ? currentPost.getIngredients() : "");
+        directions.setText(currentPost.getDirections() != null ? currentPost.getDirections() : "");
 
-        title.setText(currentPost.title != null ? currentPost.title : "");
-        description.setText(currentPost.description != null ? currentPost.description : "");
-        ingredients.setText(currentPost.ingredients != null ? currentPost.ingredients : "");
-        directions.setText(currentPost.directions != null ? currentPost.directions : "");
-        
         // Set image status
-        if (currentPost.image != null && !currentPost.image.isEmpty()) {
-            pickerstatus.setText("Current: " + new File(currentPost.image).getName());
+        if (currentPost.getImage() != null && !currentPost.getImage().isEmpty()) {
+            pickerstatus.setText("Current: " + new File(currentPost.getImage()).getName());
         } else {
             pickerstatus.setText(NO_IMAGE_SELECTED);
         }
@@ -98,7 +97,7 @@ private void populateFields() {
      */
     private String copyImageToUserDir(File image) {
         try {
-            String username = Session.getCurrentUser() != null ? Session.getCurrentUser().username : "unknown";
+            String username = Session.getCurrentUser() != null ? Session.getCurrentUser().getUsername() : "unknown";
             return com.starlight.util.FileSystemManager.copyFileToUserDirectoryWithUniqueFilename(image, username);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Failed to copy image to user directory: {0}", new Object[]{e.getMessage()});
@@ -141,8 +140,8 @@ private void setupImagePicker() {
 
     /** If current post has an image keep showing it, else show no image message. */
     private void restoreOrShowNoImage() {
-        if (currentPost != null && currentPost.image != null && !currentPost.image.isEmpty()) {
-            pickerstatus.setText("Current: " + new File(currentPost.image).getName());
+        if (currentPost != null && currentPost.getImage() != null && !currentPost.getImage().isEmpty()) {
+            pickerstatus.setText("Current: " + new File(currentPost.getImage()).getName());
         } else {
             pickerstatus.setText(NO_IMAGE_SELECTED);
         }
@@ -179,20 +178,20 @@ private boolean validateFormInputs() {
     private boolean isEmpty(TextArea area) { return area.getText() == null || area.getText().isEmpty(); }
 
     private void applyFormToPost() {
-        currentPost.title = title.getText();
-        currentPost.description = description.getText();
-        currentPost.ingredients = ingredients.getText();
-        currentPost.directions = directions.getText();
+    currentPost.setTitle(title.getText());
+    currentPost.setDescription(description.getText());
+    currentPost.setIngredients(ingredients.getText());
+    currentPost.setDirections(directions.getText());
     }
 
     private void handleImageUpdate() {
         if (selectedImage == null) return;
         try {
             String storedPath = copyImageToUserDir(selectedImage);
-            currentPost.image = storedPath != null ? storedPath : selectedImage.getAbsolutePath();
+            currentPost.setImage(storedPath != null ? storedPath : selectedImage.getAbsolutePath());
         } catch (Exception e) {
             logger.log(Level.WARNING, "Image copy failed, using original path: {0}", new Object[]{e.getMessage()});
-            currentPost.image = selectedImage.getAbsolutePath();
+            currentPost.setImage(selectedImage.getAbsolutePath());
         }
     }
 
@@ -216,7 +215,7 @@ private void persistPostAndShowResult() {
     private void replacePostInList(List<Post> posts, Post updated) {
         for (int i = 0; i < posts.size(); i++) {
             Post p = posts.get(i);
-            if (p.uuid != null && p.uuid.equals(updated.uuid)) {
+            if (p.getUuid() != null && p.getUuid().equals(updated.getUuid())) {
                 posts.set(i, updated);
                 return;
             }
diff --git a/src/main/java/com/starlight/controller/EditProfileController.java b/src/main/java/com/starlight/controller/EditProfileController.java
index 8828af3..6ea9a77 100644
--- a/src/main/java/com/starlight/controller/EditProfileController.java
+++ b/src/main/java/com/starlight/controller/EditProfileController.java
@@ -68,16 +68,16 @@ public class EditProfileController implements Initializable {
 
     public void setUser(User user) {
         this.currentUser = user;
-        if (welcomeLabel != null) welcomeLabel.setText("Hello, " + user.username);
-        if (emailField != null) emailField.setText(user.email);
-        if (passwordField != null) passwordField.setText(user.password);
-        if (birthDayPicker != null && user.birthDay != null && !user.birthDay.isEmpty()) {
-            birthDayPicker.setValue(java.time.LocalDate.parse(user.birthDay));
+        if (welcomeLabel != null) welcomeLabel.setText("Hello, " + user.getUsername());
+        if (emailField != null) emailField.setText(user.getEmail());
+        if (passwordField != null) passwordField.setText(user.getPassword());
+        if (birthDayPicker != null && user.getBirthDay() != null && !user.getBirthDay().isEmpty()) {
+            birthDayPicker.setValue(java.time.LocalDate.parse(user.getBirthDay()));
         }
         
         // Load and scale profile image using ImageUtils
         if (Image != null) {
-            ImageUtils.loadImage(Image, user.profilepicture, ImageUtils.DEFAULT_MISSING_IMAGE);
+            ImageUtils.loadImage(Image, user.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
             ImageUtils.scaleToFit(Image, 170, 170, 200);
         }
     }
@@ -102,7 +102,7 @@ private void loadCurrentUserProfileImage() {
         User currentSessionUser = Session.getCurrentUser();
         if (currentSessionUser != null && Image != null) {
             // Load profile image using ImageUtils
-            ImageUtils.loadImage(Image, currentSessionUser.profilepicture, ImageUtils.DEFAULT_MISSING_IMAGE);
+            ImageUtils.loadImage(Image, currentSessionUser.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
             ImageUtils.scaleToFit(Image, 170, 170, 85); // Circular profile image with rounded corners
         }
     }
@@ -143,7 +143,7 @@ private void updateProfileImage(File selectedFile) {
             
             // Copy the selected file to the user's directory
             String copiedFilePath = com.starlight.util.FileSystemManager.copyFileToUserDirectoryWithUniqueFilename(
-                selectedFile, currentSessionUser.username);
+                selectedFile, currentSessionUser.getUsername());
             
             if (copiedFilePath == null) {
                 logger.warning("Failed to copy image file to user directory");
@@ -151,19 +151,19 @@ private void updateProfileImage(File selectedFile) {
             }
             
             // Update the current user's profile picture path
-            currentSessionUser.profilepicture = copiedFilePath;
+            currentSessionUser.setProfilepicture(copiedFilePath);
             
             // Also update currentUser if it's set
             if (currentUser != null) {
-                currentUser.profilepicture = copiedFilePath;
+                currentUser.setProfilepicture(copiedFilePath);
             }
             
             // Update the UserData XML file
             com.starlight.repository.UserDataRepository repo = new com.starlight.repository.UserDataRepository();
             java.util.List<com.starlight.model.User> users = repo.loadUsers();
             for (com.starlight.model.User u : users) {
-                if (u.username.equals(currentSessionUser.username)) {
-                    u.profilepicture = copiedFilePath;
+                if (u.getUsername().equals(currentSessionUser.getUsername())) {
+                    u.setProfilepicture(copiedFilePath);
                     break;
                 }
             }
@@ -189,15 +189,15 @@ public void initialize(URL url, ResourceBundle rb) {
             String newPass = passwordField.getText();
             String birth = birthDayPicker.getValue() != null ? birthDayPicker.getValue().toString() : null;
             try {
-                URL endpoint = new URL("http://localhost:8000/users/" + currentUser.username);
+                URL endpoint = new URL("http://localhost:8000/users/" + currentUser.getUsername());
                 HttpURLConnection conn = (HttpURLConnection) endpoint.openConnection();
                 conn.setRequestMethod("PUT");
                 conn.setRequestProperty("Content-Type", "application/xml");
                 conn.setDoOutput(true);
                 User u = new User();
-                u.email = newEmail;
-                u.password = newPass;
-                u.birthDay = birth;
+                u.setEmail(newEmail);
+                u.setPassword(newPass);
+                u.setBirthDay(birth);
                 XStream xs = new XStream(new DomDriver());
                 xs.allowTypesByWildcard(new String[]{"com.starlight.model.*"});
                 xs.alias("user", User.class);
@@ -223,7 +223,7 @@ public void initialize(URL url, ResourceBundle rb) {
 
         User currentSessionUser = Session.getCurrentUser();
         if (currentSessionUser != null && welcomeLabel != null) {
-            welcomeLabel.setText("Hello, " + currentSessionUser.username);
+            welcomeLabel.setText("Hello, " + currentSessionUser.getUsername());
         }
         
         // Load the current user's profile image
@@ -242,18 +242,18 @@ private void onUpdate(javafx.event.ActionEvent event) {
         com.starlight.repository.UserDataRepository repo = new com.starlight.repository.UserDataRepository();
         java.util.List<com.starlight.model.User> users = repo.loadUsers();
         for (com.starlight.model.User u : users) {
-            if (u.username.equals(currentUser.username)) {
-                u.email = email;
-                u.password = password;
-                u.birthDay = birthDay != null ? birthDay.toString() : null;
+        if (u.getUsername().equals(currentUser.getUsername())) {
+        u.setEmail(email);
+        u.setPassword(password);
+        u.setBirthDay(birthDay != null ? birthDay.toString() : null);
                 break;
             }
         }
         repo.saveUsers(users);
         logger.info("User updated successfully");
-        currentUser.email = email;
-        currentUser.password = password;
-        currentUser.birthDay = birthDay != null ? birthDay.toString() : null;
+    currentUser.setEmail(email);
+    currentUser.setPassword(password);
+    currentUser.setBirthDay(birthDay != null ? birthDay.toString() : null);
         
         // Refresh the profile image in case it was updated
         loadCurrentUserProfileImage();
@@ -264,7 +264,7 @@ public void onDelete(javafx.event.ActionEvent event) {
         try {
             // Remove user from UserDataRepository using the new deleteUser method
             com.starlight.repository.UserDataRepository repo = new com.starlight.repository.UserDataRepository();
-            boolean userDeleted = repo.deleteUser(currentUser.username);
+            boolean userDeleted = repo.deleteUser(currentUser.getUsername());
             
             if (!userDeleted) {
                 logger.warning("User could not be deleted.");
diff --git a/src/main/java/com/starlight/controller/LoginViewController.java b/src/main/java/com/starlight/controller/LoginViewController.java
index 314a840..eeb06f7 100644
--- a/src/main/java/com/starlight/controller/LoginViewController.java
+++ b/src/main/java/com/starlight/controller/LoginViewController.java
@@ -98,7 +98,7 @@ private void performLogin() {
         try {
             User logged = apiClient.login(em, pass);
             Session.setCurrentUser(logged);
-            logger.info("Login success for user: " + logged.username);
+            logger.info("Login success for user: " + logged.getUsername());
             
             // Ensure we redirect to main.fxml after successful login
             App.loadMainWithSplash();
diff --git a/src/main/java/com/starlight/controller/MainController.java b/src/main/java/com/starlight/controller/MainController.java
index a3010bb..d317ab4 100644
--- a/src/main/java/com/starlight/controller/MainController.java
+++ b/src/main/java/com/starlight/controller/MainController.java
@@ -179,9 +179,9 @@ private boolean isCurrentUserAdmin() {
         if (Session.getCurrentUser() == null) {
             return false;
         }
-        
-        String username = Session.getCurrentUser().username;
-        return username != null && username.toLowerCase().equals("admin");
+
+        String username = Session.getCurrentUser().getUsername();
+        return username != null && username.equalsIgnoreCase("admin");
     }
     
     /**
diff --git a/src/main/java/com/starlight/controller/NavbarController.java b/src/main/java/com/starlight/controller/NavbarController.java
index 2bae43d..6bc6496 100644
--- a/src/main/java/com/starlight/controller/NavbarController.java
+++ b/src/main/java/com/starlight/controller/NavbarController.java
@@ -63,8 +63,8 @@ void inbox(MouseEvent event) {
     private void initialize() {
         User currentUser = Session.getCurrentUser();
         if (currentUser != null) {
-            if (currentUser.profilepicture != null && !currentUser.profilepicture.isEmpty()) {
-                ImageUtils.loadImage(photoprofile, currentUser.profilepicture, "/com/starlight/images/default-profile.png");
+            if (currentUser.getProfilepicture() != null && !currentUser.getProfilepicture().isEmpty()) {
+                ImageUtils.loadImage(photoprofile, currentUser.getProfilepicture(), "/com/starlight/images/default-profile.png");
             } else {
                 ImageUtils.loadImage(photoprofile, "/com/starlight/images/default-profile.png");
             }
diff --git a/src/main/java/com/starlight/controller/PostController.java b/src/main/java/com/starlight/controller/PostController.java
index 3b9c90a..d6ef6b7 100644
--- a/src/main/java/com/starlight/controller/PostController.java
+++ b/src/main/java/com/starlight/controller/PostController.java
@@ -110,7 +110,7 @@ private void doAnalysis(javafx.event.ActionEvent event) {
             return;
         }
         
-        if (currentPost.ingredients == null || currentPost.ingredients.trim().isEmpty()) {
+    if (currentPost.getIngredients() == null || currentPost.getIngredients().trim().isEmpty()) {
             logger.warning("Cannot perform analysis - no ingredients available");
             showAnalysisErrorDialog("No ingredients found in this recipe to analyze.");
             return;
@@ -144,25 +144,25 @@ public void setPost(Post post) {
      */
     private void updateUIFromPost() {
         if (currentPost == null) return;
-        
+
         if (description != null) {
-            description.setText(currentPost.description != null ? currentPost.description : "");
+            description.setText(currentPost.getDescription() != null ? currentPost.getDescription() : "");
         }
-        
+
         if (uploadtime != null) {
-            uploadtime.setText(formatRelativeTime(currentPost.uploadtime));
+            uploadtime.setText(formatRelativeTime(currentPost.getUploadtime()));
         }
         
         // Update username with display name from UserData
         if (username != null) {
-            String displayUsername = getDisplayUsernameForUser(currentPost.username);
-            username.setText(displayUsername != null ? displayUsername : currentPost.username);
+            String displayUsername = getDisplayUsernameForUser(currentPost.getUsername());
+            username.setText(displayUsername != null ? displayUsername : currentPost.getUsername());
         }
         
         // Update verdict button if available
-        if (verdict != null && currentPost.nutrition != null) {
-            String verdictText = currentPost.nutrition.verdict != null ? 
-                currentPost.nutrition.verdict : "Unknown";
+        if (verdict != null && currentPost.getNutrition() != null) {
+            String verdictText = currentPost.getNutrition().getVerdict() != null ? 
+                currentPost.getNutrition().getVerdict() : "Unknown";
             verdict.setText(verdictText);
             
             // Apply different styling based on verdict
@@ -197,7 +197,7 @@ private void updateUIFromPost() {
         
         // Update doAnalysis button state based on current nutrition status
         if (doAnalysis != null) {
-            if (currentPost.nutrition != null && currentPost.nutrition.verdict != null && !currentPost.nutrition.verdict.equals("Unknown")) {
+            if (currentPost.getNutrition() != null && currentPost.getNutrition().getVerdict() != null && !currentPost.getNutrition().getVerdict().equals("Unknown")) {
                 // Recipe has been analyzed - button can re-analyze
                 doAnalysis.setText("Re-analyze");
                 doAnalysis.setDisable(false);
@@ -208,7 +208,7 @@ private void updateUIFromPost() {
             }
             
             // Disable if no ingredients available
-            if (currentPost.ingredients == null || currentPost.ingredients.trim().isEmpty()) {
+            if (currentPost.getIngredients() == null || currentPost.getIngredients().trim().isEmpty()) {
                 doAnalysis.setText("No Ingredients");
                 doAnalysis.setDisable(true);
             }
@@ -216,19 +216,19 @@ private void updateUIFromPost() {
         
         // Load profile picture
         if (profile1 != null) {
-            String profilePicture = getProfilePictureForUser(currentPost.username);
+            String profilePicture = getProfilePictureForUser(currentPost.getUsername());
             ImageUtils.loadImage(profile1, profilePicture, ImageUtils.DEFAULT_MISSING_IMAGE);
             ImageUtils.scaleToFit(profile1, 80, 80, 500);
         }
         
         // Load post image
         if (recentphoto1 != null) {
-            ImageUtils.loadImage(recentphoto1, currentPost.image, ImageUtils.DEFAULT_MISSING_IMAGE);
+            ImageUtils.loadImage(recentphoto1, currentPost.getImage(), ImageUtils.DEFAULT_MISSING_IMAGE);
             ImageUtils.scaleToFit(recentphoto1, 1270, 990, 20);
         }
         
-        // Populate recipe container with formatted text
-        populateRecipeContainer();
+    // Populate recipe container with formatted text
+    populateRecipeContainer();
         
         // Populate nutrition facts chart
         populateNutritionFacts();
@@ -245,27 +245,27 @@ private void populateRecipeContainer() {
         textFlow.getStyleClass().add("post-recipe");
         
         // Add title section
-        if (currentPost.title != null && !currentPost.title.trim().isEmpty()) {
-            addSectionTitle(textFlow, currentPost.title);
+        if (currentPost.getTitle() != null && !currentPost.getTitle().trim().isEmpty()) {
+            addSectionTitle(textFlow, currentPost.getTitle());
             addNewLine(textFlow, 2);
         }
         
         // Add ingredients section
-        if (currentPost.ingredients != null && !currentPost.ingredients.trim().isEmpty()) {
+        if (currentPost.getIngredients() != null && !currentPost.getIngredients().trim().isEmpty()) {
             addSectionTitle(textFlow, "Ingredients :");
             addNewLine(textFlow, 1);
             // Parse vertical line-separated ingredients as newlines
-            String ingredientsWithNewlines = currentPost.ingredients.replace("|", "\n");
+            String ingredientsWithNewlines = currentPost.getIngredients().replace("|", "\n");
             addBulletList(textFlow, ingredientsWithNewlines);
             addNewLine(textFlow, 1);
         }
         
         // Add directions section
-        if (currentPost.directions != null && !currentPost.directions.trim().isEmpty()) {
+        if (currentPost.getDirections() != null && !currentPost.getDirections().trim().isEmpty()) {
             addSectionTitle(textFlow, "Directions :");
             addNewLine(textFlow, 1);
             // Parse vertical line-separated directions as newlines
-            String directionsWithNewlines = currentPost.directions.replace("|", "\n");
+            String directionsWithNewlines = currentPost.getDirections().replace("|", "\n");
             addNumberedList(textFlow, directionsWithNewlines);
         }
         
@@ -373,8 +373,8 @@ private String getProfilePictureForUser(String username) {
         
         var users = userRepository.loadUsers();
         for (var user : users) {
-            if (username.equals(user.username)) {
-                return user.profilepicture;
+            if (username.equals(user.getUsername())) {
+                return user.getProfilepicture();
             }
         }
         return null;
@@ -389,10 +389,10 @@ private String getDisplayUsernameForUser(String username) {
         
         var users = userRepository.loadUsers();
         for (var user : users) {
-            if (username.equals(user.username)) {
+            if (username.equals(user.getUsername())) {
                 // Return fullname if available, otherwise return username
-                return user.fullname != null && !user.fullname.trim().isEmpty() 
-                    ? user.fullname : user.username;
+                return user.getFullname() != null && !user.getFullname().trim().isEmpty()
+                    ? user.getFullname() : user.getUsername();
             }
         }
         return username; // fallback to original username if not found
@@ -558,9 +558,9 @@ private void showProcessingAndAnalyzeNutrition() {
                     dialogStage.close();
                     
                     Nutrition newNutrition = nutritionTask.getValue();
-                    if (newNutrition != null && !newNutrition.ingredient.isEmpty()) {
+                    if (newNutrition != null && !newNutrition.getIngredient().isEmpty()) {
                         // Update the current post's nutrition
-                        currentPost.nutrition = newNutrition;
+                        currentPost.setNutrition(newNutrition);
                         
                         // Save the updated post to XML
                         saveUpdatedPost();
@@ -613,7 +613,7 @@ private Task<Nutrition> createNutritionAnalysisTask(ProcessingDialogController p
         return new Task<Nutrition>() {
             @Override
             protected Nutrition call() throws Exception {
-                String ingredients = currentPost.ingredients;
+                String ingredients = currentPost.getIngredients();
                 Exception lastException = null;
                 
                 // Try analysis up to MAX_RETRIES times
@@ -630,8 +630,8 @@ protected Nutrition call() throws Exception {
                         // Parse the AI response into Nutrition object
                         Nutrition nutrition = nutritionParser.parseNutritionFromResponse(nutritionResponse);
                         
-                        if (nutrition != null && !nutrition.ingredient.isEmpty()) {
-                            logger.info("Nutrition analysis completed successfully on attempt " + currentAttempt);
+                        if (nutrition != null && !nutrition.getIngredient().isEmpty()) {
+                            logger.info(() -> "Nutrition analysis completed successfully on attempt " + currentAttempt);
                             Platform.runLater(() -> 
                                 processingController.updateStatus("Analysis completed successfully!")
                             );
@@ -674,7 +674,7 @@ private void saveUpdatedPost() {
             boolean updated = false;
             for (int i = 0; i < allPosts.size(); i++) {
                 Post post = allPosts.get(i);
-                if (post.uuid != null && post.uuid.equals(currentPost.uuid)) {
+                        if (post.getUuid() != null && post.getUuid().equals(currentPost.getUuid())) {
                     // Update the post in the list
                     allPosts.set(i, currentPost);
                     updated = true;
diff --git a/src/main/java/com/starlight/controller/PostItemController.java b/src/main/java/com/starlight/controller/PostItemController.java
index d73550f..58cb1b9 100644
--- a/src/main/java/com/starlight/controller/PostItemController.java
+++ b/src/main/java/com/starlight/controller/PostItemController.java
@@ -73,14 +73,14 @@ public void handleLikeClick(javafx.event.ActionEvent event) {
         if (currentPost == null) return;
         
         try {
-            int currentLikes = Integer.parseInt(currentPost.likecount != null ? currentPost.likecount : "0");
-            boolean wasLiked = "true".equals(currentPost.isLiked);
+            int currentLikes = Integer.parseInt(currentPost.getLikecount() != null ? currentPost.getLikecount() : "0");
+            boolean wasLiked = "true".equals(currentPost.getIsLiked());
             
             if (wasLiked) {
                 // Unlike the post
                 currentLikes = Math.max(0, currentLikes - 1);
-                currentPost.likecount = String.valueOf(currentLikes);
-                currentPost.isLiked = "false";
+                currentPost.setLikecount(String.valueOf(currentLikes));
+                currentPost.setIsLiked("false");
                 
                 // Change image back to normal like icon
                 if (likebutton != null) {
@@ -89,8 +89,8 @@ public void handleLikeClick(javafx.event.ActionEvent event) {
             } else {
                 // Like the post
                 currentLikes++;
-                currentPost.likecount = String.valueOf(currentLikes);
-                currentPost.isLiked = "true";
+                currentPost.setLikecount(String.valueOf(currentLikes));
+                currentPost.setIsLiked("true");
                 
                 // Change image to liked icon
                 if (likebutton != null) {
@@ -106,10 +106,10 @@ public void handleLikeClick(javafx.event.ActionEvent event) {
             
         } catch (NumberFormatException e) {
             // Handle invalid like count
-            logger.warning("Invalid like count for post: " + (currentPost != null ? currentPost.uuid : "unknown"));
+            logger.warning("Invalid like count for post: " + (currentPost != null ? currentPost.getUuid() : "unknown"));
             e.printStackTrace();
-            currentPost.likecount = "0";
-            currentPost.isLiked = "false";
+            currentPost.setLikecount("0");
+            currentPost.setIsLiked("false");
             likecounter.setText("0");
         }
     }
@@ -122,9 +122,9 @@ public void handleCommentClick(javafx.event.ActionEvent event) {
         if (currentPost == null) return;
         
         try {
-            int currentComments = Integer.parseInt(currentPost.commentcount != null ? currentPost.commentcount : "0");
+            int currentComments = Integer.parseInt(currentPost.getCommentcount() != null ? currentPost.getCommentcount() : "0");
             currentComments++;
-            currentPost.commentcount = String.valueOf(currentComments);
+            currentPost.setCommentcount(String.valueOf(currentComments));
             
             // Update the button text
             commentcounter.setText(String.valueOf(currentComments));
@@ -134,7 +134,7 @@ public void handleCommentClick(javafx.event.ActionEvent event) {
             
         } catch (NumberFormatException e) {
             // Handle invalid comment count
-            currentPost.commentcount = "0";
+            currentPost.setCommentcount("0");
             commentcounter.setText("0");
         }
     }
@@ -155,17 +155,17 @@ private void updateUIFromPost() {
         
         // Update like counter
         if (likecounter != null) {
-            likecounter.setText(currentPost.likecount != null ? currentPost.likecount : "0");
+            likecounter.setText(currentPost.getLikecount() != null ? currentPost.getLikecount() : "0");
         }
         
         // Update comment counter
         if (commentcounter != null) {
-            commentcounter.setText(currentPost.commentcount != null ? currentPost.commentcount : "0");
+            commentcounter.setText(currentPost.getCommentcount() != null ? currentPost.getCommentcount() : "0");
         }
         
         // Update like button image based on liked state
         if (likebutton != null) {
-            boolean isLiked = "true".equals(currentPost.isLiked);
+            boolean isLiked = "true".equals(currentPost.getIsLiked());
             if (isLiked) {
                 likebutton.setImage(new Image(getClass().getResourceAsStream("/com/starlight/icon/like_1.png")));
             } else {
@@ -186,7 +186,7 @@ private void savePostData() {
             // Find and update the current post in the list
             for (int i = 0; i < posts.size(); i++) {
                 Post post = posts.get(i);
-                if (post.uuid != null && post.uuid.equals(currentPost.uuid)) {
+                if (post.getUuid() != null && post.getUuid().equals(currentPost.getUuid())) {
                     posts.set(i, currentPost);
                     break;
                 }
diff --git a/src/main/java/com/starlight/controller/ProfileController.java b/src/main/java/com/starlight/controller/ProfileController.java
index 2b534c8..b4b0482 100644
--- a/src/main/java/com/starlight/controller/ProfileController.java
+++ b/src/main/java/com/starlight/controller/ProfileController.java
@@ -130,13 +130,13 @@ private void loadUserProfile() {
         if (currentUser != null) {
             // Set username using display name logic from CommunityController
             if (username != null) {
-                String displayName = communityController.getDisplayUsernameForUser(currentUser.username);
-                username.setText(displayName != null ? displayName : currentUser.username);
+                String displayName = communityController.getDisplayUsernameForUser(currentUser.getUsername());
+                username.setText(displayName != null ? displayName : currentUser.getUsername());
             }
             
             // Load profile picture using ImageUtils
             if (profile != null) {
-                ImageUtils.loadImage(profile, currentUser.profilepicture, ImageUtils.DEFAULT_MISSING_IMAGE);
+                ImageUtils.loadImage(profile, currentUser.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
                 ImageUtils.scaleToFit(profile, 170, 170, 200); // Adjust size as needed
             }
             
@@ -177,7 +177,7 @@ private void loadUserRecipes() {
         
         // Filter posts by current user
         List<Post> userPosts = allPosts.stream()
-            .filter(post -> currentUser.username.equals(post.username))
+            .filter(post -> currentUser.getUsername().equals(post.getUsername()))
             .toList();
             
         if (userPosts.isEmpty()) {
@@ -194,10 +194,10 @@ private void loadUserRecipes() {
         recipeContainer.setSpacing(20);
         
         for (Post post : userPosts) {
-            String title = post.title;
-            String image = post.image;
-            String likes = post.likecount;
-            String rating = post.rating;
+            String title = post.getTitle();
+            String image = post.getImage();
+            String likes = post.getLikecount();
+            String rating = post.getRating();
 
             try {
                 FXMLLoader loader = new FXMLLoader(getClass().getResource("/com/starlight/view/recipeItem.fxml"));
diff --git a/src/main/java/com/starlight/controller/RecipeManagerController.java b/src/main/java/com/starlight/controller/RecipeManagerController.java
index eb602ac..79bc681 100644
--- a/src/main/java/com/starlight/controller/RecipeManagerController.java
+++ b/src/main/java/com/starlight/controller/RecipeManagerController.java
@@ -87,13 +87,13 @@ public static class PostTableData {
 
         public PostTableData(Post post) {
             this.originalPost = post;
-            this.uuid = new SimpleStringProperty(post.uuid != null ? post.uuid : "");
-            this.title = new SimpleStringProperty(post.title != null ? post.title : "");
-            this.username = new SimpleStringProperty(post.username != null ? post.username : "");
-            this.rating = new SimpleStringProperty(post.rating != null ? post.rating : "0.0");
-            this.likeCount = new SimpleStringProperty(post.likecount != null ? post.likecount : "0");
-            this.uploadTime = new SimpleStringProperty(formatDateTime(post.uploadtime));
-            this.description = new SimpleStringProperty(post.description != null ? post.description : "");
+            this.uuid = new SimpleStringProperty(post.getUuid() != null ? post.getUuid() : "");
+            this.title = new SimpleStringProperty(post.getTitle() != null ? post.getTitle() : "");
+            this.username = new SimpleStringProperty(post.getUsername() != null ? post.getUsername() : "");
+            this.rating = new SimpleStringProperty(post.getRating() != null ? post.getRating() : "0.0");
+            this.likeCount = new SimpleStringProperty(post.getLikecount() != null ? post.getLikecount() : "0");
+            this.uploadTime = new SimpleStringProperty(formatDateTime(post.getUploadtime()));
+            this.description = new SimpleStringProperty(post.getDescription() != null ? post.getDescription() : "");
         }
 
         private static String formatDateTime(String uploadTime) {
@@ -176,8 +176,8 @@ private boolean hasAdminAccess() {
         }
         
         // Only allow access for users with exact username "admin"
-        return currentUser.username != null && 
-               currentUser.username.toLowerCase().equals("admin");
+    return currentUser.getUsername() != null && 
+           currentUser.getUsername().equalsIgnoreCase("admin");
     }
     
     /**
@@ -637,7 +637,7 @@ private void savePostChanges(Post post) {
             
             // Find and update the post
             for (int i = 0; i < allPosts.size(); i++) {
-                if (allPosts.get(i).uuid != null && allPosts.get(i).uuid.equals(post.uuid)) {
+                if (allPosts.get(i).getUuid() != null && allPosts.get(i).getUuid().equals(post.getUuid())) {
                     allPosts.set(i, post);
                     break;
                 }
@@ -679,18 +679,18 @@ private void addTestData() {
         
         // Create dummy posts for testing
         Post testPost1 = new Post();
-        testPost1.uuid = "test-1";
+    testPost1.setUuid("test-1");
         testPost1.title = "Test Post 1";
-        testPost1.username = "TestUser1";
+    testPost1.setUsername("TestUser1");
         testPost1.rating = "4.5";
         testPost1.likecount = "10";
         testPost1.uploadtime = "2025-07-20T19:00:00";
         testPost1.description = "This is a test post to verify table functionality";
         
         Post testPost2 = new Post();
-        testPost2.uuid = "test-2";
+    testPost2.setUuid("test-2");
         testPost2.title = "Test Post 2";
-        testPost2.username = "TestUser2";
+    testPost2.setUsername("TestUser2");
         testPost2.rating = "3.8";
         testPost2.likecount = "5";
         testPost2.uploadtime = "2025-07-20T18:30:00";
diff --git a/src/main/java/com/starlight/controller/RegisterViewController.java b/src/main/java/com/starlight/controller/RegisterViewController.java
index e1137ed..61e57ba 100644
--- a/src/main/java/com/starlight/controller/RegisterViewController.java
+++ b/src/main/java/com/starlight/controller/RegisterViewController.java
@@ -112,7 +112,7 @@ private void performRegister() {
         
         try {
             User registered = apiClient.register(user, em, pass);
-            logger.info("Register success for user: " + registered.username);
+            logger.info("Register success for user: " + registered.getUsername());
             
             // Show success message before switching view
             showSuccess("Account created successfully! Please log in.");
diff --git a/src/main/java/com/starlight/controller/UserManagerController.java b/src/main/java/com/starlight/controller/UserManagerController.java
index 4525a69..5b94a38 100644
--- a/src/main/java/com/starlight/controller/UserManagerController.java
+++ b/src/main/java/com/starlight/controller/UserManagerController.java
@@ -41,17 +41,15 @@
 public class UserManagerController implements Initializable {
 
     private static final Logger logger = Logger.getLogger(UserManagerController.class.getName());
+    private static final String ADMIN_USERNAME = "admin";
+    private static final String STATUS_COLUMN_TITLE = "Status";
+    private static final String VALIDATION_ERROR_TITLE = "Validation Error";
+    private static final String ERROR_TITLE = "Error";
 
     @FXML
     private MFXTableView<UserTableData> postsTable;
 
-    // Create table columns programmatically instead of FXML injection
-    private MFXTableColumn<UserTableData> usernameColumn;
-    private MFXTableColumn<UserTableData> fullNameColumn;
-    private MFXTableColumn<UserTableData> emailColumn;
-    private MFXTableColumn<UserTableData> statusColumn;
-    private MFXTableColumn<UserTableData> postsCountColumn;
-    private MFXTableColumn<UserTableData> actionColumn;
+    // Table columns are created as locals in setupTableColumns() to reduce field clutter
 
     @FXML
     private MFXComboBox<String> sortComboBox;
@@ -86,16 +84,16 @@ public static class UserTableData {
 
         public UserTableData(User user, int userPostsCount) {
             this.originalUser = user;
-            this.email = new SimpleStringProperty(user.email != null ? user.email : "");
-            this.username = new SimpleStringProperty(user.username != null ? user.username : "");
-            this.fullName = new SimpleStringProperty(user.fullname != null ? user.fullname : "");
+                this.email = new SimpleStringProperty(user.getEmail() != null ? user.getEmail() : "");
+                this.username = new SimpleStringProperty(user.getUsername() != null ? user.getUsername() : "");
+                this.fullName = new SimpleStringProperty(user.getFullname() != null ? user.getFullname() : "");
             this.joinDate = new SimpleStringProperty("N/A"); // User model doesn't have creation date
             this.status = new SimpleStringProperty(determineUserStatus(user));
             this.postsCount = new SimpleStringProperty(String.valueOf(userPostsCount));
         }
         
         private static String determineUserStatus(User user) {
-            if (user.username != null && user.username.toLowerCase().equals("admin")) {
+            if (user.getUsername() != null && user.getUsername().equalsIgnoreCase(ADMIN_USERNAME)) {
                 return "Admin";
             }
             // You can add more status logic here based on user properties
@@ -161,8 +159,7 @@ private boolean hasAdminAccess() {
         }
         
         // Only allow access for users with exact username "admin"
-        return currentUser.username != null && 
-               currentUser.username.toLowerCase().equals("admin");
+    return currentUser.getUsername() != null && currentUser.getUsername().equalsIgnoreCase(ADMIN_USERNAME);
     }
     
     /**
@@ -187,13 +184,13 @@ private void showAccessDeniedAndClose() {
     private void setupTableColumns() {
         logger.info("Setting up MFXTableView columns for users...");
         
-        // Create table columns programmatically
-        usernameColumn = new MFXTableColumn<>("Username");
-        fullNameColumn = new MFXTableColumn<>("Full Name");
-        emailColumn = new MFXTableColumn<>("Email");
-        statusColumn = new MFXTableColumn<>("Status");
-        postsCountColumn = new MFXTableColumn<>("Posts");
-        actionColumn = new MFXTableColumn<>("Actions");
+    // Create table columns programmatically (locals)
+    MFXTableColumn<UserTableData> usernameColumn = new MFXTableColumn<>("Username");
+    MFXTableColumn<UserTableData> fullNameColumn = new MFXTableColumn<>("Full Name");
+    MFXTableColumn<UserTableData> emailColumn = new MFXTableColumn<>("Email");
+    MFXTableColumn<UserTableData> statusColumn = new MFXTableColumn<>(STATUS_COLUMN_TITLE);
+    MFXTableColumn<UserTableData> postsCountColumn = new MFXTableColumn<>("Posts");
+    MFXTableColumn<UserTableData> actionColumn = new MFXTableColumn<>("Actions");
 
         // Set preferred widths
         usernameColumn.setPrefWidth(120.0);
@@ -235,7 +232,7 @@ private void setupTableColumns() {
             deleteButton.setOnAction(event -> showDeleteConfirmation(item));
             
             // Disable delete for admin users
-            if (item.getUsername().toLowerCase().equals("admin")) {
+            if (item.getUsername().equalsIgnoreCase(ADMIN_USERNAME)) {
                 deleteButton.setDisable(true);
                 deleteButton.setStyle("-fx-background-color: #cccccc; -fx-text-fill: white; -fx-font-size: 12px; -fx-pref-width: 60px;");
             }
@@ -331,26 +328,26 @@ private void showEditDialog(UserTableData data) {
             if (dialogButton == saveButtonType) {
                 // Validate input
                 if (usernameField.getText().trim().isEmpty()) {
-                    showErrorAlert("Validation Error", "Username cannot be empty.");
+                    showErrorAlert(VALIDATION_ERROR_TITLE, "Username cannot be empty.");
                     return null;
                 }
                 
                 if (emailField.getText().trim().isEmpty()) {
-                    showErrorAlert("Validation Error", "Email cannot be empty.");
+                    showErrorAlert(VALIDATION_ERROR_TITLE, "Email cannot be empty.");
                     return null;
                 }
                 
                 // Basic email validation
                 if (!emailField.getText().contains("@")) {
-                    showErrorAlert("Validation Error", "Please enter a valid email address.");
+                    showErrorAlert(VALIDATION_ERROR_TITLE, "Please enter a valid email address.");
                     return null;
                 }
 
                 // Create updated user
                 User updatedUser = data.getOriginalUser();
-                updatedUser.username = usernameField.getText().trim();
-                updatedUser.fullname = fullNameField.getText().trim();
-                updatedUser.email = emailField.getText().trim();
+                updatedUser.setUsername(usernameField.getText().trim());
+                updatedUser.setFullname(fullNameField.getText().trim());
+                updatedUser.setEmail(emailField.getText().trim());
                 // Note: You might want to add more fields to User model for status management
                 
                 return updatedUser;
@@ -364,9 +361,9 @@ private void showEditDialog(UserTableData data) {
             saveUserChanges(updatedUser);
             
             // Update the table data
-            data.username.set(updatedUser.username);
-            data.fullName.set(updatedUser.fullname);
-            data.email.set(updatedUser.email);
+            data.username.set(updatedUser.getUsername());
+            data.fullName.set(updatedUser.getFullname());
+            data.email.set(updatedUser.getEmail());
             
             // Refresh the table
             postsTable.update();
@@ -383,7 +380,7 @@ private void setupSortComboBox() {
             "Username (A-Z)", "Username (Z-A)", 
             "Full Name (A-Z)", "Full Name (Z-A)",
             "Email (A-Z)", "Email (Z-A)",
-            "Status", "Posts Count (High-Low)", "Posts Count (Low-High)"
+            STATUS_COLUMN_TITLE, "Posts Count (High-Low)", "Posts Count (Low-High)"
         );
 
         sortComboBox.setItems(sortOptions);
@@ -420,7 +417,7 @@ protected Void call() throws Exception {
                     List<UserTableData> tableData = users.stream()
                         .map(user -> {
                             int userPostsCount = (int) posts.stream()
-                                .filter(post -> post.username != null && post.username.equals(user.username))
+                                .filter(post -> post.getUsername() != null && post.getUsername().equals(user.getUsername()))
                                 .count();
                             return new UserTableData(user, userPostsCount);
                         })
@@ -475,14 +472,12 @@ protected Void call() throws Exception {
             }
         };
 
-        loadTask.setOnFailed(e -> {
-            Platform.runLater(() -> {
-                loadingIndicator.setVisible(false);
-                logger.severe("Failed to load data: " + e.getSource().getException());
-                e.getSource().getException().printStackTrace();
-                showErrorAlert("Error", "Failed to load data from XML files: " + e.getSource().getException().getMessage());
-            });
-        });
+        loadTask.setOnFailed(e -> Platform.runLater(() -> {
+            loadingIndicator.setVisible(false);
+            logger.severe("Failed to load data: " + e.getSource().getException());
+            e.getSource().getException().printStackTrace();
+            showErrorAlert(ERROR_TITLE, "Failed to load data from XML files: " + e.getSource().getException().getMessage());
+        }));
 
         new Thread(loadTask).start();
     }
@@ -512,7 +507,7 @@ private void sortTable(String sortCriteria) {
             case "Email (Z-A)":
                 comparator = Comparator.comparing(UserTableData::getEmail).reversed();
                 break;
-            case "Status":
+            case STATUS_COLUMN_TITLE:
                 comparator = Comparator.comparing(UserTableData::getStatus);
                 break;
             case "Posts Count (High-Low)":
@@ -533,6 +528,9 @@ private void sortTable(String sortCriteria) {
                     }
                 });
                 break;
+            default:
+                // No action; unknown sort option
+                break;
         }
 
         if (comparator != null) {
@@ -545,7 +543,7 @@ private void sortTable(String sortCriteria) {
      */
     private void showDeleteConfirmation(UserTableData data) {
         // Prevent deletion of admin user
-        if (data.getUsername().toLowerCase().equals("admin")) {
+    if (data.getUsername().equalsIgnoreCase(ADMIN_USERNAME)) {
             showErrorAlert("Cannot Delete", "Admin user cannot be deleted.");
             return;
         }
@@ -574,7 +572,7 @@ private void deleteUser(UserTableData data) {
                 // Also delete all posts by this user
                 List<Post> allPosts = postRepository.loadPosts();
                 List<Post> postsToKeep = allPosts.stream()
-                    .filter(post -> !post.username.equals(data.getUsername()))
+                    .filter(post -> !post.getUsername().equals(data.getUsername()))
                     .collect(Collectors.toList());
                 
                 if (postsToKeep.size() < allPosts.size()) {
@@ -589,11 +587,11 @@ private void deleteUser(UserTableData data) {
                 
                 showSuccessAlert("Success", "User and their posts deleted successfully!");
             } else {
-                showErrorAlert("Error", "User not found or could not be deleted.");
+                showErrorAlert(ERROR_TITLE, "User not found or could not be deleted.");
             }
 
         } catch (Exception e) {
-            showErrorAlert("Error", "Failed to delete user: " + e.getMessage());
+            showErrorAlert(ERROR_TITLE, "Failed to delete user: " + e.getMessage());
         }
     }
 
@@ -606,7 +604,7 @@ private void saveUserChanges(User user) {
             
             // Find and update the user (using email as identifier)
             for (int i = 0; i < allUsers.size(); i++) {
-                if (allUsers.get(i).email != null && allUsers.get(i).email.equals(user.email)) {
+                if (allUsers.get(i).getEmail() != null && allUsers.get(i).getEmail().equals(user.getEmail())) {
                     allUsers.set(i, user);
                     break;
                 }
@@ -614,7 +612,7 @@ private void saveUserChanges(User user) {
 
             userRepository.saveUsers(allUsers);
         } catch (Exception e) {
-            showErrorAlert("Error", "Failed to save changes: " + e.getMessage());
+            showErrorAlert(ERROR_TITLE, "Failed to save changes: " + e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/starlight/model/ChatMessage.java b/src/main/java/com/starlight/model/ChatMessage.java
index de658d6..8f77537 100644
--- a/src/main/java/com/starlight/model/ChatMessage.java
+++ b/src/main/java/com/starlight/model/ChatMessage.java
@@ -8,16 +8,17 @@
  */
 public class ChatMessage {
     /** The message content. */
-    public String content;
+    private String content;
     
     /** True if this message is from the user, false if from the AI assistant. */
-    public boolean isUser;
+    private boolean isUser;
     
     /** Timestamp when the message was created. */
-    public String timestamp;
+    private String timestamp;
     
     /** The user who sent the message (for user messages). */
-    public String username;
+    private String username;
+    public static final String AI_USERNAME = "TabemonPal AI";
     
     /**
      * Default constructor for XML serialization.
@@ -35,9 +36,19 @@ public ChatMessage() {
     public ChatMessage(String content, boolean isUser, String username) {
         this.content = content;
         this.isUser = isUser;
-        this.username = isUser ? username : "TabemonPal AI";
+        this.username = isUser ? username : AI_USERNAME;
         this.timestamp = LocalDateTime.now().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME);
     }
+
+    // Accessors
+    public String getContent() { return content; }
+    public void setContent(String content) { this.content = content; }
+    public boolean isUser() { return isUser; }
+    public void setUser(boolean user) { isUser = user; }
+    public String getTimestamp() { return timestamp; }
+    public void setTimestamp(String timestamp) { this.timestamp = timestamp; }
+    public String getUsername() { return username; }
+    public void setUsername(String username) { this.username = username; }
     
     /**
      * Gets a formatted timestamp for display.
@@ -57,7 +68,7 @@ public String getFormattedTimestamp() {
     public String toString() {
         return String.format("[%s] %s: %s", 
             getFormattedTimestamp(), 
-            isUser ? username : "TabemonPal AI", 
+            isUser ? username : AI_USERNAME, 
             content.substring(0, Math.min(50, content.length())) + (content.length() > 50 ? "..." : ""));
     }
 }
diff --git a/src/main/java/com/starlight/model/Nutrition.java b/src/main/java/com/starlight/model/Nutrition.java
index c2ea033..a7bdc7f 100644
--- a/src/main/java/com/starlight/model/Nutrition.java
+++ b/src/main/java/com/starlight/model/Nutrition.java
@@ -7,121 +7,171 @@
  * Model for nutrition facts data from AI analysis.
  */
 public class Nutrition {
-    public List<NutritionIngredient> ingredient = new ArrayList<>();
+    public static final String VERDICT_UNKNOWN = "Unknown";
+    public static final String UNIT_CALORIES = "kcal";
+    public static final String UNIT_GRAMS = "g";
+    public static final String UNIT_MILLIGRAMS = "mg";
+    public static final String DEFAULT_NUMERIC = "0";
+
+    private final List<NutritionIngredient> ingredient = new ArrayList<>();
     /** Recipe health verdict: Healthy, Moderate, Unhealthy, Junk Food, or Unknown */
-    public String verdict = "Unknown";
+    private String verdict = VERDICT_UNKNOWN;
+
+    public List<NutritionIngredient> getIngredient() { return ingredient; }
+    public String getVerdict() { return verdict; }
+    public void setVerdict(String verdict) { this.verdict = verdict; }
     
     /**
      * Individual ingredient nutrition information.
      */
     public static class NutritionIngredient {
-        public String name;
-        public String amount;
-        public Calories calories = new Calories();
-        public Protein protein = new Protein();
-        public Fat fat = new Fat();
-        public Carbohydrates carbohydrates = new Carbohydrates();
-        public Fiber fiber = new Fiber();
-        public Sugar sugar = new Sugar();
-        public Salt salt = new Salt();
+    private String name;
+    private String amount;
+    private Calories calories = new Calories();
+    private Protein protein = new Protein();
+    private Fat fat = new Fat();
+    private Carbohydrates carbohydrates = new Carbohydrates();
+    private Fiber fiber = new Fiber();
+    private Sugar sugar = new Sugar();
+    private Salt salt = new Salt();
+
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
+    public String getAmount() { return amount; }
+    public void setAmount(String amount) { this.amount = amount; }
+    public Calories getCalories() { return calories; }
+    public Protein getProtein() { return protein; }
+    public Fat getFat() { return fat; }
+    public Carbohydrates getCarbohydrates() { return carbohydrates; }
+    public Fiber getFiber() { return fiber; }
+    public Sugar getSugar() { return sugar; }
+    public Salt getSalt() { return salt; }
     }
     
     /**
      * Calories information with unit.
      */
     public static class Calories {
-        public String unit = "kcal";
-        public String value = "0";
+    private String unit = UNIT_CALORIES;
+    private String value = DEFAULT_NUMERIC;
         
         public Calories() {}
         
         public Calories(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
      * Protein information with unit.
      */
     public static class Protein {
-        public String unit = "g";
-        public String value = "0";
+    private String unit = UNIT_GRAMS;
+    private String value = DEFAULT_NUMERIC;
         
         public Protein() {}
         
         public Protein(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
      * Fat information with unit.
      */
     public static class Fat {
-        public String unit = "g";
-        public String value = "0";
+    private String unit = UNIT_GRAMS;
+    private String value = DEFAULT_NUMERIC;
         
         public Fat() {}
         
         public Fat(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
      * Carbohydrates information with unit.
      */
     public static class Carbohydrates {
-        public String unit = "g";
-        public String value = "0";
+    private String unit = UNIT_GRAMS;
+    private String value = DEFAULT_NUMERIC;
         
         public Carbohydrates() {}
         
         public Carbohydrates(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
      * Fiber information with unit.
      */
     public static class Fiber {
-        public String unit = "g";
-        public String value = "0";
+    private String unit = UNIT_GRAMS;
+    private String value = DEFAULT_NUMERIC;
         
         public Fiber() {}
         
         public Fiber(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
      * Sugar information with unit.
      */
     public static class Sugar {
-        public String unit = "g";
-        public String value = "0";
+    private String unit = UNIT_GRAMS;
+    private String value = DEFAULT_NUMERIC;
         
         public Sugar() {}
         
         public Sugar(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
      * Salt information with unit.
      */
     public static class Salt {
-        public String unit = "mg";
-        public String value = "0";
+    private String unit = UNIT_MILLIGRAMS;
+    private String value = DEFAULT_NUMERIC;
         
         public Salt() {}
         
         public Salt(String value) {
             this.value = value;
         }
+    public String getUnit() { return unit; }
+    public void setUnit(String unit) { this.unit = unit; }
+    public String getValue() { return value; }
+    public void setValue(String value) { this.value = value; }
     }
     
     /**
diff --git a/src/main/java/com/starlight/model/Post.java b/src/main/java/com/starlight/model/Post.java
index 947781d..9e26c84 100644
--- a/src/main/java/com/starlight/model/Post.java
+++ b/src/main/java/com/starlight/model/Post.java
@@ -32,4 +32,48 @@ public class Post {
     public String isLiked;
     /** Nutrition facts data from AI analysis. */
     public Nutrition nutrition;
+
+    // Accessors - keep these to allow callers to use getters while preserving
+    // the existing public fields for backwards compatibility.
+    public String getUuid() { return uuid; }
+    public void setUuid(String uuid) { this.uuid = uuid; }
+
+    public String getUsername() { return username; }
+    public void setUsername(String username) { this.username = username; }
+
+    public String getProfilepicture() { return profilepicture; }
+    public void setProfilepicture(String profilepicture) { this.profilepicture = profilepicture; }
+
+    public String getTitle() { return title; }
+    public void setTitle(String title) { this.title = title; }
+
+    public String getDescription() { return description; }
+    public void setDescription(String description) { this.description = description; }
+
+    public String getIngredients() { return ingredients; }
+    public void setIngredients(String ingredients) { this.ingredients = ingredients; }
+
+    public String getDirections() { return directions; }
+    public void setDirections(String directions) { this.directions = directions; }
+
+    public String getImage() { return image; }
+    public void setImage(String image) { this.image = image; }
+
+    public String getRating() { return rating; }
+    public void setRating(String rating) { this.rating = rating; }
+
+    public String getUploadtime() { return uploadtime; }
+    public void setUploadtime(String uploadtime) { this.uploadtime = uploadtime; }
+
+    public String getLikecount() { return likecount; }
+    public void setLikecount(String likecount) { this.likecount = likecount; }
+
+    public String getCommentcount() { return commentcount; }
+    public void setCommentcount(String commentcount) { this.commentcount = commentcount; }
+
+    public String getIsLiked() { return isLiked; }
+    public void setIsLiked(String isLiked) { this.isLiked = isLiked; }
+
+    public Nutrition getNutrition() { return nutrition; }
+    public void setNutrition(Nutrition nutrition) { this.nutrition = nutrition; }
 }
diff --git a/src/main/java/com/starlight/model/User.java b/src/main/java/com/starlight/model/User.java
index 77d1dde..3b12ab4 100644
--- a/src/main/java/com/starlight/model/User.java
+++ b/src/main/java/com/starlight/model/User.java
@@ -5,28 +5,42 @@
  */
 public class User {
     /** Chosen username. */
-    public String username;
+    private String username;
     /** Email address. */
-    public String email;
+    private String email;
     /** Full display name. */
-    public String fullname;
+    private String fullname;
     /** Password (plain text for simplicity). */
-    public String password;
+    private String password;
     /** Birthday in ISO format. */
-    public String birthDay;
+    private String birthDay;
     /** Path to the profile picture. */
-    public String profilepicture;
+    private String profilepicture;
+
+    // Accessors
+    public String getUsername() { return username; }
+    public void setUsername(String username) { this.username = username; }
+    public String getEmail() { return email; }
+    public void setEmail(String email) { this.email = email; }
+    public String getFullname() { return fullname; }
+    public void setFullname(String fullname) { this.fullname = fullname; }
+    public String getPassword() { return password; }
+    public void setPassword(String password) { this.password = password; }
+    public String getBirthDay() { return birthDay; }
+    public void setBirthDay(String birthDay) { this.birthDay = birthDay; }
+    public String getProfilepicture() { return profilepicture; }
+    public void setProfilepicture(String profilepicture) { this.profilepicture = profilepicture; }
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
         User user = (User) o;
-        return java.util.Objects.equals(email, user.email);
+    return java.util.Objects.equals(email, user.email);
     }
 
     @Override
     public int hashCode() {
-        return java.util.Objects.hash(email);
+    return java.util.Objects.hash(email);
     }
 }
diff --git a/src/main/java/com/starlight/repository/LocalUserDataRepository.java b/src/main/java/com/starlight/repository/LocalUserDataRepository.java
index d29f67c..15fafce 100644
--- a/src/main/java/com/starlight/repository/LocalUserDataRepository.java
+++ b/src/main/java/com/starlight/repository/LocalUserDataRepository.java
@@ -88,22 +88,22 @@ private List<User> createDefaultUsers() {
         
     // Create admin user
     User admin = new User();
-    admin.username = ADMIN_USERNAME;
-        admin.email = "admin@tabemonpal.local";
-        admin.fullname = "Administrator";
-        admin.password = "admin123";
-        admin.birthDay = "1990-01-01";
-        admin.profilepicture = "src/main/resources/com/starlight/images/dummy/profileman.jpg";
+    admin.setUsername(ADMIN_USERNAME);
+        admin.setEmail("admin@tabemonpal.local");
+        admin.setFullname("Administrator");
+        admin.setPassword("admin123");
+        admin.setBirthDay("1990-01-01");
+        admin.setProfilepicture("src/main/resources/com/starlight/images/dummy/profileman.jpg");
         defaultUsers.add(admin);
         
         // Create default user
         User user = new User();
-        user.username = "user";
-        user.email = "user@tabemonpal.local";
-        user.fullname = "Default User";
-        user.password = "user123";
-        user.birthDay = "1995-01-01";
-        user.profilepicture = "src/main/resources/com/starlight/images/dummy/profiledefault.png";
+    user.setUsername("user");
+    user.setEmail("user@tabemonpal.local");
+    user.setFullname("Default User");
+    user.setPassword("user123");
+    user.setBirthDay("1995-01-01");
+    user.setProfilepicture("src/main/resources/com/starlight/images/dummy/profiledefault.png");
         defaultUsers.add(user);
         
         cachedUsers = defaultUsers;
@@ -137,8 +137,8 @@ public void saveUsers(List<User> users) {
     public User findUser(String usernameOrEmail) {
         List<User> users = loadUsers();
         return users.stream()
-                .filter(u -> (u.username != null && u.username.equals(usernameOrEmail)) ||
-                           (u.email != null && u.email.equals(usernameOrEmail)))
+                .filter(u -> (u.getUsername() != null && u.getUsername().equals(usernameOrEmail)) ||
+                           (u.getEmail() != null && u.getEmail().equals(usernameOrEmail)))
                 .findFirst()
                 .orElse(null);
     }
@@ -152,9 +152,9 @@ public User findUser(String usernameOrEmail) {
     public User validateCredentials(String usernameOrEmail, String password) {
         List<User> users = loadUsers();
         return users.stream()
-                .filter(u -> ((u.username != null && u.username.equals(usernameOrEmail)) ||
-                            (u.email != null && u.email.equals(usernameOrEmail))) &&
-                            u.password != null && u.password.equals(password))
+                .filter(u -> ((u.getUsername() != null && u.getUsername().equals(usernameOrEmail)) ||
+                            (u.getEmail() != null && u.getEmail().equals(usernameOrEmail))) &&
+                            u.getPassword() != null && u.getPassword().equals(password))
                 .findFirst()
                 .orElse(null);
     }
@@ -165,7 +165,7 @@ public User validateCredentials(String usernameOrEmail, String password) {
      * @return true if user is admin, false otherwise
      */
     public boolean isAdmin(User user) {
-    return user != null && user.username != null && user.username.toLowerCase().equals(ADMIN_USERNAME);
+    return user != null && user.getUsername() != null && user.getUsername().equalsIgnoreCase(ADMIN_USERNAME);
     }
 
     /**
diff --git a/src/main/java/com/starlight/repository/PostDataRepository.java b/src/main/java/com/starlight/repository/PostDataRepository.java
index 50d185b..e638666 100644
--- a/src/main/java/com/starlight/repository/PostDataRepository.java
+++ b/src/main/java/com/starlight/repository/PostDataRepository.java
@@ -110,8 +110,8 @@ private List<Post> readPostsFromFile(File xmlFile) {
     /** Ensure required fields are present on loaded posts. */
     private void initializeMissingFields(List<Post> posts) {
         for (Post post : posts) {
-            if (post.commentcount == null) post.commentcount = "0";
-            if (post.isLiked == null) post.isLiked = "false";
+            if (post.getCommentcount() == null) post.setCommentcount("0");
+            if (post.getIsLiked() == null) post.setIsLiked("false");
         }
     }
 
@@ -141,11 +141,11 @@ public void savePosts(List<Post> posts) {
         try (FileOutputStream fos = new FileOutputStream(xmlPath)) {
             // Ensure all posts have the required fields before saving
             for (Post post : posts) {
-                if (post.commentcount == null) {
-                    post.commentcount = "0";
+                if (post.getCommentcount() == null) {
+                    post.setCommentcount("0");
                 }
-                if (post.isLiked == null) {
-                    post.isLiked = "false";
+                if (post.getIsLiked() == null) {
+                    post.setIsLiked("false");
                 }
             }
             xstream.toXML(posts, fos);
@@ -163,8 +163,8 @@ public boolean deletePost(String uuid) {
         List<Post> posts = loadPosts();
         int initialSize = posts.size();
         
-        // Remove the post with the specified UUID
-        posts.removeIf(post -> post.uuid != null && post.uuid.equals(uuid));
+    // Remove the post with the specified UUID
+    posts.removeIf(post -> post.getUuid() != null && post.getUuid().equals(uuid));
         
         // Check if any posts were removed
         if (posts.size() < initialSize) {
diff --git a/src/main/java/com/starlight/repository/UserDataRepository.java b/src/main/java/com/starlight/repository/UserDataRepository.java
index 8c88ca7..65777b0 100644
--- a/src/main/java/com/starlight/repository/UserDataRepository.java
+++ b/src/main/java/com/starlight/repository/UserDataRepository.java
@@ -150,8 +150,8 @@ public boolean deleteUser(String username) {
         List<User> users = loadUsers(false); // Load only real users, not dummy ones
         int initialSize = users.size();
         
-        // Remove all instances of the user (in case of duplicates)
-        users.removeIf(user -> user.username.equals(username));
+    // Remove all instances of the user (in case of duplicates)
+    users.removeIf(user -> user.getUsername() != null && user.getUsername().equals(username));
         
         // Check if any users were removed
         if (users.size() < initialSize) {
diff --git a/src/main/java/com/starlight/util/ChatHistoryUtils.java b/src/main/java/com/starlight/util/ChatHistoryUtils.java
index 4ad698b..684777b 100644
--- a/src/main/java/com/starlight/util/ChatHistoryUtils.java
+++ b/src/main/java/com/starlight/util/ChatHistoryUtils.java
@@ -52,9 +52,9 @@ public static String generateChatSummary(String username) {
             // Show first message as preview
             if (messageCount > 0) {
                 ChatMessage firstMessage = history.getMessages().get(0);
-                String preview = firstMessage.content.length() > 50 ? 
-                    firstMessage.content.substring(0, 50) + "..." : 
-                    firstMessage.content;
+                String preview = firstMessage.getContent().length() > 50 ? 
+                    firstMessage.getContent().substring(0, 50) + "..." : 
+                    firstMessage.getContent();
                 summary.append("Preview: \"").append(preview).append("\"\n");
             }
             summary.append("\n");
@@ -100,10 +100,10 @@ public static String exportSessionToText(String sessionId, String username) {
         
         if (targetHistory.getMessages() != null) {
             for (ChatMessage message : targetHistory.getMessages()) {
-                String sender = message.isUser ? targetHistory.getUsername() : "TabemonPal AI";
+                String sender = message.isUser() ? targetHistory.getUsername() : "TabemonPal AI";
                 export.append("[").append(message.getFormattedTimestamp()).append("] ");
                 export.append(sender).append(": ");
-                export.append(message.content).append("\n\n");
+                export.append(message.getContent()).append("\n\n");
             }
         }
         
@@ -159,7 +159,7 @@ public ChatHistoryStats(List<ChatHistory> histories) {
 
             this.userMessages = histories.stream()
                 .flatMap(h -> h.getMessages().stream())
-                .mapToInt(m -> m.isUser ? 1 : 0)
+                .mapToInt(m -> m.isUser() ? 1 : 0)
                 .sum();
 
             this.aiMessages = totalMessages - userMessages;
diff --git a/src/main/java/com/starlight/util/NutritionParser.java b/src/main/java/com/starlight/util/NutritionParser.java
index cfd363a..3977ac4 100644
--- a/src/main/java/com/starlight/util/NutritionParser.java
+++ b/src/main/java/com/starlight/util/NutritionParser.java
@@ -14,6 +14,10 @@
  */
 public class NutritionParser {
     private static final Logger logger = Logger.getLogger(NutritionParser.class.getName());
+    private static final String NUTRITION_END_TAG = "</nutrition>";
+    private static final String UNKNOWN_VERDICT = "Unknown";
+    // Reused fragment for matching unit and value inside a tag
+    private static final String UNIT_VALUE_FRAGMENT = "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</";
     
     /**
      * Parses nutrition XML from AI response and returns a Nutrition object.
@@ -41,7 +45,9 @@ public Nutrition parseNutritionFromResponse(String aiResponse) {
             return nutrition != null ? nutrition : createFallbackNutrition();
             
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Failed to parse nutrition XML: " + e.getMessage(), e);
+            if (logger.isLoggable(Level.WARNING)) {
+                logger.log(Level.WARNING, () -> "Failed to parse nutrition XML: " + e.getMessage());
+            }
             return createFallbackNutrition();
         }
     }
@@ -52,10 +58,10 @@ public Nutrition parseNutritionFromResponse(String aiResponse) {
     private String extractXmlFromResponse(String response) {
         // Look for nutrition XML tags (with or without attributes)
         int startIndex = response.indexOf("<nutrition");
-        int endIndex = response.lastIndexOf("</nutrition>");
+    int endIndex = response.lastIndexOf(NUTRITION_END_TAG);
         
         if (startIndex != -1 && endIndex != -1 && endIndex > startIndex) {
-            return response.substring(startIndex, endIndex + "</nutrition>".length());
+            return response.substring(startIndex, endIndex + NUTRITION_END_TAG.length());
         }
         
         // If no proper XML found, try to find any XML-like content
@@ -64,7 +70,7 @@ private String extractXmlFromResponse(String response) {
         
         if (startIndex != -1 && endIndex != -1 && endIndex > startIndex) {
             String potentialXml = response.substring(startIndex, endIndex + 1);
-            if (potentialXml.contains("<nutrition") && potentialXml.contains("</nutrition>")) {
+            if (potentialXml.contains("<nutrition") && potentialXml.contains(NUTRITION_END_TAG)) {
                 return potentialXml;
             }
         }
@@ -76,7 +82,7 @@ private String extractXmlFromResponse(String response) {
      * Parses nutrition XML using regex patterns.
      */
     private Nutrition parseXmlWithRegex(String xmlContent) {
-        Nutrition nutrition = new Nutrition();
+    Nutrition nutrition = new Nutrition();
         
         // Parse verdict attribute from nutrition tag
         Pattern verdictPattern = Pattern.compile("<nutrition\\s+verdict=\"([^\"]*?)\"", Pattern.DOTALL);
@@ -85,16 +91,16 @@ private Nutrition parseXmlWithRegex(String xmlContent) {
             String verdict = verdictMatcher.group(1).trim();
             // Validate verdict value
             if (verdict.equals("Healthy") || verdict.equals("Moderate") || 
-                verdict.equals("Unhealthy") || verdict.equals("Junk Food") || verdict.equals("Unknown")) {
-                nutrition.verdict = verdict;
+                verdict.equals("Unhealthy") || verdict.equals("Junk Food") || verdict.equals(UNKNOWN_VERDICT)) {
+                nutrition.setVerdict(verdict);
             } else {
-                nutrition.verdict = "Unknown"; // Default fallback
+                nutrition.setVerdict(UNKNOWN_VERDICT); // Default fallback
             }
         }
         
         // Pattern to match ingredient blocks
         Pattern ingredientPattern = Pattern.compile(
-            "<ingredient\\s+name=\"([^\"]*?)\"\\s+amount=\"([^\"]*?)\">(.*?)</ingredient>", 
+            "<ingredient\\s+name=\"([^\"]*?)\"\\s+amount=\"([^\"]*?)\">(.*?)</ingredient>",
             Pattern.DOTALL
         );
         
@@ -106,29 +112,49 @@ private Nutrition parseXmlWithRegex(String xmlContent) {
             String content = ingredientMatcher.group(3);
             
             Nutrition.NutritionIngredient ingredient = new Nutrition.NutritionIngredient();
-            ingredient.name = name;
-            ingredient.amount = amount;
-            
-            // Parse nutrition values
-            ingredient.calories = parseCaloriesValue(content, "calories", "kcal");
-            ingredient.protein = parseProteinValue(content, "protein", "g");
-            ingredient.fat = parseFatValue(content, "fat", "g");
-            ingredient.carbohydrates = parseCarbohydratesValue(content, "carbohydrates", "g");
-            ingredient.fiber = parseFiberValue(content, "fiber", "g");
-            ingredient.sugar = parseSugarValue(content, "sugar", "g");
-            ingredient.salt = parseSaltValue(content, "salt", "mg");
-            
-            nutrition.ingredient.add(ingredient);
+            ingredient.setName(name);
+            ingredient.setAmount(amount);
+
+            // Parse nutrition values and copy into the ingredient's nested objects
+            Nutrition.Calories cals = parseCaloriesValue(content, "calories");
+            ingredient.getCalories().setValue(cals.getValue());
+            ingredient.getCalories().setUnit(cals.getUnit());
+
+            Nutrition.Protein prot = parseProteinValue(content, "protein");
+            ingredient.getProtein().setValue(prot.getValue());
+            ingredient.getProtein().setUnit(prot.getUnit());
+
+            Nutrition.Fat fat = parseFatValue(content, "fat");
+            ingredient.getFat().setValue(fat.getValue());
+            ingredient.getFat().setUnit(fat.getUnit());
+
+            Nutrition.Carbohydrates carbs = parseCarbohydratesValue(content, "carbohydrates");
+            ingredient.getCarbohydrates().setValue(carbs.getValue());
+            ingredient.getCarbohydrates().setUnit(carbs.getUnit());
+
+            Nutrition.Fiber fiber = parseFiberValue(content, "fiber");
+            ingredient.getFiber().setValue(fiber.getValue());
+            ingredient.getFiber().setUnit(fiber.getUnit());
+
+            Nutrition.Sugar sugar = parseSugarValue(content, "sugar");
+            ingredient.getSugar().setValue(sugar.getValue());
+            ingredient.getSugar().setUnit(sugar.getUnit());
+
+            Nutrition.Salt salt = parseSaltValue(content, "salt");
+            ingredient.getSalt().setValue(salt.getValue());
+            ingredient.getSalt().setUnit(salt.getUnit());
+
+            nutrition.getIngredient().add(ingredient);
         }
         
-        return nutrition.ingredient.isEmpty() ? null : nutrition;
+        return nutrition.getIngredient().isEmpty() ? null : nutrition;
     }
     
     /**
      * Parses calories values from XML content.
      */
-    private Nutrition.Calories parseCaloriesValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Calories parseCaloriesValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -136,18 +162,18 @@ private Nutrition.Calories parseCaloriesValue(String content, String tagName, St
             String value = matcher.group(2).trim();
             
             Nutrition.Calories calories = new Nutrition.Calories(validateNumericValue(value));
-            calories.unit = unit;
+            calories.setUnit(unit);
             return calories;
         }
         
-        return new Nutrition.Calories("0");
+    return new Nutrition.Calories("0");
     }
     
     /**
      * Parses protein values from XML content.
      */
-    private Nutrition.Protein parseProteinValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Protein parseProteinValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -155,18 +181,18 @@ private Nutrition.Protein parseProteinValue(String content, String tagName, Stri
             String value = matcher.group(2).trim();
             
             Nutrition.Protein protein = new Nutrition.Protein(validateNumericValue(value));
-            protein.unit = unit;
+            protein.setUnit(unit);
             return protein;
         }
         
-        return new Nutrition.Protein("0");
+    return new Nutrition.Protein("0");
     }
     
     /**
      * Parses fat values from XML content.
      */
-    private Nutrition.Fat parseFatValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Fat parseFatValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -174,18 +200,18 @@ private Nutrition.Fat parseFatValue(String content, String tagName, String defau
             String value = matcher.group(2).trim();
             
             Nutrition.Fat fat = new Nutrition.Fat(validateNumericValue(value));
-            fat.unit = unit;
+            fat.setUnit(unit);
             return fat;
         }
         
-        return new Nutrition.Fat("0");
+    return new Nutrition.Fat("0");
     }
     
     /**
      * Parses carbohydrates values from XML content.
      */
-    private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -193,18 +219,18 @@ private Nutrition.Carbohydrates parseCarbohydratesValue(String content, String t
             String value = matcher.group(2).trim();
             
             Nutrition.Carbohydrates carbohydrates = new Nutrition.Carbohydrates(validateNumericValue(value));
-            carbohydrates.unit = unit;
+            carbohydrates.setUnit(unit);
             return carbohydrates;
         }
         
-        return new Nutrition.Carbohydrates("0");
+    return new Nutrition.Carbohydrates("0");
     }
     
     /**
      * Parses fiber values from XML content.
      */
-    private Nutrition.Fiber parseFiberValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Fiber parseFiberValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -212,18 +238,18 @@ private Nutrition.Fiber parseFiberValue(String content, String tagName, String d
             String value = matcher.group(2).trim();
             
             Nutrition.Fiber fiber = new Nutrition.Fiber(validateNumericValue(value));
-            fiber.unit = unit;
+            fiber.setUnit(unit);
             return fiber;
         }
         
-        return new Nutrition.Fiber("0");
+    return new Nutrition.Fiber("0");
     }
     
     /**
      * Parses sugar values from XML content.
      */
-    private Nutrition.Sugar parseSugarValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Sugar parseSugarValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -231,18 +257,18 @@ private Nutrition.Sugar parseSugarValue(String content, String tagName, String d
             String value = matcher.group(2).trim();
             
             Nutrition.Sugar sugar = new Nutrition.Sugar(validateNumericValue(value));
-            sugar.unit = unit;
+            sugar.setUnit(unit);
             return sugar;
         }
         
-        return new Nutrition.Sugar("0");
+    return new Nutrition.Sugar("0");
     }
     
     /**
      * Parses salt values from XML content.
      */
-    private Nutrition.Salt parseSaltValue(String content, String tagName, String defaultUnit) {
-        Pattern pattern = Pattern.compile("<" + tagName + "\\s+unit=\"([^\"]*?)\"[^>]*>([^<]*)</" + tagName + ">");
+    private Nutrition.Salt parseSaltValue(String content, String tagName) {
+        Pattern pattern = Pattern.compile("<" + tagName + UNIT_VALUE_FRAGMENT + tagName + ">");
         Matcher matcher = pattern.matcher(content);
         
         if (matcher.find()) {
@@ -250,11 +276,11 @@ private Nutrition.Salt parseSaltValue(String content, String tagName, String def
             String value = matcher.group(2).trim();
             
             Nutrition.Salt salt = new Nutrition.Salt(validateNumericValue(value));
-            salt.unit = unit;
+            salt.setUnit(unit);
             return salt;
         }
         
-        return new Nutrition.Salt("0");
+    return new Nutrition.Salt("0");
     }
     
     /**
@@ -278,21 +304,22 @@ private String validateNumericValue(String value) {
      * Creates a fallback nutrition object when parsing fails.
      */
     private Nutrition createFallbackNutrition() {
-        Nutrition nutrition = new Nutrition();
-        nutrition.verdict = "Unknown"; // Default verdict for unanalyzed recipes
-        
-        Nutrition.NutritionIngredient fallback = new Nutrition.NutritionIngredient();
-        fallback.name = "Recipe";
-        fallback.amount = "1 serving";
-        fallback.calories = new Nutrition.Calories("0");
-        fallback.protein = new Nutrition.Protein("0");
-        fallback.fat = new Nutrition.Fat("0");
-        fallback.carbohydrates = new Nutrition.Carbohydrates("0");
-        fallback.fiber = new Nutrition.Fiber("0");
-        fallback.sugar = new Nutrition.Sugar("0");
-        fallback.salt = new Nutrition.Salt("0");
-        
-        nutrition.ingredient.add(fallback);
-        return nutrition;
+    Nutrition nutrition = new Nutrition();
+    nutrition.setVerdict(UNKNOWN_VERDICT); // Default verdict for unanalyzed recipes
+
+    Nutrition.NutritionIngredient fallback = new Nutrition.NutritionIngredient();
+    fallback.setName("Recipe");
+    fallback.setAmount("1 serving");
+    // Set nested numeric defaults
+    fallback.getCalories().setValue("0");
+    fallback.getProtein().setValue("0");
+    fallback.getFat().setValue("0");
+    fallback.getCarbohydrates().setValue("0");
+    fallback.getFiber().setValue("0");
+    fallback.getSugar().setValue("0");
+    fallback.getSalt().setValue("0");
+
+    nutrition.getIngredient().add(fallback);
+    return nutrition;
     }
 }
diff --git a/src/test/java/com/starlight/model/PostDataRepositoryTest.java b/src/test/java/com/starlight/model/PostDataRepositoryTest.java
index f682c74..1630bf5 100644
--- a/src/test/java/com/starlight/model/PostDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/PostDataRepositoryTest.java
@@ -43,9 +43,9 @@ void testSaveAndLoadPosts() {
         p.image = "img";
         p.rating = "5";
         p.uploadtime = "now";
-        p.likecount = "0";
-        p.commentcount = "0";
-        p.isLiked = "false";
+    p.setLikecount("0");
+    p.setCommentcount("0");
+    p.setIsLiked("false");
         posts.add(p);
 
         repository.savePosts(posts);
@@ -61,8 +61,8 @@ void testSaveAndLoadPosts() {
         assertEquals(p.image, lp.image);
         assertEquals(p.rating, lp.rating);
         assertEquals(p.uploadtime, lp.uploadtime);
-        assertEquals(p.likecount, lp.likecount);
-        assertEquals(p.commentcount, lp.commentcount);
-        assertEquals(p.isLiked, lp.isLiked);
+    assertEquals(p.getLikecount(), lp.getLikecount());
+    assertEquals(p.getCommentcount(), lp.getCommentcount());
+    assertEquals(p.getIsLiked(), lp.getIsLiked());
     }
 }
diff --git a/src/test/java/com/starlight/model/PostLikedStateTest.java b/src/test/java/com/starlight/model/PostLikedStateTest.java
index a200c2e..408f6c4 100644
--- a/src/test/java/com/starlight/model/PostLikedStateTest.java
+++ b/src/test/java/com/starlight/model/PostLikedStateTest.java
@@ -36,13 +36,13 @@ void tearDown() throws IOException {
     @Test
     void testLikedStateSavedAndLoaded() {
         // Create a post with liked state
-        Post post = new Post();
-        post.uuid = "test-uuid-123";
-        post.title = "Test Post";
-        post.description = "Test Description";
-        post.likecount = "5";
-        post.commentcount = "3";
-        post.isLiked = "true";
+    Post post = new Post();
+    post.setUuid("test-uuid-123");
+    post.setTitle("Test Post");
+    post.setDescription("Test Description");
+    post.setLikecount("5");
+    post.setCommentcount("3");
+    post.setIsLiked("true");
         
         List<Post> posts = new ArrayList<>();
         posts.add(post);
@@ -57,22 +57,22 @@ void testLikedStateSavedAndLoaded() {
         assertNotNull(loadedPosts);
         assertEquals(1, loadedPosts.size());
         
-        Post loadedPost = loadedPosts.get(0);
-        assertEquals("test-uuid-123", loadedPost.uuid);
-        assertEquals("Test Post", loadedPost.title);
-        assertEquals("Test Description", loadedPost.description);
-        assertEquals("5", loadedPost.likecount);
-        assertEquals("3", loadedPost.commentcount);
-        assertEquals("true", loadedPost.isLiked);
+    Post loadedPost = loadedPosts.get(0);
+    assertEquals("test-uuid-123", loadedPost.getUuid());
+    assertEquals("Test Post", loadedPost.getTitle());
+    assertEquals("Test Description", loadedPost.getDescription());
+    assertEquals("5", loadedPost.getLikecount());
+    assertEquals("3", loadedPost.getCommentcount());
+    assertEquals("true", loadedPost.getIsLiked());
     }
     
     @Test
     void testMissingFieldsInitialized() {
         // Create a post without commentcount and isLiked fields
-        Post post = new Post();
-        post.uuid = "test-uuid-456";
-        post.title = "Test Post Without New Fields";
-        post.likecount = "10";
+    Post post = new Post();
+    post.setUuid("test-uuid-456");
+    post.setTitle("Test Post Without New Fields");
+    post.setLikecount("10");
         // Note: commentcount and isLiked are null
         
         List<Post> posts = new ArrayList<>();
@@ -88,23 +88,23 @@ void testMissingFieldsInitialized() {
         assertNotNull(loadedPosts);
         assertEquals(1, loadedPosts.size());
         
-        Post loadedPost = loadedPosts.get(0);
-        assertEquals("test-uuid-456", loadedPost.uuid);
-        assertEquals("Test Post Without New Fields", loadedPost.title);
-        assertEquals("10", loadedPost.likecount);
-        assertEquals("0", loadedPost.commentcount); // Should be initialized to "0"
-        assertEquals("false", loadedPost.isLiked);  // Should be initialized to "false"
+    Post loadedPost = loadedPosts.get(0);
+    assertEquals("test-uuid-456", loadedPost.getUuid());
+    assertEquals("Test Post Without New Fields", loadedPost.getTitle());
+    assertEquals("10", loadedPost.getLikecount());
+    assertEquals("0", loadedPost.getCommentcount()); // Should be initialized to "0"
+    assertEquals("false", loadedPost.getIsLiked());  // Should be initialized to "false"
     }
     
     @Test
     void testLikeStateToggle() {
         // Create a post with false liked state
-        Post post = new Post();
-        post.uuid = "test-uuid-789";
-        post.title = "Toggle Test Post";
-        post.likecount = "0";
-        post.commentcount = "0";
-        post.isLiked = "false";
+    Post post = new Post();
+    post.setUuid("test-uuid-789");
+    post.setTitle("Toggle Test Post");
+    post.setLikecount("0");
+    post.setCommentcount("0");
+    post.setIsLiked("false");
         
         List<Post> posts = new ArrayList<>();
         posts.add(post);
@@ -116,9 +116,9 @@ void testLikeStateToggle() {
         List<Post> loadedPosts = repository.loadPosts();
         Post loadedPost = loadedPosts.get(0);
         
-        // Toggle the liked state
-        loadedPost.isLiked = "true";
-        loadedPost.likecount = "1";
+    // Toggle the liked state
+    loadedPost.setIsLiked("true");
+    loadedPost.setLikecount("1");
         
         repository.savePosts(loadedPosts);
         
@@ -126,7 +126,7 @@ void testLikeStateToggle() {
         List<Post> reloadedPosts = repository.loadPosts();
         Post reloadedPost = reloadedPosts.get(0);
         
-        assertEquals("true", reloadedPost.isLiked);
-        assertEquals("1", reloadedPost.likecount);
+    assertEquals("true", reloadedPost.getIsLiked());
+        assertEquals("1", reloadedPost.getLikecount());
     }
 }
diff --git a/src/test/java/com/starlight/model/PostTest.java b/src/test/java/com/starlight/model/PostTest.java
index 665cd9a..d3e715b 100644
--- a/src/test/java/com/starlight/model/PostTest.java
+++ b/src/test/java/com/starlight/model/PostTest.java
@@ -19,229 +19,229 @@ void setUp() {
     @Test
     void testPostCreation() {
         assertNotNull(post);
-        assertNull(post.uuid);
-        assertNull(post.username);
-        assertNull(post.profilepicture);
-        assertNull(post.title);
-        assertNull(post.description);
-        assertNull(post.ingredients);
-        assertNull(post.directions);
-        assertNull(post.image);
-        assertNull(post.rating);
-        assertNull(post.uploadtime);
-        assertNull(post.likecount);
-        assertNull(post.commentcount);
-        assertNull(post.isLiked);
+    assertNull(post.getUuid());
+    assertNull(post.getUsername());
+    assertNull(post.getProfilepicture());
+    assertNull(post.getTitle());
+    assertNull(post.getDescription());
+    assertNull(post.getIngredients());
+    assertNull(post.getDirections());
+    assertNull(post.getImage());
+    assertNull(post.getRating());
+    assertNull(post.getUploadtime());
+    assertNull(post.getLikecount());
+    assertNull(post.getCommentcount());
+    assertNull(post.getIsLiked());
     }
 
     @Test
     void testSetAndGetUuid() {
         String testUuid = "123e4567-e89b-12d3-a456-426614174000";
-        post.uuid = testUuid;
-        assertEquals(testUuid, post.uuid);
+    post.setUuid(testUuid);
+    assertEquals(testUuid, post.getUuid());
     }
 
     @Test
     void testSetAndGetUsername() {
         String testUsername = "chef123";
-        post.username = testUsername;
-        assertEquals(testUsername, post.username);
+    post.setUsername(testUsername);
+    assertEquals(testUsername, post.getUsername());
     }
 
     @Test
     void testSetAndGetProfilePicture() {
         String testProfilePicture = "/images/profiles/chef123.jpg";
-        post.profilepicture = testProfilePicture;
-        assertEquals(testProfilePicture, post.profilepicture);
+    post.setProfilepicture(testProfilePicture);
+    assertEquals(testProfilePicture, post.getProfilepicture());
     }
 
     @Test
     void testSetAndGetTitle() {
         String testTitle = "Delicious Chocolate Cake";
-        post.title = testTitle;
-        assertEquals(testTitle, post.title);
+    post.setTitle(testTitle);
+    assertEquals(testTitle, post.getTitle());
     }
 
     @Test
     void testSetAndGetDescription() {
         String testDescription = "A moist and rich chocolate cake perfect for any occasion.";
-        post.description = testDescription;
-        assertEquals(testDescription, post.description);
+    post.setDescription(testDescription);
+    assertEquals(testDescription, post.getDescription());
     }
 
     @Test
     void testSetAndGetIngredients() {
         String testIngredients = "2 cups flour, 1 cup sugar, 3 eggs, 1/2 cup cocoa powder";
-        post.ingredients = testIngredients;
-        assertEquals(testIngredients, post.ingredients);
+    post.setIngredients(testIngredients);
+    assertEquals(testIngredients, post.getIngredients());
     }
 
     @Test
     void testSetAndGetDirections() {
         String testDirections = "1. Mix dry ingredients. 2. Add wet ingredients. 3. Bake at 350°F for 30 minutes.";
-        post.directions = testDirections;
-        assertEquals(testDirections, post.directions);
+    post.setDirections(testDirections);
+    assertEquals(testDirections, post.getDirections());
     }
 
     @Test
     void testSetAndGetImage() {
         String testImage = "/images/posts/chocolate_cake.jpg";
-        post.image = testImage;
-        assertEquals(testImage, post.image);
+    post.setImage(testImage);
+    assertEquals(testImage, post.getImage());
     }
 
     @Test
     void testSetAndGetRating() {
         String testRating = "4.5";
-        post.rating = testRating;
-        assertEquals(testRating, post.rating);
+    post.setRating(testRating);
+    assertEquals(testRating, post.getRating());
     }
 
     @Test
     void testSetAndGetUploadTime() {
         String testUploadTime = "2025-07-07T10:30:00Z";
-        post.uploadtime = testUploadTime;
-        assertEquals(testUploadTime, post.uploadtime);
+    post.setUploadtime(testUploadTime);
+    assertEquals(testUploadTime, post.getUploadtime());
     }
 
     @Test
     void testSetAndGetLikeCount() {
         String testLikeCount = "42";
-        post.likecount = testLikeCount;
-        assertEquals(testLikeCount, post.likecount);
+    post.setLikecount(testLikeCount);
+    assertEquals(testLikeCount, post.getLikecount());
     }
 
     @Test
     void testSetAndGetCommentCount() {
         String testCommentCount = "15";
-        post.commentcount = testCommentCount;
-        assertEquals(testCommentCount, post.commentcount);
+    post.setCommentcount(testCommentCount);
+    assertEquals(testCommentCount, post.getCommentcount());
     }
 
     @Test
     void testSetAndGetIsLiked() {
         String testIsLiked = "true";
-        post.isLiked = testIsLiked;
-        assertEquals(testIsLiked, post.isLiked);
+    post.setIsLiked(testIsLiked);
+    assertEquals(testIsLiked, post.getIsLiked());
     }
 
     @Test
     void testPostWithAllFieldsSet() {
-        post.uuid = "550e8400-e29b-41d4-a716-446655440000";
-        post.username = "masterchef";
-        post.profilepicture = "/images/profiles/masterchef.png";
-        post.title = "Perfect Pasta Carbonara";
-        post.description = "Traditional Italian carbonara with eggs, cheese, and pancetta.";
-        post.ingredients = "400g spaghetti, 200g pancetta, 4 eggs, 100g Pecorino Romano, black pepper";
-        post.directions = "1. Cook pasta. 2. Fry pancetta. 3. Mix eggs and cheese. 4. Combine all together off heat.";
-        post.image = "/images/posts/carbonara.jpg";
-        post.rating = "4.8";
-        post.uploadtime = "2025-07-07T15:45:30Z";
-        post.likecount = "127";
-        post.commentcount = "23";
-        post.isLiked = "false";
-
-        assertEquals("550e8400-e29b-41d4-a716-446655440000", post.uuid);
-        assertEquals("masterchef", post.username);
-        assertEquals("/images/profiles/masterchef.png", post.profilepicture);
-        assertEquals("Perfect Pasta Carbonara", post.title);
-        assertEquals("Traditional Italian carbonara with eggs, cheese, and pancetta.", post.description);
-        assertEquals("400g spaghetti, 200g pancetta, 4 eggs, 100g Pecorino Romano, black pepper", post.ingredients);
-        assertEquals("1. Cook pasta. 2. Fry pancetta. 3. Mix eggs and cheese. 4. Combine all together off heat.", post.directions);
-        assertEquals("/images/posts/carbonara.jpg", post.image);
-        assertEquals("4.8", post.rating);
-        assertEquals("2025-07-07T15:45:30Z", post.uploadtime);
-        assertEquals("127", post.likecount);
-        assertEquals("23", post.commentcount);
-        assertEquals("false", post.isLiked);
+    post.setUuid("550e8400-e29b-41d4-a716-446655440000");
+    post.setUsername("masterchef");
+    post.setProfilepicture("/images/profiles/masterchef.png");
+    post.setTitle("Perfect Pasta Carbonara");
+    post.setDescription("Traditional Italian carbonara with eggs, cheese, and pancetta.");
+    post.setIngredients("400g spaghetti, 200g pancetta, 4 eggs, 100g Pecorino Romano, black pepper");
+    post.setDirections("1. Cook pasta. 2. Fry pancetta. 3. Mix eggs and cheese. 4. Combine all together off heat.");
+    post.setImage("/images/posts/carbonara.jpg");
+    post.setRating("4.8");
+    post.setUploadtime("2025-07-07T15:45:30Z");
+    post.setLikecount("127");
+    post.setCommentcount("23");
+    post.setIsLiked("false");
+
+    assertEquals("550e8400-e29b-41d4-a716-446655440000", post.getUuid());
+    assertEquals("masterchef", post.getUsername());
+    assertEquals("/images/profiles/masterchef.png", post.getProfilepicture());
+    assertEquals("Perfect Pasta Carbonara", post.getTitle());
+    assertEquals("Traditional Italian carbonara with eggs, cheese, and pancetta.", post.getDescription());
+    assertEquals("400g spaghetti, 200g pancetta, 4 eggs, 100g Pecorino Romano, black pepper", post.getIngredients());
+    assertEquals("1. Cook pasta. 2. Fry pancetta. 3. Mix eggs and cheese. 4. Combine all together off heat.", post.getDirections());
+    assertEquals("/images/posts/carbonara.jpg", post.getImage());
+    assertEquals("4.8", post.getRating());
+    assertEquals("2025-07-07T15:45:30Z", post.getUploadtime());
+    assertEquals("127", post.getLikecount());
+    assertEquals("23", post.getCommentcount());
+    assertEquals("false", post.getIsLiked());
     }
 
     @Test
     void testPostFieldsCanBeNull() {
-        // Set some values first
-        post.uuid = "test-uuid";
-        post.username = "testuser";
-        post.title = "Test Title";
+    // Set some values first
+    post.setUuid("test-uuid");
+    post.setUsername("testuser");
+    post.setTitle("Test Title");
         
-        // Then set to null
-        post.uuid = null;
-        post.username = null;
-        post.profilepicture = null;
-        post.title = null;
-        post.description = null;
-        post.ingredients = null;
-        post.directions = null;
-        post.image = null;
-        post.rating = null;
-        post.uploadtime = null;
-        post.likecount = null;
-        post.commentcount = null;
-        post.isLiked = null;
-
-        assertNull(post.uuid);
-        assertNull(post.username);
-        assertNull(post.profilepicture);
-        assertNull(post.title);
-        assertNull(post.description);
-        assertNull(post.ingredients);
-        assertNull(post.directions);
-        assertNull(post.image);
-        assertNull(post.rating);
-        assertNull(post.uploadtime);
-        assertNull(post.likecount);
-        assertNull(post.commentcount);
-        assertNull(post.isLiked);
+    // Then set to null
+    post.setUuid(null);
+    post.setUsername(null);
+    post.setProfilepicture(null);
+    post.setTitle(null);
+    post.setDescription(null);
+    post.setIngredients(null);
+    post.setDirections(null);
+    post.setImage(null);
+    post.setRating(null);
+    post.setUploadtime(null);
+    post.setLikecount(null);
+    post.setCommentcount(null);
+    post.setIsLiked(null);
+
+    assertNull(post.getUuid());
+    assertNull(post.getUsername());
+    assertNull(post.getProfilepicture());
+    assertNull(post.getTitle());
+    assertNull(post.getDescription());
+    assertNull(post.getIngredients());
+    assertNull(post.getDirections());
+    assertNull(post.getImage());
+    assertNull(post.getRating());
+    assertNull(post.getUploadtime());
+    assertNull(post.getLikecount());
+    assertNull(post.getCommentcount());
+    assertNull(post.getIsLiked());
     }
 
     @Test
     void testPostFieldsCanBeEmpty() {
-        post.uuid = "";
-        post.username = "";
-        post.profilepicture = "";
-        post.title = "";
-        post.description = "";
-        post.ingredients = "";
-        post.directions = "";
-        post.image = "";
-        post.rating = "";
-        post.uploadtime = "";
-        post.likecount = "";
-        post.commentcount = "";
-        post.isLiked = "";
-
-        assertEquals("", post.uuid);
-        assertEquals("", post.username);
-        assertEquals("", post.profilepicture);
-        assertEquals("", post.title);
-        assertEquals("", post.description);
-        assertEquals("", post.ingredients);
-        assertEquals("", post.directions);
-        assertEquals("", post.image);
-        assertEquals("", post.rating);
-        assertEquals("", post.uploadtime);
-        assertEquals("", post.likecount);
-        assertEquals("", post.commentcount);
-        assertEquals("", post.isLiked);
+    post.setUuid("");
+    post.setUsername("");
+    post.setProfilepicture("");
+    post.setTitle("");
+    post.setDescription("");
+    post.setIngredients("");
+    post.setDirections("");
+    post.setImage("");
+    post.setRating("");
+    post.setUploadtime("");
+    post.setLikecount("");
+    post.setCommentcount("");
+    post.setIsLiked("");
+
+    assertEquals("", post.getUuid());
+    assertEquals("", post.getUsername());
+    assertEquals("", post.getProfilepicture());
+    assertEquals("", post.getTitle());
+    assertEquals("", post.getDescription());
+    assertEquals("", post.getIngredients());
+    assertEquals("", post.getDirections());
+    assertEquals("", post.getImage());
+    assertEquals("", post.getRating());
+    assertEquals("", post.getUploadtime());
+    assertEquals("", post.getLikecount());
+    assertEquals("", post.getCommentcount());
+    assertEquals("", post.getIsLiked());
     }
 
     @Test
     void testPostWithSpecialCharacters() {
-        post.title = "Café au Lait & Croissants";
-        post.description = "A French breakfast with café au lait ☕ and buttery croissants 🥐";
-        post.ingredients = "Café beans (organic), milk, butter, flour, eggs";
-        post.directions = "1. Brew coffee ☕ 2. Heat milk 🥛 3. Bake croissants @ 200°C";
-        post.rating = "4.9";
-        post.likecount = "1,234";
-        post.commentcount = "87";
-        post.isLiked = "true";
-
-        assertEquals("Café au Lait & Croissants", post.title);
-        assertEquals("A French breakfast with café au lait ☕ and buttery croissants 🥐", post.description);
-        assertEquals("Café beans (organic), milk, butter, flour, eggs", post.ingredients);
-        assertEquals("1. Brew coffee ☕ 2. Heat milk 🥛 3. Bake croissants @ 200°C", post.directions);
-        assertEquals("4.9", post.rating);
-        assertEquals("1,234", post.likecount);
-        assertEquals("87", post.commentcount);
-        assertEquals("true", post.isLiked);
+    post.setTitle("Café au Lait & Croissants");
+    post.setDescription("A French breakfast with café au lait ☕ and buttery croissants 🥐");
+    post.setIngredients("Café beans (organic), milk, butter, flour, eggs");
+    post.setDirections("1. Brew coffee ☕ 2. Heat milk 🥛 3. Bake croissants @ 200°C");
+    post.setRating("4.9");
+    post.setLikecount("1,234");
+    post.setCommentcount("87");
+    post.setIsLiked("true");
+
+    assertEquals("Café au Lait & Croissants", post.getTitle());
+    assertEquals("A French breakfast with café au lait ☕ and buttery croissants 🥐", post.getDescription());
+    assertEquals("Café beans (organic), milk, butter, flour, eggs", post.getIngredients());
+    assertEquals("1. Brew coffee ☕ 2. Heat milk 🥛 3. Bake croissants @ 200°C", post.getDirections());
+    assertEquals("4.9", post.getRating());
+    assertEquals("1,234", post.getLikecount());
+    assertEquals("87", post.getCommentcount());
+    assertEquals("true", post.getIsLiked());
     }
 }
diff --git a/src/test/java/com/starlight/model/UserDataRepositoryTest.java b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
index c0b2545..8e123d2 100644
--- a/src/test/java/com/starlight/model/UserDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
@@ -65,19 +65,19 @@ void testSaveAndLoadUsers() {
         List<User> users = new ArrayList<>();
         
         User user1 = new User();
-        user1.username = "testuser1";
-        user1.email = "test1@example.com";
-        user1.fullname = "Test User 1";
-        user1.password = "password123";
-        user1.birthDay = "1995-03-10";
+    user1.setUsername("testuser1");
+    user1.setEmail("test1@example.com");
+    user1.setFullname("Test User 1");
+    user1.setPassword("password123");
+    user1.setBirthDay("1995-03-10");
         users.add(user1);
 
         User user2 = new User();
-        user2.username = "testuser2";
-        user2.email = "test2@example.com";
-        user2.fullname = "Test User 2";
-        user2.password = "password456";
-        user2.birthDay = "1992-07-20";
+    user2.setUsername("testuser2");
+    user2.setEmail("test2@example.com");
+    user2.setFullname("Test User 2");
+    user2.setPassword("password456");
+    user2.setBirthDay("1992-07-20");
         users.add(user2);
 
         repository.saveUsers(users);
@@ -87,18 +87,18 @@ void testSaveAndLoadUsers() {
         assertEquals(2, loaded.size());
         
         User loadedUser1 = loaded.get(0);
-        assertEquals(user1.username, loadedUser1.username);
-        assertEquals(user1.email, loadedUser1.email);
-        assertEquals(user1.fullname, loadedUser1.fullname);
-        assertEquals(user1.password, loadedUser1.password);
-        assertEquals(user1.birthDay, loadedUser1.birthDay);
+    assertEquals(user1.getUsername(), loadedUser1.getUsername());
+    assertEquals(user1.getEmail(), loadedUser1.getEmail());
+    assertEquals(user1.getFullname(), loadedUser1.getFullname());
+    assertEquals(user1.getPassword(), loadedUser1.getPassword());
+    assertEquals(user1.getBirthDay(), loadedUser1.getBirthDay());
         
         User loadedUser2 = loaded.get(1);
-        assertEquals(user2.username, loadedUser2.username);
-        assertEquals(user2.email, loadedUser2.email);
-        assertEquals(user2.fullname, loadedUser2.fullname);
-        assertEquals(user2.password, loadedUser2.password);
-        assertEquals(user2.birthDay, loadedUser2.birthDay);
+    assertEquals(user2.getUsername(), loadedUser2.getUsername());
+    assertEquals(user2.getEmail(), loadedUser2.getEmail());
+    assertEquals(user2.getFullname(), loadedUser2.getFullname());
+    assertEquals(user2.getPassword(), loadedUser2.getPassword());
+    assertEquals(user2.getBirthDay(), loadedUser2.getBirthDay());
     }
 
     @Test
@@ -131,19 +131,19 @@ void testDeleteUser() {
         List<User> users = new ArrayList<>();
         
         User user1 = new User();
-        user1.username = "userToDelete";
-        user1.email = "delete@example.com";
-        user1.fullname = "Delete Me";
-        user1.password = "password";
-        user1.birthDay = "1990-01-01";
+    user1.setUsername("userToDelete");
+    user1.setEmail("delete@example.com");
+    user1.setFullname("Delete Me");
+    user1.setPassword("password");
+    user1.setBirthDay("1990-01-01");
         users.add(user1);
 
         User user2 = new User();
-        user2.username = "userToKeep";
-        user2.email = "keep@example.com";
-        user2.fullname = "Keep Me";
-        user2.password = "password";
-        user2.birthDay = "1990-01-01";
+    user2.setUsername("userToKeep");
+    user2.setEmail("keep@example.com");
+    user2.setFullname("Keep Me");
+    user2.setPassword("password");
+    user2.setBirthDay("1990-01-01");
         users.add(user2);
 
         repository.saveUsers(users);
@@ -155,7 +155,7 @@ void testDeleteUser() {
         // Verify only one user remains
         List<User> remaining = repository.loadUsers(false);
         assertEquals(1, remaining.size());
-        assertEquals("userToKeep", remaining.get(0).username);
+    assertEquals("userToKeep", remaining.get(0).getUsername());
     }
 
     @Test
@@ -163,8 +163,8 @@ void testDeleteNonExistentUser() {
         // Save one user
         List<User> users = new ArrayList<>();
         User user = new User();
-        user.username = "existingUser";
-        user.email = "existing@example.com";
+    user.setUsername("existingUser");
+    user.setEmail("existing@example.com");
         users.add(user);
         repository.saveUsers(users);
 
@@ -175,7 +175,7 @@ void testDeleteNonExistentUser() {
         // Verify original user still exists
         List<User> remaining = repository.loadUsers(false);
         assertEquals(1, remaining.size());
-        assertEquals("existingUser", remaining.get(0).username);
+    assertEquals("existingUser", remaining.get(0).getUsername());
     }
 
     @Test
@@ -183,7 +183,7 @@ void testSaveUsersThrowsExceptionOnInvalidPath() {
         UserDataRepository invalidRepo = new UserDataRepository("/invalid/path/that/does/not/exist.xml");
         List<User> users = new ArrayList<>();
         User user = new User();
-        user.username = "test";
+    user.setUsername("test");
         users.add(user);
 
         assertThrows(RuntimeException.class, () -> invalidRepo.saveUsers(users));
diff --git a/src/test/java/com/starlight/model/UserTest.java b/src/test/java/com/starlight/model/UserTest.java
index 01140fc..ea27329 100644
--- a/src/test/java/com/starlight/model/UserTest.java
+++ b/src/test/java/com/starlight/model/UserTest.java
@@ -19,112 +19,112 @@ void setUp() {
     @Test
     void testUserCreation() {
         assertNotNull(user);
-        assertNull(user.username);
-        assertNull(user.email);
-        assertNull(user.fullname);
-        assertNull(user.password);
-        assertNull(user.birthDay);
+    assertNull(user.getUsername());
+    assertNull(user.getEmail());
+    assertNull(user.getFullname());
+    assertNull(user.getPassword());
+    assertNull(user.getBirthDay());
     }
 
     @Test
     void testSetAndGetUsername() {
         String testUsername = "testuser123";
-        user.username = testUsername;
-        assertEquals(testUsername, user.username);
+    user.setUsername(testUsername);
+    assertEquals(testUsername, user.getUsername());
     }
 
     @Test
     void testSetAndGetEmail() {
         String testEmail = "test@example.com";
-        user.email = testEmail;
-        assertEquals(testEmail, user.email);
+    user.setEmail(testEmail);
+    assertEquals(testEmail, user.getEmail());
     }
 
     @Test
     void testSetAndGetFullname() {
         String testFullname = "John Doe";
-        user.fullname = testFullname;
-        assertEquals(testFullname, user.fullname);
+    user.setFullname(testFullname);
+    assertEquals(testFullname, user.getFullname());
     }
 
     @Test
     void testSetAndGetPassword() {
         String testPassword = "securePassword123";
-        user.password = testPassword;
-        assertEquals(testPassword, user.password);
+    user.setPassword(testPassword);
+    assertEquals(testPassword, user.getPassword());
     }
 
     @Test
     void testSetAndGetBirthDay() {
         String testBirthDay = "1990-05-15";
-        user.birthDay = testBirthDay;
-        assertEquals(testBirthDay, user.birthDay);
+    user.setBirthDay(testBirthDay);
+    assertEquals(testBirthDay, user.getBirthDay());
     }
 
     @Test
     void testUserWithAllFieldsSet() {
-        user.username = "johndoe";
-        user.email = "john.doe@example.com";
-        user.fullname = "John Doe";
-        user.password = "myPassword123";
-        user.birthDay = "1985-12-25";
-
-        assertEquals("johndoe", user.username);
-        assertEquals("john.doe@example.com", user.email);
-        assertEquals("John Doe", user.fullname);
-        assertEquals("myPassword123", user.password);
-        assertEquals("1985-12-25", user.birthDay);
+    user.setUsername("johndoe");
+    user.setEmail("john.doe@example.com");
+    user.setFullname("John Doe");
+    user.setPassword("myPassword123");
+    user.setBirthDay("1985-12-25");
+
+    assertEquals("johndoe", user.getUsername());
+    assertEquals("john.doe@example.com", user.getEmail());
+    assertEquals("John Doe", user.getFullname());
+    assertEquals("myPassword123", user.getPassword());
+    assertEquals("1985-12-25", user.getBirthDay());
     }
 
     @Test
     void testUserFieldsCanBeNull() {
         // Ensure that setting fields to null works
-        user.username = "test";
-        user.email = "test@example.com";
-        user.fullname = "Test User";
-        user.password = "password";
-        user.birthDay = "1990-01-01";
-
-        user.username = null;
-        user.email = null;
-        user.fullname = null;
-        user.password = null;
-        user.birthDay = null;
-
-        assertNull(user.username);
-        assertNull(user.email);
-        assertNull(user.fullname);
-        assertNull(user.password);
-        assertNull(user.birthDay);
+    user.setUsername("test");
+    user.setEmail("test@example.com");
+    user.setFullname("Test User");
+    user.setPassword("password");
+    user.setBirthDay("1990-01-01");
+
+    user.setUsername(null);
+    user.setEmail(null);
+    user.setFullname(null);
+    user.setPassword(null);
+    user.setBirthDay(null);
+
+    assertNull(user.getUsername());
+    assertNull(user.getEmail());
+    assertNull(user.getFullname());
+    assertNull(user.getPassword());
+    assertNull(user.getBirthDay());
     }
 
     @Test
     void testUserFieldsCanBeEmpty() {
-        user.username = "";
-        user.email = "";
-        user.fullname = "";
-        user.password = "";
-        user.birthDay = "";
-
-        assertEquals("", user.username);
-        assertEquals("", user.email);
-        assertEquals("", user.fullname);
-        assertEquals("", user.password);
-        assertEquals("", user.birthDay);
+    user.setUsername("");
+    user.setEmail("");
+    user.setFullname("");
+    user.setPassword("");
+    user.setBirthDay("");
+
+    assertEquals("", user.getUsername());
+    assertEquals("", user.getEmail());
+    assertEquals("", user.getFullname());
+    assertEquals("", user.getPassword());
+    assertEquals("", user.getBirthDay());
     }
 
     @Test
     void testUserWithSpecialCharacters() {
-        user.username = "user_with-special.chars";
-        user.email = "test+tag@example-domain.co.uk";
-        user.fullname = "José María O'Connor";
-        user.password = "P@ssw0rd!#$";
-        user.birthDay = "2000-02-29"; // Leap year
-
-        assertEquals("user_with-special.chars", user.username);
-        assertEquals("test+tag@example-domain.co.uk", user.email);
-        assertEquals("José María O'Connor", user.fullname);
-        assertEquals("P@ssw0rd!#$", user.password);
-        assertEquals("2000-02-29", user.birthDay);
+    user.setUsername("user_with-special.chars");
+    user.setEmail("test+tag@example-domain.co.uk");
+    user.setFullname("José María O'Connor");
+    user.setPassword("P@ssw0rd!#$");
+    user.setBirthDay("2000-02-29"); // Leap year
+
+    assertEquals("user_with-special.chars", user.getUsername());
+    assertEquals("test+tag@example-domain.co.uk", user.getEmail());
+    assertEquals("José María O'Connor", user.getFullname());
+    assertEquals("P@ssw0rd!#$", user.getPassword());
+    assertEquals("2000-02-29", user.getBirthDay());
     }
 }
diff --git a/src/test/java/com/starlight/util/ChatHistoryManagerTest.java b/src/test/java/com/starlight/util/ChatHistoryManagerTest.java
index ba4ce91..79ae2ab 100644
--- a/src/test/java/com/starlight/util/ChatHistoryManagerTest.java
+++ b/src/test/java/com/starlight/util/ChatHistoryManagerTest.java
@@ -53,19 +53,19 @@ void testAddMessage() {
         assertEquals(1, currentSession.getMessages().size());
         
     ChatMessage message = currentSession.getMessages().get(0);
-        assertEquals("Hello, TabemonPal!", message.content);
-        assertTrue(message.isUser);
-        assertEquals(testUsername, message.username);
-        assertNotNull(message.timestamp);
+    assertEquals("Hello, TabemonPal!", message.getContent());
+    assertTrue(message.isUser());
+    assertEquals(testUsername, message.getUsername());
+    assertNotNull(message.getTimestamp());
         
         // Add an AI response
         historyManager.addMessage("Hello! How can I help you today?", false, "TabemonPal AI");
         
         assertEquals(2, currentSession.getMessages().size());
-        ChatMessage aiMessage = currentSession.getMessages().get(1);
-        assertEquals("Hello! How can I help you today?", aiMessage.content);
-        assertFalse(aiMessage.isUser);
-        assertEquals("TabemonPal AI", aiMessage.username);
+    ChatMessage aiMessage = currentSession.getMessages().get(1);
+    assertEquals("Hello! How can I help you today?", aiMessage.getContent());
+    assertFalse(aiMessage.isUser());
+    assertEquals("TabemonPal AI", aiMessage.getUsername());
     }
     
     @Test
@@ -85,15 +85,15 @@ void testAutoStartSession() {
     void testChatMessage() {
         ChatMessage userMessage = new ChatMessage("Test content", true, "testuser");
         
-        assertEquals("Test content", userMessage.content);
-        assertTrue(userMessage.isUser);
-        assertEquals("testuser", userMessage.username);
-        assertNotNull(userMessage.timestamp);
-        assertNotNull(userMessage.getFormattedTimestamp());
+    assertEquals("Test content", userMessage.getContent());
+    assertTrue(userMessage.isUser());
+    assertEquals("testuser", userMessage.getUsername());
+    assertNotNull(userMessage.getTimestamp());
+    assertNotNull(userMessage.getFormattedTimestamp());
         
         ChatMessage aiMessage = new ChatMessage("AI response", false, "TabemonPal AI");
-        assertFalse(aiMessage.isUser);
-        assertEquals("TabemonPal AI", aiMessage.username);
+    assertFalse(aiMessage.isUser());
+    assertEquals("TabemonPal AI", aiMessage.getUsername());
     }
     
     @Test
diff --git a/src/test/java/com/starlight/util/NutritionParserTest.java b/src/test/java/com/starlight/util/NutritionParserTest.java
index 6ff9d32..33e798b 100644
--- a/src/test/java/com/starlight/util/NutritionParserTest.java
+++ b/src/test/java/com/starlight/util/NutritionParserTest.java
@@ -50,16 +50,16 @@ void testParseValidNutritionXML() {
 
         Nutrition nutrition = parser.parseNutritionFromResponse(aiResponse);
     assertNotNull(nutrition, "Nutrition object should not be null");
-    assertNotNull(nutrition.ingredient, "Ingredient list should not be null");
-    assertEquals(2, nutrition.ingredient.size(), "Should have 2 ingredients");
-    assertEquals("Healthy", nutrition.verdict, "Should have correct verdict");
+    assertNotNull(nutrition.getIngredient(), "Ingredient list should not be null");
+    assertEquals(2, nutrition.getIngredient().size(), "Should have 2 ingredients");
+    assertEquals("Healthy", nutrition.getVerdict(), "Should have correct verdict");
 
     // Ingredient assertions moved to helper methods to reduce assertion count in this test method
     assertIngredient(
-        nutrition.ingredient.get(0),
+        nutrition.getIngredient().get(0),
         "Chicken Breast", "200g", "331", "62.2", "7.2", "0", "0", "0", "146");
     assertIngredient(
-        nutrition.ingredient.get(1),
+        nutrition.getIngredient().get(1),
         "Rice", "1 cup cooked", "205", "4.2", "0.4", "45", "0.6", "0.1", "2");
 
     assertTotals(nutrition, 536.0, 66.4, 7.6, 45.0, 0.6, 0.1, 148.0);
@@ -71,20 +71,20 @@ void testParseInvalidResponse() {
 
         Nutrition nutrition = parser.parseNutritionFromResponse(invalidResponse);
 
-        assertNotNull(nutrition, "Should return fallback nutrition object");
-        assertNotNull(nutrition.ingredient, "Should have fallback ingredient");
-        assertEquals(1, nutrition.ingredient.size(), "Should have one fallback ingredient");
-        assertEquals("Recipe", nutrition.ingredient.get(0).name);
-        assertEquals("Unknown", nutrition.verdict, "Should have Unknown verdict for fallback");
+    assertNotNull(nutrition, "Should return fallback nutrition object");
+    assertNotNull(nutrition.getIngredient(), "Should have fallback ingredient");
+    assertEquals(1, nutrition.getIngredient().size(), "Should have one fallback ingredient");
+    assertEquals("Recipe", nutrition.getIngredient().get(0).getName());
+    assertEquals("Unknown", nutrition.getVerdict(), "Should have Unknown verdict for fallback");
     }
 
     @Test
     void testParseNullResponse() {
         Nutrition nutrition = parser.parseNutritionFromResponse(null);
 
-        assertNotNull(nutrition, "Should return fallback nutrition object");
-        assertNotNull(nutrition.ingredient, "Should have fallback ingredient");
-        assertEquals(1, nutrition.ingredient.size(), "Should have one fallback ingredient");
+    assertNotNull(nutrition, "Should return fallback nutrition object");
+    assertNotNull(nutrition.getIngredient(), "Should have fallback ingredient");
+    assertEquals(1, nutrition.getIngredient().size(), "Should have one fallback ingredient");
     }
 
     @Test
@@ -92,8 +92,8 @@ void testParseEmptyResponse() {
         Nutrition nutrition = parser.parseNutritionFromResponse("");
 
         assertNotNull(nutrition, "Should return fallback nutrition object");
-        assertNotNull(nutrition.ingredient, "Should have fallback ingredient");
-        assertEquals(1, nutrition.ingredient.size(), "Should have one fallback ingredient");
+    assertNotNull(nutrition.getIngredient(), "Should have fallback ingredient");
+    assertEquals(1, nutrition.getIngredient().size(), "Should have one fallback ingredient");
     }
 
     @Test
@@ -133,10 +133,10 @@ void testParseUnknownVerdict() {
 
         Nutrition nutrition = parser.parseNutritionFromResponse(aiResponse);
 
-        assertNotNull(nutrition, "Nutrition object should not be null");
-        assertEquals("Unknown", nutrition.verdict, "Should have Unknown verdict");
-        assertEquals(1, nutrition.ingredient.size(), "Should have 1 ingredient");
-        assertEquals("Mystery Ingredient", nutrition.ingredient.get(0).name);
+    assertNotNull(nutrition, "Nutrition object should not be null");
+    assertEquals("Unknown", nutrition.getVerdict(), "Should have Unknown verdict");
+    assertEquals(1, nutrition.getIngredient().size(), "Should have 1 ingredient");
+    assertEquals("Mystery Ingredient", nutrition.getIngredient().get(0).getName());
     }
 
     // Helper methods to keep individual test readable while reducing per-method assertion counts
@@ -150,15 +150,15 @@ private static void assertIngredient(Nutrition.NutritionIngredient ingredient,
                                          String expectedFiber,
                                          String expectedSugar,
                                          String expectedSalt) {
-        assertEquals(expectedName, ingredient.name);
-        assertEquals(expectedAmount, ingredient.amount);
-        assertEquals(expectedCalories, ingredient.calories.value);
-        assertEquals(expectedProtein, ingredient.protein.value);
-        assertEquals(expectedFat, ingredient.fat.value);
-        assertEquals(expectedCarbs, ingredient.carbohydrates.value);
-        assertEquals(expectedFiber, ingredient.fiber.value);
-        assertEquals(expectedSugar, ingredient.sugar.value);
-        assertEquals(expectedSalt, ingredient.salt.value);
+    assertEquals(expectedName, ingredient.getName());
+    assertEquals(expectedAmount, ingredient.getAmount());
+    assertEquals(expectedCalories, ingredient.getCalories().getValue());
+    assertEquals(expectedProtein, ingredient.getProtein().getValue());
+    assertEquals(expectedFat, ingredient.getFat().getValue());
+    assertEquals(expectedCarbs, ingredient.getCarbohydrates().getValue());
+    assertEquals(expectedFiber, ingredient.getFiber().getValue());
+    assertEquals(expectedSugar, ingredient.getSugar().getValue());
+    assertEquals(expectedSalt, ingredient.getSalt().getValue());
     }
 
     private static void assertTotals(Nutrition nutrition,
diff --git a/src/test/java/com/starlight/util/SessionTest.java b/src/test/java/com/starlight/util/SessionTest.java
index 0767d24..f9bc0a8 100644
--- a/src/test/java/com/starlight/util/SessionTest.java
+++ b/src/test/java/com/starlight/util/SessionTest.java
@@ -21,11 +21,11 @@ void setUp() {
         
         // Create a test user
         testUser = new User();
-        testUser.username = "testuser";
-        testUser.email = "test@example.com";
-        testUser.fullname = "Test User";
-        testUser.password = "password123";
-        testUser.birthDay = "1990-01-01";
+        testUser.setUsername("testuser");
+        testUser.setEmail("test@example.com");
+        testUser.setFullname("Test User");
+        testUser.setPassword("password123");
+        testUser.setBirthDay("1990-01-01");
     }
 
     @AfterEach
@@ -47,11 +47,11 @@ void testSetAndGetCurrentUser() {
         
         assertNotNull(currentUser);
         assertEquals(testUser, currentUser);
-        assertEquals("testuser", currentUser.username);
-        assertEquals("test@example.com", currentUser.email);
-        assertEquals("Test User", currentUser.fullname);
-        assertEquals("password123", currentUser.password);
-        assertEquals("1990-01-01", currentUser.birthDay);
+        assertEquals("testuser", currentUser.getUsername());
+        assertEquals("test@example.com", currentUser.getEmail());
+        assertEquals("Test User", currentUser.getFullname());
+        assertEquals("password123", currentUser.getPassword());
+        assertEquals("1990-01-01", currentUser.getBirthDay());
     }
 
     @Test
@@ -69,15 +69,15 @@ void testSetCurrentUserToNull() {
     void testUpdateCurrentUser() {
         // Set initial user
         Session.setCurrentUser(testUser);
-        assertEquals("testuser", Session.getCurrentUser().username);
+        assertEquals("testuser", Session.getCurrentUser().getUsername());
         
         // Create a different user
         User newUser = new User();
-        newUser.username = "newuser";
-        newUser.email = "new@example.com";
-        newUser.fullname = "New User";
-        newUser.password = "newpassword";
-        newUser.birthDay = "1985-05-15";
+        newUser.setUsername("newuser");
+        newUser.setEmail("new@example.com");
+        newUser.setFullname("New User");
+        newUser.setPassword("newpassword");
+        newUser.setBirthDay("1985-05-15");
         
         // Update current user
         Session.setCurrentUser(newUser);
@@ -85,11 +85,11 @@ void testUpdateCurrentUser() {
         
         assertNotNull(currentUser);
         assertEquals(newUser, currentUser);
-        assertEquals("newuser", currentUser.username);
-        assertEquals("new@example.com", currentUser.email);
-        assertEquals("New User", currentUser.fullname);
-        assertEquals("newpassword", currentUser.password);
-        assertEquals("1985-05-15", currentUser.birthDay);
+        assertEquals("newuser", currentUser.getUsername());
+        assertEquals("new@example.com", currentUser.getEmail());
+        assertEquals("New User", currentUser.getFullname());
+        assertEquals("newpassword", currentUser.getPassword());
+        assertEquals("1985-05-15", currentUser.getBirthDay());
     }
 
     @Test
@@ -118,46 +118,46 @@ void testSessionIsStaticSingleton() {
         
         // Modify user through session reference
         User sessionUser = Session.getCurrentUser();
-        sessionUser.fullname = "Modified Name";
+        sessionUser.setFullname("Modified Name");
         
         // The change should be reflected when getting the user again
-        assertEquals("Modified Name", Session.getCurrentUser().fullname);
+        assertEquals("Modified Name", Session.getCurrentUser().getFullname());
     }
 
     @Test
     void testSetCurrentUserWithPartiallyPopulatedUser() {
         User partialUser = new User();
-        partialUser.username = "partial";
+        partialUser.setUsername("partial");
         // Leave other fields null
         
         Session.setCurrentUser(partialUser);
         User currentUser = Session.getCurrentUser();
         
         assertNotNull(currentUser);
-        assertEquals("partial", currentUser.username);
-        assertNull(currentUser.email);
-        assertNull(currentUser.fullname);
-        assertNull(currentUser.password);
-        assertNull(currentUser.birthDay);
+        assertEquals("partial", currentUser.getUsername());
+        assertNull(currentUser.getEmail());
+        assertNull(currentUser.getFullname());
+        assertNull(currentUser.getPassword());
+        assertNull(currentUser.getBirthDay());
     }
 
     @Test
     void testSetCurrentUserWithEmptyFieldsUser() {
         User emptyUser = new User();
-        emptyUser.username = "";
-        emptyUser.email = "";
-        emptyUser.fullname = "";
-        emptyUser.password = "";
-        emptyUser.birthDay = "";
+        emptyUser.setUsername("");
+        emptyUser.setEmail("");
+        emptyUser.setFullname("");
+        emptyUser.setPassword("");
+        emptyUser.setBirthDay("");
         
         Session.setCurrentUser(emptyUser);
         User currentUser = Session.getCurrentUser();
         
         assertNotNull(currentUser);
-        assertEquals("", currentUser.username);
-        assertEquals("", currentUser.email);
-        assertEquals("", currentUser.fullname);
-        assertEquals("", currentUser.password);
-        assertEquals("", currentUser.birthDay);
+    assertEquals("", currentUser.getUsername());
+    assertEquals("", currentUser.getEmail());
+    assertEquals("", currentUser.getFullname());
+    assertEquals("", currentUser.getPassword());
+    assertEquals("", currentUser.getBirthDay());
     }
 }

From 7c8862299681d7d9eea4d7a1fe74d45093eb4cad Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 05:19:36 +0700
Subject: [PATCH 4/9] Refactor: Improve code formatting and readability in
 RecipeManagerController and UserDataRepositoryTest

---
 .../com/starlight/controller/RecipeManagerController.java   | 1 +
 .../java/com/starlight/model/UserDataRepositoryTest.java    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/starlight/controller/RecipeManagerController.java b/src/main/java/com/starlight/controller/RecipeManagerController.java
index 79bc681..c7d78d8 100644
--- a/src/main/java/com/starlight/controller/RecipeManagerController.java
+++ b/src/main/java/com/starlight/controller/RecipeManagerController.java
@@ -562,6 +562,7 @@ private void sortTable(String sortCriteria) {
             case "Date (Oldest)":
                 comparator = Comparator.comparing((PostTableData data) -> parseDateTime(data.getOriginalPost().uploadtime));
                 break;
+            
         }
 
         if (comparator != null) {
diff --git a/src/test/java/com/starlight/model/UserDataRepositoryTest.java b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
index 8e123d2..6d52555 100644
--- a/src/test/java/com/starlight/model/UserDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/UserDataRepositoryTest.java
@@ -160,11 +160,11 @@ void testDeleteUser() {
 
     @Test
     void testDeleteNonExistentUser() {
-        // Save one user
+       // Save one user
         List<User> users = new ArrayList<>();
         User user = new User();
-    user.setUsername("existingUser");
-    user.setEmail("existing@example.com");
+        user.setUsername("existingUser");
+        user.setEmail("existing@example.com");
         users.add(user);
         repository.saveUsers(users);
 

From 209f687dc34e7ef015375ecf427155a9b82623bf Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 06:42:37 +0700
Subject: [PATCH 5/9] Refactor: Improve code formatting and readability in
 RecipeManagerController and UserDataRepositoryTest

---
 .../controller/EditProfileController.java     | 58 +++++++++++--------
 .../com/starlight/util/FXMLVerificator.java   | 16 +++--
 .../com/starlight/view/editAccount.fxml       |  2 +-
 3 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/src/main/java/com/starlight/controller/EditProfileController.java b/src/main/java/com/starlight/controller/EditProfileController.java
index 6ea9a77..f31cc9d 100644
--- a/src/main/java/com/starlight/controller/EditProfileController.java
+++ b/src/main/java/com/starlight/controller/EditProfileController.java
@@ -38,8 +38,15 @@
  */
 public class EditProfileController implements Initializable {
     private static final Logger logger = Logger.getLogger(EditProfileController.class.getName());
+    
+    // Dialog result type constants
+    private static final String ACCOUNT_UPDATED_SUCCESS = "account_updated_success";
+    private static final String ACCOUNT_UPDATE_FAILED = "account_update_failed";
+    private static final String ACCOUNT_DELETED_SUCCESS = "account_deleted_success";
+    private static final String ACCOUNT_DELETION_FAILED = "account_deletion_failed";
+    
     @FXML
-    private ImageView Image;
+    private ImageView image;
 
     @FXML
     private MFXButton imagepicker;
@@ -76,9 +83,9 @@ public void setUser(User user) {
         }
         
         // Load and scale profile image using ImageUtils
-        if (Image != null) {
-            ImageUtils.loadImage(Image, user.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
-            ImageUtils.scaleToFit(Image, 170, 170, 200);
+        if (image != null) {
+            ImageUtils.loadImage(image, user.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
+            ImageUtils.scaleToFit(image, 170, 170, 200);
         }
     }
 
@@ -100,10 +107,10 @@ public void setPreviousStage(Stage stage) {
      */
     private void loadCurrentUserProfileImage() {
         User currentSessionUser = Session.getCurrentUser();
-        if (currentSessionUser != null && Image != null) {
+        if (currentSessionUser != null && image != null) {
             // Load profile image using ImageUtils
-            ImageUtils.loadImage(Image, currentSessionUser.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
-            ImageUtils.scaleToFit(Image, 170, 170, 85); // Circular profile image with rounded corners
+            ImageUtils.loadImage(image, currentSessionUser.getProfilepicture(), ImageUtils.DEFAULT_MISSING_IMAGE);
+            ImageUtils.scaleToFit(image, 170, 170, 85); // Circular profile image with rounded corners
         }
     }
     
@@ -172,9 +179,9 @@ private void updateProfileImage(File selectedFile) {
             // Refresh the profile image display
             loadCurrentUserProfileImage();
             
-            logger.info("Profile image updated successfully: " + copiedFilePath);
+            logger.info(() -> "Profile image updated successfully: " + copiedFilePath);
         } catch (Exception e) {
-            logger.warning("Failed to update profile image: " + e.getMessage());
+            logger.warning(() -> "Failed to update profile image: " + e.getMessage());
             e.printStackTrace();
         }
     }
@@ -207,14 +214,15 @@ public void initialize(URL url, ResourceBundle rb) {
                 }
                 if (conn.getResponseCode() == 200) {
                     logger.info("User updated successfully");
-                    showResultDialog("account_updated_success");
+                    showResultDialog(ACCOUNT_UPDATED_SUCCESS);
                 } else {
-                    logger.info("Update failed: " + conn.getResponseCode());
-                    showResultDialog("account_update_failed");
+                    int responseCode = conn.getResponseCode();
+                    logger.info(() -> "Update failed: " + responseCode);
+                    showResultDialog(ACCOUNT_UPDATE_FAILED);
                 }
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "Failed to update user: " + e.getMessage(), e);
-                showResultDialog("account_update_failed");
+                logger.log(Level.SEVERE, "Failed to update user: {0}", e.getMessage());
+                showResultDialog(ACCOUNT_UPDATE_FAILED);
             }
         });
 
@@ -268,7 +276,7 @@ public void onDelete(javafx.event.ActionEvent event) {
             
             if (!userDeleted) {
                 logger.warning("User could not be deleted.");
-                showResultDialog("account_deletion_failed");
+                showResultDialog(ACCOUNT_DELETION_FAILED);
                 return;
             }
             
@@ -281,7 +289,7 @@ public void onDelete(javafx.event.ActionEvent event) {
             }
             
             // Show success message first
-            showResultDialog("account_deleted_success");
+            showResultDialog(ACCOUNT_DELETED_SUCCESS);
             
             // Load the authorization view
             FXMLLoader loader = new FXMLLoader(getClass().getResource("/com/starlight/view/Authorization.fxml"));
@@ -300,8 +308,8 @@ public void onDelete(javafx.event.ActionEvent event) {
             logger.info("User account deleted successfully");
             
         } catch (IOException e) {
-            logger.log(Level.WARNING, "Failed to load authorization view: " + e.getMessage(), e);
-            showResultDialog("account_deletion_failed");
+            logger.log(Level.WARNING, "Failed to load authorization view: {0}", e.getMessage());
+            showResultDialog(ACCOUNT_DELETION_FAILED);
             
             // Fallback to previous behavior if authorization view can't be loaded
             Stage currentStage = (Stage) deleteaccbutton.getScene().getWindow();
@@ -313,8 +321,8 @@ public void onDelete(javafx.event.ActionEvent event) {
                 previousStage.requestFocus();
             }
         } catch (Exception e) {
-            logger.log(Level.SEVERE, "Failed to delete account: " + e.getMessage(), e);
-            showResultDialog("account_deletion_failed");
+            logger.log(Level.SEVERE, "Failed to delete account: {0}", e.getMessage());
+            showResultDialog(ACCOUNT_DELETION_FAILED);
         }
     }
     
@@ -330,16 +338,16 @@ private void showResultDialog(String resultType) {
             
             // Set appropriate message based on result type
             switch (resultType) {
-                case "account_updated_success":
+                case ACCOUNT_UPDATED_SUCCESS:
                     controller.setAccountUpdatedSuccess();
                     break;
-                case "account_update_failed":
+                case ACCOUNT_UPDATE_FAILED:
                     controller.setAccountUpdateFailed();
                     break;
-                case "account_deleted_success":
+                case ACCOUNT_DELETED_SUCCESS:
                     controller.setAccountDeletedSuccess();
                     break;
-                case "account_deletion_failed":
+                case ACCOUNT_DELETION_FAILED:
                     controller.setAccountDeletionFailed();
                     break;
                 default:
@@ -360,7 +368,7 @@ private void showResultDialog(String resultType) {
             dialogStage.showAndWait();
             
         } catch (Exception e) {
-            logger.log(Level.SEVERE, "Failed to show result dialog: " + e.getMessage(), e);
+            logger.log(Level.SEVERE, "Failed to show result dialog: {0}", e.getMessage());
         }
     }
 
diff --git a/src/main/java/com/starlight/util/FXMLVerificator.java b/src/main/java/com/starlight/util/FXMLVerificator.java
index ac657ba..15583e9 100644
--- a/src/main/java/com/starlight/util/FXMLVerificator.java
+++ b/src/main/java/com/starlight/util/FXMLVerificator.java
@@ -16,6 +16,12 @@ private FXMLVerificator() {}
 
     private static final Logger logger = Logger.getLogger(FXMLVerificator.class.getName());
 
+    // Dedicated exception for FXML verification issues
+    private static class FXMLVerificationException extends RuntimeException {
+        FXMLVerificationException(String message) { super(message); }
+        FXMLVerificationException(String message, Throwable cause) { super(message, cause); }
+    }
+
     // You can customize these
     private static final String EXPECTED_NAMESPACE = "http://javafx.com/javafx/19";
     private static final String FXML_DIR = "src/main/resources";
@@ -33,7 +39,7 @@ public static void verifyAll() {
             files.filter(path -> path.toString().endsWith(".fxml"))
                  .forEach(FXMLVerificator::verifyOneFile);
         } catch (IOException e) {
-            throw new RuntimeException("Failed to walk FXML directory: " + FXML_DIR, e);
+            throw new FXMLVerificationException("Failed to walk FXML directory: " + FXML_DIR, e);
         }
     }
 
@@ -46,19 +52,19 @@ private static void verifyOneFile(Path fxmlPath) {
             String original = content;
 
             // Downgrade xmlns version
-            content = content.replaceAll("http://javafx.com/javafx/\\d+(?:\\.\\d+)*", EXPECTED_NAMESPACE);
+            content = content.replaceAll("http://javafx.com/javafx/\\d[\\d.]*", EXPECTED_NAMESPACE);
 
             // Detect illegal fx attributes
             for (String attr : ILLEGAL_ATTRIBUTES) {
                 if (content.contains(attr)) {
-                    throw new RuntimeException("FXML contains unsupported attribute: " + attr + " in " + fxmlPath);
+                    throw new FXMLVerificationException("FXML contains unsupported attribute: " + attr + " in " + fxmlPath);
                 }
             }
 
             // Detect unsupported tags
             for (String tag : UNSUPPORTED_TAGS) {
                 if (content.contains(tag)) {
-                    throw new RuntimeException("FXML uses possibly unsupported tag: " + tag + " in " + fxmlPath);
+                    throw new FXMLVerificationException("FXML uses possibly unsupported tag: " + tag + " in " + fxmlPath);
                 }
             }
 
@@ -69,7 +75,7 @@ private static void verifyOneFile(Path fxmlPath) {
             }
 
         } catch (IOException e) {
-            throw new RuntimeException("Failed to verify FXML file: " + fxmlPath, e);
+            throw new FXMLVerificationException("Failed to verify FXML file: " + fxmlPath, e);
         }
     }
 }
diff --git a/src/main/resources/com/starlight/view/editAccount.fxml b/src/main/resources/com/starlight/view/editAccount.fxml
index d389640..09cfae7 100644
--- a/src/main/resources/com/starlight/view/editAccount.fxml
+++ b/src/main/resources/com/starlight/view/editAccount.fxml
@@ -30,7 +30,7 @@
             <RowConstraints maxHeight="1.7976931348623157E308" minHeight="10.0" prefHeight="325.5" vgrow="ALWAYS" />
         </rowConstraints>
          <children>
-            <ImageView fx:id="Image" fitHeight="150.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true">
+            <ImageView fx:id="image" fitHeight="150.0" fitWidth="150.0" pickOnBounds="true" preserveRatio="true">
                <viewport>
                   <Rectangle2D height="150.0" width="150.0" />
                </viewport>

From 1b695767afb2c290c1f9846fe1263b04c056d6f4 Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 07:13:36 +0700
Subject: [PATCH 6/9] Refactor: Update Post model to use getter and setter
 methods; enhance image loading utility and improve data persistence exception
 handling

---
 .../controller/CreatePostController.java      |   8 +-
 .../controller/MissionController.java         |   4 +
 .../starlight/controller/PostController.java  |   4 +-
 .../controller/ProfileController.java         | 149 ++++++----
 .../controller/RecipeManagerController.java   | 273 +++++++++++-------
 src/main/java/com/starlight/model/Post.java   |  28 +-
 .../repository/AchievementDataRepository.java |   3 +-
 .../repository/PostDataRepository.java        |   3 +-
 .../repository/UserDataRepository.java        |  11 +-
 .../java/com/starlight/util/ImageUtils.java   | 114 +++++---
 .../model/PostDataRepositoryTest.java         |  38 +--
 11 files changed, 383 insertions(+), 252 deletions(-)

diff --git a/src/main/java/com/starlight/controller/CreatePostController.java b/src/main/java/com/starlight/controller/CreatePostController.java
index 9b9b814..a856e96 100644
--- a/src/main/java/com/starlight/controller/CreatePostController.java
+++ b/src/main/java/com/starlight/controller/CreatePostController.java
@@ -139,7 +139,7 @@ public void initialize(URL url, ResourceBundle rb) {
                 newPost.setImage(storedPath != null ? storedPath : selectedImage.getAbsolutePath());
             } catch (Exception e) {
                 e.printStackTrace();
-                newPost.image = selectedImage.getAbsolutePath();
+                newPost.setImage(selectedImage.getAbsolutePath());
             }
             newPost.setLikecount("0");
             newPost.setCommentcount("0");
@@ -263,7 +263,7 @@ protected Void call() throws Exception {
                             newPost.setNutrition(nutritionParser.parseNutritionFromResponse(nutritionResponse));
                             
             // Check if we got valid nutrition data
-            if (newPost.nutrition != null && newPost.nutrition.getIngredient() != null && !newPost.nutrition.getIngredient().isEmpty()) {
+            if (newPost.getNutrition() != null && newPost.getNutrition().getIngredient() != null && !newPost.getNutrition().getIngredient().isEmpty()) {
                 logger.info(java.text.MessageFormat.format(
                     "Nutrition analysis completed successfully on attempt {0}", currentAttempt));
                 
@@ -401,7 +401,7 @@ protected void failed() {
                         // Still try to save post without nutrition data
                         try {
                             processingController.updateStatus("Saving post with default values...");
-                            newPost.nutrition = nutritionParser.parseNutritionFromResponse(null); // Creates fallback nutrition
+                            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null)); // Creates fallback nutrition
                             List<Post> posts = repository.loadPosts();
                             posts.add(0, newPost);
                             repository.savePosts(posts);
@@ -446,7 +446,7 @@ protected void failed() {
             
             // Fallback: try to save post and navigate directly
             try {
-                newPost.nutrition = nutritionParser.parseNutritionFromResponse(null); // Creates fallback nutrition
+                newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null)); // Creates fallback nutrition
                 List<Post> posts = repository.loadPosts();
                 posts.add(0, newPost);
                 repository.savePosts(posts);
diff --git a/src/main/java/com/starlight/controller/MissionController.java b/src/main/java/com/starlight/controller/MissionController.java
index e6f372b..e2690f6 100644
--- a/src/main/java/com/starlight/controller/MissionController.java
+++ b/src/main/java/com/starlight/controller/MissionController.java
@@ -1,8 +1,12 @@
 package com.starlight.controller;
 
 import javafx.fxml.FXML;
+import javafx.scene.layout.GridPane;
 
 public class MissionController {
+    @FXML
+    private GridPane tabestreakcounter;
+
     
 
     @FXML
diff --git a/src/main/java/com/starlight/controller/PostController.java b/src/main/java/com/starlight/controller/PostController.java
index d6ef6b7..0df2eaf 100644
--- a/src/main/java/com/starlight/controller/PostController.java
+++ b/src/main/java/com/starlight/controller/PostController.java
@@ -415,7 +415,7 @@ private void populateNutritionFacts() {
         }
         
         // Show placeholder data when no nutrition analysis available
-        if (currentPost.nutrition == null) {
+        if (currentPost.getNutrition() == null) {
             ObservableList<PieChart.Data> placeholderData = FXCollections.observableArrayList(
                 new PieChart.Data("No nutrition analysis available", 1)
             );
@@ -430,7 +430,7 @@ private void populateNutritionFacts() {
         }
         
         try {
-            Nutrition nutrition = currentPost.nutrition;
+            Nutrition nutrition = currentPost.getNutrition();
             ObservableList<PieChart.Data> pieChartData = FXCollections.observableArrayList();
             
             // Get total values for all nutrients
diff --git a/src/main/java/com/starlight/controller/ProfileController.java b/src/main/java/com/starlight/controller/ProfileController.java
index b4b0482..745e573 100644
--- a/src/main/java/com/starlight/controller/ProfileController.java
+++ b/src/main/java/com/starlight/controller/ProfileController.java
@@ -108,7 +108,7 @@ private void updateRecipeItemControllersMainController() {
         // Since we can't easily access individual controllers after they're created,
         // the best approach is to reload recipes if they were loaded before MainController was set
         javafx.scene.Node content = myrepiceList.getContent();
-        if (content != null && content instanceof javafx.scene.Parent) {
+        if (content instanceof javafx.scene.Parent) {
             javafx.scene.Parent parentContent = (javafx.scene.Parent) content;
             if (parentContent.getChildrenUnmodifiable().size() > 0) {
                 logger.info("Reloading recipes with MainController reference");
@@ -165,80 +165,111 @@ private void loadUserRecipes() {
         User currentUser = Session.getCurrentUser();
         if (currentUser == null) return;
         
+        List<Post> userPosts = getUserPosts(currentUser);
+        if (userPosts.isEmpty()) {
+            clearRecipeContainer();
+            return;
+        }
+        
+        HBox recipeContainer = createRecipeContainer(userPosts);
+        myrepiceList.setContent(recipeContainer);
+        updateRecipeCount(userPosts.size());
+    }
+
+    /**
+     * Retrieves posts for the current user
+     */
+    private List<Post> getUserPosts(User currentUser) {
         List<Post> allPosts = repository.loadPosts();
         if (allPosts == null || allPosts.isEmpty()) {
-            // Clear the container if no posts
-            myrepiceList.setContent(new HBox());
-            if (recipes != null) {
-                recipes.setText("0");
-            }
-            return;
+            return List.of();
         }
         
-        // Filter posts by current user
-        List<Post> userPosts = allPosts.stream()
+        return allPosts.stream()
             .filter(post -> currentUser.getUsername().equals(post.getUsername()))
             .toList();
-            
-        if (userPosts.isEmpty()) {
-            // Clear the container if no posts
-            myrepiceList.setContent(new HBox());
-            if (recipes != null) {
-                recipes.setText("0");
-            }
-            return;
-        }
-        
-        // Create horizontal layout for recipes
+    }
+
+    /**
+     * Clears the recipe container and resets count
+     */
+    private void clearRecipeContainer() {
+        myrepiceList.setContent(new HBox());
+        updateRecipeCount(0);
+    }
+
+    /**
+     * Creates the recipe container with all user posts
+     */
+    private HBox createRecipeContainer(List<Post> userPosts) {
         HBox recipeContainer = new HBox();
         recipeContainer.setSpacing(20);
         
         for (Post post : userPosts) {
-            String title = post.getTitle();
-            String image = post.getImage();
-            String likes = post.getLikecount();
-            String rating = post.getRating();
+            GridPane recipeNode = createRecipeNode(post);
+            if (recipeNode != null) {
+                recipeContainer.getChildren().add(recipeNode);
+            }
+        }
+        
+        return recipeContainer;
+    }
 
-            try {
-                FXMLLoader loader = new FXMLLoader(getClass().getResource("/com/starlight/view/recipeItem.fxml"));
-                GridPane recipeNode = loader.load();
-                RecipeItemController controller = loader.getController();
+    /**
+     * Creates a single recipe node for a post
+     */
+    private GridPane createRecipeNode(Post post) {
+        try {
+            FXMLLoader loader = new FXMLLoader(getClass().getResource("/com/starlight/view/recipeItem.fxml"));
+            GridPane recipeNode = loader.load();
+            RecipeItemController controller = loader.getController();
+
+            configureRecipeController(controller, post);
+            loadRecipeImage(controller, post.getImage());
 
-                // Set the recipe data using the setter method
-                controller.setRecipeData(title, rating != null ? rating : "0.0", likes != null ? likes : "0");
-                
-                // Set the post data for edit/delete functionality
-                controller.setPost(post);
-                
-                // Set the main controller reference for navigation (check if available)
-                if (main != null) {
-                    controller.setMainController(main);
-                } else {
-                    // Log warning if main controller not available yet
-                    logger.warning("MainController not available for RecipeItemController - navigation will not work");
-                }
-                
-                // Set up callback to refresh the recipes when post is updated/deleted
-                controller.setOnPostUpdated(() -> loadUserRecipes());
+            return recipeNode;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
 
-                // Load recipe image using ImageUtils
-                ImageView recipeImageView = controller.getImageView();
-                if (recipeImageView != null) {
-                    ImageUtils.loadImage(recipeImageView, image, ImageUtils.DEFAULT_MISSING_IMAGE);
-                    ImageUtils.scaleToFit(recipeImageView, 280, 174, 20); // Adjust size for recipe item
-                }
+    /**
+     * Configures the recipe item controller with post data
+     */
+    private void configureRecipeController(RecipeItemController controller, Post post) {
+        String title = post.getTitle();
+        String likes = post.getLikecount();
+        String rating = post.getRating();
 
-                recipeContainer.getChildren().add(recipeNode);
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+        controller.setRecipeData(title, rating != null ? rating : "0.0", likes != null ? likes : "0");
+        controller.setPost(post);
+        controller.setOnPostUpdated(() -> loadUserRecipes());
+
+        if (main != null) {
+            controller.setMainController(main);
+        } else {
+            logger.warning("MainController not available for RecipeItemController - navigation will not work");
         }
-        
-        myrepiceList.setContent(recipeContainer);
-        
-        // Update recipe count
+    }
+
+    /**
+     * Loads the recipe image for the controller
+     */
+    private void loadRecipeImage(RecipeItemController controller, String imagePath) {
+        ImageView recipeImageView = controller.getImageView();
+        if (recipeImageView != null) {
+            ImageUtils.loadImage(recipeImageView, imagePath, ImageUtils.DEFAULT_MISSING_IMAGE);
+            ImageUtils.scaleToFit(recipeImageView, 280, 174, 20);
+        }
+    }
+
+    /**
+     * Updates the recipe count display
+     */
+    private void updateRecipeCount(int count) {
         if (recipes != null) {
-            recipes.setText(String.valueOf(userPosts.size()));
+            recipes.setText(String.valueOf(count));
         }
     }
 
diff --git a/src/main/java/com/starlight/controller/RecipeManagerController.java b/src/main/java/com/starlight/controller/RecipeManagerController.java
index c7d78d8..5416e8a 100644
--- a/src/main/java/com/starlight/controller/RecipeManagerController.java
+++ b/src/main/java/com/starlight/controller/RecipeManagerController.java
@@ -5,7 +5,6 @@
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.control.*;
-import javafx.scene.Node;
 import javafx.scene.layout.GridPane;
 import javafx.geometry.Insets;
 import java.util.Optional;
@@ -42,17 +41,13 @@
  */
 public class RecipeManagerController implements Initializable {
 
+    // Constants for error messages
+    private static final String VALIDATION_ERROR = "Validation Error";
+    private static final String ERROR = "Error";
+
     @FXML
     private MFXTableView<PostTableData> postsTable;
 
-    // Create table columns programmatically instead of FXML injection
-    private MFXTableColumn<PostTableData> titleColumn;
-    private MFXTableColumn<PostTableData> usernameColumn;
-    private MFXTableColumn<PostTableData> ratingColumn;
-    private MFXTableColumn<PostTableData> likeCountColumn;
-    private MFXTableColumn<PostTableData> uploadTimeColumn;
-    private MFXTableColumn<PostTableData> actionColumn;
-
     @FXML
     private MFXComboBox<String> sortComboBox;
 
@@ -203,12 +198,12 @@ private void setupTableColumns() {
         System.out.println("DEBUG: Setting up MFXTableView columns...");
         
         // Create table columns programmatically with simplified approach
-        titleColumn = new MFXTableColumn<>("Title");
-        usernameColumn = new MFXTableColumn<>("Author");
-        ratingColumn = new MFXTableColumn<>("Rating");
-        likeCountColumn = new MFXTableColumn<>("Likes");
-        uploadTimeColumn = new MFXTableColumn<>("Upload Date");
-        actionColumn = new MFXTableColumn<>("Actions");
+        MFXTableColumn<PostTableData> titleColumn = new MFXTableColumn<>("Title");
+        MFXTableColumn<PostTableData> usernameColumn = new MFXTableColumn<>("Author");
+        MFXTableColumn<PostTableData> ratingColumn = new MFXTableColumn<>("Rating");
+        MFXTableColumn<PostTableData> likeCountColumn = new MFXTableColumn<>("Likes");
+        MFXTableColumn<PostTableData> uploadTimeColumn = new MFXTableColumn<>("Upload Date");
+        MFXTableColumn<PostTableData> actionColumn = new MFXTableColumn<>("Actions");
 
         // Set preferred widths - make them larger for better visibility
         titleColumn.setPrefWidth(250.0);
@@ -291,15 +286,54 @@ private void setupTableColumns() {
      * Shows edit dialog for a post
      */
     private void showEditDialog(PostTableData data) {
+        Dialog<Post> dialog = createEditDialog(data);
+        ButtonType saveButtonType = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
+        dialog.getDialogPane().getButtonTypes().addAll(saveButtonType, ButtonType.CANCEL);
+
+        EditFormFields formFields = createEditFormFields(data);
+        dialog.getDialogPane().setContent(formFields.gridPane);
+
+        dialog.setResultConverter(dialogButton -> 
+            dialogButton == saveButtonType ? validateAndCreateUpdatedPost(formFields, data) : null);
+
+        Optional<Post> result = dialog.showAndWait();
+        result.ifPresent(updatedPost -> handleEditDialogResult(updatedPost, data));
+    }
+
+    /**
+     * Creates the basic edit dialog structure
+     */
+    private Dialog<Post> createEditDialog(PostTableData data) {
         Dialog<Post> dialog = new Dialog<>();
         dialog.setTitle("Edit Post");
         dialog.setHeaderText("Edit post details for: " + data.getTitle());
+        return dialog;
+    }
 
-        // Set the button types
-        ButtonType saveButtonType = new ButtonType("Save", ButtonBar.ButtonData.OK_DONE);
-        dialog.getDialogPane().getButtonTypes().addAll(saveButtonType, ButtonType.CANCEL);
+    /**
+     * Container for form fields to reduce parameter passing
+     */
+    private static class EditFormFields {
+        final GridPane gridPane;
+        final TextField titleField;
+        final TextField ratingField;
+        final TextField likeCountField;
+        final TextArea descriptionArea;
+
+        EditFormFields(GridPane gridPane, TextField titleField, TextField ratingField, 
+                      TextField likeCountField, TextArea descriptionArea) {
+            this.gridPane = gridPane;
+            this.titleField = titleField;
+            this.ratingField = ratingField;
+            this.likeCountField = likeCountField;
+            this.descriptionArea = descriptionArea;
+        }
+    }
 
-        // Create form fields
+    /**
+     * Creates and configures the form fields for the edit dialog
+     */
+    private EditFormFields createEditFormFields(PostTableData data) {
         GridPane grid = new GridPane();
         grid.setHgap(10);
         grid.setVgap(10);
@@ -332,71 +366,96 @@ private void showEditDialog(PostTableData data) {
         grid.add(new Label("Description:"), 0, 3);
         grid.add(descriptionArea, 1, 3);
 
-        dialog.getDialogPane().setContent(grid);
+        return new EditFormFields(grid, titleField, ratingField, likeCountField, descriptionArea);
+    }
 
-        // Enable/Disable save button depending on whether valid data was entered
-        Node saveButton = dialog.getDialogPane().lookupButton(saveButtonType);
-        saveButton.setDisable(false);
+    /**
+     * Validates form inputs and creates updated post if valid
+     */
+    private Post validateAndCreateUpdatedPost(EditFormFields fields, PostTableData data) {
+        if (!validateEditFormInputs(fields)) {
+            return null;
+        }
 
-        // Convert the result when the save button is clicked
-        dialog.setResultConverter(dialogButton -> {
-            if (dialogButton == saveButtonType) {
-                // Validate input
-                if (titleField.getText().trim().isEmpty()) {
-                    showErrorAlert("Validation Error", "Title cannot be empty.");
-                    return null;
-                }
-                
-                try {
-                    double rating = Double.parseDouble(ratingField.getText());
-                    if (rating < 0 || rating > 5) {
-                        showErrorAlert("Validation Error", "Rating must be between 0 and 5.");
-                        return null;
-                    }
-                } catch (NumberFormatException e) {
-                    showErrorAlert("Validation Error", "Rating must be a valid number.");
-                    return null;
-                }
-                
-                try {
-                    int likeCount = Integer.parseInt(likeCountField.getText());
-                    if (likeCount < 0) {
-                        showErrorAlert("Validation Error", "Like count cannot be negative.");
-                        return null;
-                    }
-                } catch (NumberFormatException e) {
-                    showErrorAlert("Validation Error", "Like count must be a valid number.");
-                    return null;
-                }
+        Post updatedPost = data.getOriginalPost();
+        updatedPost.setTitle(fields.titleField.getText().trim());
+        updatedPost.setRating(fields.ratingField.getText().trim());
+        updatedPost.setLikecount(fields.likeCountField.getText().trim());
+        updatedPost.setDescription(fields.descriptionArea.getText().trim());
+        
+        return updatedPost;
+    }
 
-                // Create updated post
-                Post updatedPost = data.getOriginalPost();
-                updatedPost.title = titleField.getText().trim();
-                updatedPost.rating = ratingField.getText().trim();
-                updatedPost.likecount = likeCountField.getText().trim();
-                updatedPost.description = descriptionArea.getText().trim();
-                
-                return updatedPost;
+    /**
+     * Validates all form inputs
+     */
+    private boolean validateEditFormInputs(EditFormFields fields) {
+        return validateTitle(fields.titleField) && 
+               validateRating(fields.ratingField) && 
+               validateLikeCount(fields.likeCountField);
+    }
+
+    /**
+     * Validates the title field
+     */
+    private boolean validateTitle(TextField titleField) {
+        if (titleField.getText().trim().isEmpty()) {
+            showErrorAlert(VALIDATION_ERROR, "Title cannot be empty.");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Validates the rating field
+     */
+    private boolean validateRating(TextField ratingField) {
+        try {
+            double rating = Double.parseDouble(ratingField.getText());
+            if (rating < 0 || rating > 5) {
+                showErrorAlert(VALIDATION_ERROR, "Rating must be between 0 and 5.");
+                return false;
             }
-            return null;
-        });
+        } catch (NumberFormatException e) {
+            showErrorAlert(VALIDATION_ERROR, "Rating must be a valid number.");
+            return false;
+        }
+        return true;
+    }
 
-        Optional<Post> result = dialog.showAndWait();
-        result.ifPresent(updatedPost -> {
-            // Save changes
-            savePostChanges(updatedPost);
-            
-            // Update the table data
-            data.title.set(updatedPost.title);
-            data.rating.set(updatedPost.rating);
-            data.likeCount.set(updatedPost.likecount);
-            data.description.set(updatedPost.description);
-            
-            // Refresh the table
-            postsTable.update();
-            
-            showSuccessAlert("Success", "Post updated successfully!");
-        });
+    /**
+     * Validates the like count field
+     */
+    private boolean validateLikeCount(TextField likeCountField) {
+        try {
+            int likeCount = Integer.parseInt(likeCountField.getText());
+            if (likeCount < 0) {
+                showErrorAlert(VALIDATION_ERROR, "Like count cannot be negative.");
+                return false;
+            }
+        } catch (NumberFormatException e) {
+            showErrorAlert(VALIDATION_ERROR, "Like count must be a valid number.");
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     * Handles the result of a successful edit dialog
+     */
+    private void handleEditDialogResult(Post updatedPost, PostTableData data) {
+        savePostChanges(updatedPost);
+        
+        // Update the table data
+        data.title.set(updatedPost.getTitle());
+        data.rating.set(updatedPost.getRating());
+        data.likeCount.set(updatedPost.getLikecount());
+        data.description.set(updatedPost.getDescription());
+        
+        // Refresh the table
+        postsTable.update();
+        
+        showSuccessAlert("Success", "Post updated successfully!");
     }
 
     /**
@@ -494,14 +553,12 @@ protected Void call() throws Exception {
             }
         };
 
-        loadTask.setOnFailed(e -> {
-            Platform.runLater(() -> {
-                loadingIndicator.setVisible(false);
-                System.err.println("DEBUG: Failed to load data: " + e.getSource().getException());
-                e.getSource().getException().printStackTrace();
-                showErrorAlert("Error", "Failed to load data from XML files: " + e.getSource().getException().getMessage());
-            });
-        });
+        loadTask.setOnFailed(e -> Platform.runLater(() -> {
+            loadingIndicator.setVisible(false);
+            System.err.println("DEBUG: Failed to load data: " + e.getSource().getException());
+            e.getSource().getException().printStackTrace();
+            showErrorAlert(ERROR, "Failed to load data from XML files: " + e.getSource().getException().getMessage());
+        }));
 
         new Thread(loadTask).start();
     }
@@ -556,13 +613,15 @@ private void sortTable(String sortCriteria) {
                 });
                 break;
             case "Date (Newest)":
-                comparator = Comparator.comparing((PostTableData data) -> parseDateTime(data.getOriginalPost().uploadtime))
+                comparator = Comparator.comparing((PostTableData data) -> parseDateTime(data.getOriginalPost().getUploadtime()))
                     .reversed();
                 break;
             case "Date (Oldest)":
-                comparator = Comparator.comparing((PostTableData data) -> parseDateTime(data.getOriginalPost().uploadtime));
+                comparator = Comparator.comparing((PostTableData data) -> parseDateTime(data.getOriginalPost().getUploadtime()));
+                break;
+            default:
+                // No sorting applied for unknown criteria
                 break;
-            
         }
 
         if (comparator != null) {
@@ -621,11 +680,11 @@ private void deletePost(PostTableData data) {
                 
                 showSuccessAlert("Success", "Post deleted successfully!");
             } else {
-                showErrorAlert("Error", "Post not found or could not be deleted.");
+                showErrorAlert(ERROR, "Post not found or could not be deleted.");
             }
 
         } catch (Exception e) {
-            showErrorAlert("Error", "Failed to delete post: " + e.getMessage());
+            showErrorAlert(ERROR, "Failed to delete post: " + e.getMessage());
         }
     }
 
@@ -646,7 +705,7 @@ private void savePostChanges(Post post) {
 
             postRepository.savePosts(allPosts);
         } catch (Exception e) {
-            showErrorAlert("Error", "Failed to save changes: " + e.getMessage());
+            showErrorAlert(ERROR, "Failed to save changes: " + e.getMessage());
         }
     }
 
@@ -680,22 +739,22 @@ private void addTestData() {
         
         // Create dummy posts for testing
         Post testPost1 = new Post();
-    testPost1.setUuid("test-1");
-        testPost1.title = "Test Post 1";
-    testPost1.setUsername("TestUser1");
-        testPost1.rating = "4.5";
-        testPost1.likecount = "10";
-        testPost1.uploadtime = "2025-07-20T19:00:00";
-        testPost1.description = "This is a test post to verify table functionality";
+        testPost1.setUuid("test-1");
+        testPost1.setTitle("Test Post 1");
+        testPost1.setUsername("TestUser1");
+        testPost1.setRating("4.5");
+        testPost1.setLikecount("10");
+        testPost1.setUploadtime("2025-07-20T19:00:00");
+        testPost1.setDescription("This is a test post to verify table functionality");
         
         Post testPost2 = new Post();
-    testPost2.setUuid("test-2");
-        testPost2.title = "Test Post 2";
-    testPost2.setUsername("TestUser2");
-        testPost2.rating = "3.8";
-        testPost2.likecount = "5";
-        testPost2.uploadtime = "2025-07-20T18:30:00";
-        testPost2.description = "Another test post";
+        testPost2.setUuid("test-2");
+        testPost2.setTitle("Test Post 2");
+        testPost2.setUsername("TestUser2");
+        testPost2.setRating("3.8");
+        testPost2.setLikecount("5");
+        testPost2.setUploadtime("2025-07-20T18:30:00");
+        testPost2.setDescription("Another test post");
         
         // Convert to table data
         PostTableData tableData1 = new PostTableData(testPost1);
diff --git a/src/main/java/com/starlight/model/Post.java b/src/main/java/com/starlight/model/Post.java
index 9e26c84..964d772 100644
--- a/src/main/java/com/starlight/model/Post.java
+++ b/src/main/java/com/starlight/model/Post.java
@@ -5,33 +5,33 @@
  */
 public class Post {
     /** Unique identifier. */
-    public String uuid;
+    private String uuid;
     /** Username of the creator. */
-    public String username;
+    private String username;
     /** Path to the profile picture. */
-    public String profilepicture;
+    private String profilepicture;
     /** Title of the post. */
-    public String title;
+    private String title;
     /** Description of the recipe/post. */
-    public String description;
+    private String description;
     /** Ingredients text. */
-    public String ingredients;
+    private String ingredients;
     /** Preparation directions. */
-    public String directions;
+    private String directions;
     /** Path to the image of the dish. */
-    public String image;
+    private String image;
     /** Average rating. */
-    public String rating;
+    private String rating;
     /** Upload timestamp. */
-    public String uploadtime;
+    private String uploadtime;
     /** Like count. */
-    public String likecount;
+    private String likecount;
     /** Comment count. */
-    public String commentcount;
+    private String commentcount;
     /** Whether the current user has liked this post. */
-    public String isLiked;
+    private String isLiked;
     /** Nutrition facts data from AI analysis. */
-    public Nutrition nutrition;
+    private Nutrition nutrition;
 
     // Accessors - keep these to allow callers to use getters while preserving
     // the existing public fields for backwards compatibility.
diff --git a/src/main/java/com/starlight/repository/AchievementDataRepository.java b/src/main/java/com/starlight/repository/AchievementDataRepository.java
index f114c1a..605455a 100644
--- a/src/main/java/com/starlight/repository/AchievementDataRepository.java
+++ b/src/main/java/com/starlight/repository/AchievementDataRepository.java
@@ -7,6 +7,7 @@
 import java.util.List;
 
 import com.starlight.model.Post;
+import com.starlight.repository.UserDataRepository.DataPersistenceException;
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 
@@ -100,7 +101,7 @@ public void savePosts(List<Post> posts) {
         try (FileOutputStream fos = new FileOutputStream(xmlPath)) {
             xstream.toXML(posts, fos);
         } catch (Exception e) {
-            throw new RuntimeException("Failed to save posts", e);
+            throw new DataPersistenceException("Failed to save posts", e);
         }
     }
 }
diff --git a/src/main/java/com/starlight/repository/PostDataRepository.java b/src/main/java/com/starlight/repository/PostDataRepository.java
index e638666..3d05d3c 100644
--- a/src/main/java/com/starlight/repository/PostDataRepository.java
+++ b/src/main/java/com/starlight/repository/PostDataRepository.java
@@ -8,6 +8,7 @@
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.io.xml.DomDriver;
 import com.starlight.model.Post;
+import com.starlight.repository.UserDataRepository.DataPersistenceException;
 import com.starlight.util.FileSystemManager;
 
 /**
@@ -150,7 +151,7 @@ public void savePosts(List<Post> posts) {
             }
             xstream.toXML(posts, fos);
         } catch (Exception e) {
-            throw new RuntimeException("Failed to save posts to file: " + xmlPath + ". Error: " + e.getMessage(), e);
+            throw new DataPersistenceException("Failed to save posts to file: " + xmlPath + ". Error: " + e.getMessage(), e);
         }
     }
 
diff --git a/src/main/java/com/starlight/repository/UserDataRepository.java b/src/main/java/com/starlight/repository/UserDataRepository.java
index 65777b0..2c58aca 100644
--- a/src/main/java/com/starlight/repository/UserDataRepository.java
+++ b/src/main/java/com/starlight/repository/UserDataRepository.java
@@ -15,6 +15,15 @@
  * Repository for persisting {@link User} objects to an XML file.
  */
 public class UserDataRepository {
+    
+    /**
+     * Exception thrown when data persistence operations fail.
+     */
+    public static class DataPersistenceException extends RuntimeException {
+        public DataPersistenceException(String message, Throwable cause) {
+            super(message, cause);
+        }
+    }
     private static final String DEFAULT_XML_PATH = FileSystemManager.getDatabaseDirectory() + File.separator + "UserData.xml";
     private static final String DUMMY_XML_PATH = "src/main/java/com/starlight/data/UserDataDummy.xml";
 
@@ -137,7 +146,7 @@ public void saveUsers(List<User> users) {
                 xstream.toXML(distinctUsers, fos);
             }
         } catch (Exception e) {
-            throw new RuntimeException("Failed to save users", e);
+            throw new DataPersistenceException("Failed to save users", e);
         }
     }
 
diff --git a/src/main/java/com/starlight/util/ImageUtils.java b/src/main/java/com/starlight/util/ImageUtils.java
index 5f5752f..698648a 100644
--- a/src/main/java/com/starlight/util/ImageUtils.java
+++ b/src/main/java/com/starlight/util/ImageUtils.java
@@ -83,60 +83,86 @@ public static void scaleToFit(ImageView imageView, double frameWidth, double fra
      * @param fallbackPath the classpath-relative path to a fallback image
      */
     public static void loadImage(ImageView imageView, String path, String fallbackPath) {
-        // Use FileSystemManager to resolve the image path
-        Path resolvedPath = FileSystemManager.resolveImagePath(path);
+        Image imageToLoad = tryLoadImageFromPath(path);
         
-        Image imageToLoad = null;
-        if (resolvedPath != null) {
-            // Check if it's a special resource marker
-            if (resolvedPath.toString().startsWith("resource:")) {
-                String resourcePath = resolvedPath.toString().substring("resource:".length());
-                URL resource = ImageUtils.class.getResource(resourcePath);
-                if (resource != null) {
-                    imageToLoad = new Image(resource.toExternalForm());
-                }
-            } else {
-                // Treat as a file path
-                File file = resolvedPath.toFile();
-                if (file.exists()) {
-                    imageToLoad = new Image(file.toURI().toString());
-                }
-            }
-        }
-
-        // If the image failed to load, try the fallback
         if (imageToLoad == null && fallbackPath != null) {
-            Path resolvedFallbackPath = FileSystemManager.resolveImagePath(fallbackPath);
-            if (resolvedFallbackPath != null) {
-                if (resolvedFallbackPath.toString().startsWith("resource:")) {
-                    String resourcePath = resolvedFallbackPath.toString().substring("resource:".length());
-                    URL fallbackResource = ImageUtils.class.getResource(resourcePath);
-                    if (fallbackResource != null) {
-                        imageToLoad = new Image(fallbackResource.toExternalForm());
-                    }
-                } else {
-                    File fallbackFile = resolvedFallbackPath.toFile();
-                    if (fallbackFile.exists()) {
-                        imageToLoad = new Image(fallbackFile.toURI().toString());
-                    }
-                }
-            }
+            imageToLoad = tryLoadImageFromPath(fallbackPath);
         }
         
-        // Final fallback - try to use FileSystemManager's fallback system
         if (imageToLoad == null) {
-            String defaultFallback = FileSystemManager.getFallbackImagePath("default");
-            if (defaultFallback != null) {
-                File defaultFile = new File(defaultFallback);
-                if (defaultFile.exists()) {
-                    imageToLoad = new Image(defaultFile.toURI().toString());
-                }
-            }
+            imageToLoad = loadDefaultFallbackImage();
         }
         
         imageView.setImage(imageToLoad);
     }
 
+    /**
+     * Attempts to load an image from the given path.
+     * 
+     * @param path the path to load the image from
+     * @return the loaded Image, or null if loading failed
+     */
+    private static Image tryLoadImageFromPath(String path) {
+        Path resolvedPath = FileSystemManager.resolveImagePath(path);
+        if (resolvedPath == null) {
+            return null;
+        }
+        
+        if (isResourcePath(resolvedPath)) {
+            return loadImageFromResource(resolvedPath);
+        } else {
+            return loadImageFromFile(resolvedPath);
+        }
+    }
+    
+    /**
+     * Checks if the resolved path is a resource path.
+     * 
+     * @param resolvedPath the path to check
+     * @return true if it's a resource path, false otherwise
+     */
+    private static boolean isResourcePath(Path resolvedPath) {
+        return resolvedPath.toString().startsWith("resource:");
+    }
+    
+    /**
+     * Loads an image from a resource path.
+     * 
+     * @param resolvedPath the resource path
+     * @return the loaded Image, or null if loading failed
+     */
+    private static Image loadImageFromResource(Path resolvedPath) {
+        String resourcePath = resolvedPath.toString().substring("resource:".length());
+        URL resource = ImageUtils.class.getResource(resourcePath);
+        return resource != null ? new Image(resource.toExternalForm()) : null;
+    }
+    
+    /**
+     * Loads an image from a file path.
+     * 
+     * @param resolvedPath the file path
+     * @return the loaded Image, or null if loading failed
+     */
+    private static Image loadImageFromFile(Path resolvedPath) {
+        File file = resolvedPath.toFile();
+        return file.exists() ? new Image(file.toURI().toString()) : null;
+    }
+    
+    /**
+     * Loads the default fallback image from the system.
+     * 
+     * @return the default fallback Image, or null if loading failed
+     */
+    private static Image loadDefaultFallbackImage() {
+        String defaultFallback = FileSystemManager.getFallbackImagePath("default");
+        if (defaultFallback == null) {
+            return null;
+        }
+        
+        File defaultFile = new File(defaultFallback);
+        return defaultFile.exists() ? new Image(defaultFile.toURI().toString()) : null;
+    }
+
     /**
      * Loads an image from a given path into an ImageView with a default fallback.
      * Convenience method that uses the default missing image as the fallback.
diff --git a/src/test/java/com/starlight/model/PostDataRepositoryTest.java b/src/test/java/com/starlight/model/PostDataRepositoryTest.java
index 1630bf5..93dc030 100644
--- a/src/test/java/com/starlight/model/PostDataRepositoryTest.java
+++ b/src/test/java/com/starlight/model/PostDataRepositoryTest.java
@@ -36,16 +36,16 @@ void tearDown() throws IOException {
     void testSaveAndLoadPosts() {
         List<Post> posts = new ArrayList<>();
         Post p = new Post();
-        p.title = "Sample";
-        p.description = "Desc";
-        p.ingredients = "ing";
-        p.directions = "dir";
-        p.image = "img";
-        p.rating = "5";
-        p.uploadtime = "now";
-    p.setLikecount("0");
-    p.setCommentcount("0");
-    p.setIsLiked("false");
+        p.setTitle("Sample");
+        p.setDescription("Desc");
+        p.setIngredients("ing");
+        p.setDirections("dir");
+        p.setImage("img");
+        p.setRating("5");
+        p.setUploadtime("now");
+        p.setLikecount("0");
+        p.setCommentcount("0");
+        p.setIsLiked("false");
         posts.add(p);
 
         repository.savePosts(posts);
@@ -54,15 +54,15 @@ void testSaveAndLoadPosts() {
         List<Post> loaded = repository.loadPosts();
         assertEquals(1, loaded.size());
         Post lp = loaded.get(0);
-        assertEquals(p.title, lp.title);
-        assertEquals(p.description, lp.description);
-        assertEquals(p.ingredients, lp.ingredients);
-        assertEquals(p.directions, lp.directions);
-        assertEquals(p.image, lp.image);
-        assertEquals(p.rating, lp.rating);
-        assertEquals(p.uploadtime, lp.uploadtime);
-    assertEquals(p.getLikecount(), lp.getLikecount());
-    assertEquals(p.getCommentcount(), lp.getCommentcount());
+        assertEquals(p.getTitle(), lp.getTitle());
+        assertEquals(p.getDescription(), lp.getDescription());
+        assertEquals(p.getIngredients(), lp.getIngredients());
+        assertEquals(p.getDirections(), lp.getDirections());
+        assertEquals(p.getImage(), lp.getImage());
+        assertEquals(p.getRating(), lp.getRating());
+        assertEquals(p.getUploadtime(), lp.getUploadtime());
+        assertEquals(p.getLikecount(), lp.getLikecount());
+        assertEquals(p.getCommentcount(), lp.getCommentcount());
     assertEquals(p.getIsLiked(), lp.getIsLiked());
     }
 }

From f3f8776f643eb4302eacbe232045d4579cf522e4 Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 08:00:32 +0700
Subject: [PATCH 7/9] Refactor: PostController and related classes are improved
 in readability and maintainability

- Consolidated duplicated string literals into constants in PostController.
- Introduced dedicated exception for nutrition analysis retries.
- Refactored UI update methods in PostController for clarity and separation of concerns.
- Simplified nutrition facts population logic and added helper methods for better structure.
- Updated logging to use lambda expressions for deferred message construction.
- Enhanced error handling in ChatHistoryManager and FileSystemManager with clearer logging.
- Refactored image path resolution logic in FileSystemManager to reduce complexity.
- Improved fallback image handling and logging consistency across the application.
- Updated PostItemController and RecipeItemController to use a unified method for opening posts.
---
 .../controller/CreatePostController.java      | 502 ++++++++----------
 .../starlight/controller/MainController.java  | 171 +++---
 .../starlight/controller/PostController.java  | 421 ++++++---------
 .../controller/PostItemController.java        |   3 +-
 .../controller/RecipeItemController.java      |   3 +-
 .../starlight/util/ChatHistoryManager.java    |  40 +-
 .../com/starlight/util/FileSystemManager.java | 190 +++----
 7 files changed, 602 insertions(+), 728 deletions(-)

diff --git a/src/main/java/com/starlight/controller/CreatePostController.java b/src/main/java/com/starlight/controller/CreatePostController.java
index a856e96..5b38435 100644
--- a/src/main/java/com/starlight/controller/CreatePostController.java
+++ b/src/main/java/com/starlight/controller/CreatePostController.java
@@ -71,6 +71,8 @@ public class CreatePostController implements Initializable {
     private final PostDataRepository repository = new PostDataRepository();
     private final ChatbotAPI chatbotAPI = new ChatbotAPI();
     private final NutritionParser nutritionParser = new NutritionParser();
+    private static final int MAX_RETRIES = 3;
+    private static final int RETRY_DELAY_MS = 2000;
 
     private MainController mainController;
 
@@ -204,263 +206,229 @@ private String copyImageToUserDir(File image) {
      */
     private void showProcessingAndAnalyzeNutrition(Post newPost, String ingredients) {
         try {
-            // Create and show processing dialog as a modal popup
-            FXMLLoader loader = new FXMLLoader(getClass().getResource("/com/starlight/view/processingDialog.fxml"));
-            Parent root = loader.load();
-            
-            ProcessingDialogController processingController = loader.getController();
-            
-            Stage dialogStage = new Stage();
-            dialogStage.setTitle("Creating Post");
-            dialogStage.initModality(Modality.APPLICATION_MODAL);
-            dialogStage.setScene(new Scene(root));
-            dialogStage.setResizable(false);
-            
-            // Set the stage reference in the controller
-            processingController.setDialogStage(dialogStage);
-            
-            // Center the dialog
-            dialogStage.centerOnScreen();
-            
-            // Show the dialog (non-blocking)
-            dialogStage.show();
-            
-            // Create background task for AI analysis
-            Task<Void> analysisTask = new Task<Void>() {
-                @Override
-                protected Void call() throws Exception {
-                    final int MAX_RETRIES = 3;
-                    int attempt = 0;
-                    Exception lastException = null;
-                    boolean isApiKeyIssue = false;
-                    boolean isNetworkIssue = false;
-                    
-                    while (attempt < MAX_RETRIES) {
-                        attempt++;
-                        final int currentAttempt = attempt; // Final copy for lambda use
-                        
-                        try {
-                            if (logger.isLoggable(Level.INFO)) {
-                                logger.info(java.text.MessageFormat.format(
-                                    "Analyzing nutrition facts for ingredients (attempt {0}/{1}): {2}",
-                                    currentAttempt, MAX_RETRIES, ingredients));
-                            }
-                            
-                            // Update status on UI thread
-                            Platform.runLater(() -> {
-                                try {
-                                    if (currentAttempt == 1) {
-                                        processingController.updateStatus("Analyzing nutrition facts...");
-                                    } else {
-                                        processingController.updateStatus("Analyzing nutrition facts... (retry " + currentAttempt + "/" + MAX_RETRIES + ")");
-                                    }
-                                } catch (Exception e) {
-                                    logger.log(Level.WARNING, "Failed to update processing status: " + e.getMessage());
-                                }
-                            });
-                            
-                            String nutritionResponse = chatbotAPI.analyzeNutritionFacts(ingredients);
-                            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(nutritionResponse));
-                            
-            // Check if we got valid nutrition data
-            if (newPost.getNutrition() != null && newPost.getNutrition().getIngredient() != null && !newPost.getNutrition().getIngredient().isEmpty()) {
-                logger.info(java.text.MessageFormat.format(
-                    "Nutrition analysis completed successfully on attempt {0}", currentAttempt));
-                
-                // Update status to show success  
-                Platform.runLater(() -> {
-                    processingController.updateStatus("Nutrition analysis completed successfully!");
-                });
-                
-                return null; // Success - exit the retry loop
-            } else {
-                throw new Exception("Received empty or invalid nutrition data from AI");
-            }                        } catch (Exception e) {
-                            lastException = e;
-                            String errorMessage = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
-                            
-                            // Detect specific error types
-                            if (errorMessage.contains("api key") || errorMessage.contains("configure your openai api key")) {
-                                isApiKeyIssue = true;
-                                logger.log(Level.WARNING, "API Key issue detected: {0}", new Object[]{e.getMessage()});
-                                logger.log(Level.WARNING, EXCEPTION_DETAILS, e);
-                                break; // No point retrying API key issues
-                            } else if (errorMessage.contains("network") || errorMessage.contains("connection") || 
-                                     errorMessage.contains("timeout") || errorMessage.contains("unreachable") ||
-                                     errorMessage.contains("failed to get response")) {
-                                isNetworkIssue = true;
-                                logger.log(Level.WARNING, "Network issue detected on attempt {0}: {1}", 
-                                          new Object[]{currentAttempt, e.getMessage()});
-                                logger.log(Level.WARNING, EXCEPTION_DETAILS, e);
-                            } else {
-                                logger.log(Level.WARNING, "Nutrition analysis attempt {0} failed: {1}", 
-                                          new Object[]{currentAttempt, e.getMessage()});
-                                logger.log(Level.WARNING, EXCEPTION_DETAILS, e);
-                            }
-                            
-                            if (currentAttempt < MAX_RETRIES && !isApiKeyIssue) {
-                                // Wait a bit before retrying (unless it's an API key issue)
-                                Platform.runLater(() -> {
-                                    try {
-                                        processingController.updateStatus("Analysis failed, retrying... (" + (currentAttempt + 1) + "/" + MAX_RETRIES + ")");
-                                    } catch (Exception ex) {
-                                        logger.log(Level.WARNING, "Failed to update retry status: " + ex.getMessage());
-                                    }
-                                });
-                                
-                                try {
-                                    Thread.sleep(2000); // Wait 2 seconds before retry
-                                } catch (InterruptedException ie) {
-                                    Thread.currentThread().interrupt();
-                                    throw new Exception("Analysis interrupted", ie);
-                                }
-                            }
-                        }
-                    }
-                    
-                    // All retries failed or specific issue detected
-                    final boolean finalIsApiKeyIssue = isApiKeyIssue;
-                    final boolean finalIsNetworkIssue = isNetworkIssue;
-                    final Exception finalException = lastException;
-                    
-                    Platform.runLater(() -> {
-                        try {
-                            if (finalIsApiKeyIssue) {
-                                logger.log(Level.WARNING, "Skipping nutrition analysis - API key not configured");
-                                processingController.updateStatus("API key not configured. Using default values...");
-                                showPopupDialog("apikey");
-                            } else if (finalIsNetworkIssue) {
-                                logger.log(Level.WARNING, "Skipping nutrition analysis - network issues detected");
-                                processingController.updateStatus("Network issues detected. Using default values...");
-                                showPopupDialog("network");
-                            } else {
-                                logger.log(Level.SEVERE, "All " + MAX_RETRIES + " nutrition analysis attempts failed. Last error: " + 
-                                          (finalException != null ? finalException.getMessage() : "Unknown error"));
-                                processingController.updateStatus("Nutrition analysis failed. Using default values...");
-                                showPopupDialog("analysis_failed");
-                            }
-                        } catch (Exception e) {
-                            logger.log(Level.WARNING, "Failed to update error status or show warning: " + e.getMessage());
-                        }
-                    });
-                    
-                // Use fallback nutrition data
-                    newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null)); // Creates fallback nutrition
-                    
-                    return null;
-                }
-                
-                @Override
-                protected void succeeded() {
-                    Platform.runLater(() -> {
-                        try {
-                            // Update final status
-                            processingController.updateStatus("Saving post...");
-                            
-                            // Save the new post
-                            List<Post> posts = repository.loadPosts();
-                            posts.add(0, newPost);
-                            repository.savePosts(posts);
-                            
-                            success = true;
-                            logger.info("Post created and saved successfully");
-                            
-                            // Close the processing dialog
-                            processingController.closeDialog();
-                            
-                            // Show success popup
-                            showResultDialog("post_created_success");
-                            
-                            // Refresh the community page instead of navigating away
-                            if (mainController != null) {
-                                mainController.refreshCommunityPage();
-                            }
-                            
-                        } catch (Exception e) {
-                            logger.log(Level.SEVERE, "Failed to save post or refresh community page: " + e.getMessage(), e);
-                            
-                            // Close dialog and show failure message
-                            try {
-                                processingController.closeDialog();
-                                showResultDialog("post_creation_failed");
-                                if (mainController != null) {
-                                    mainController.refreshCommunityPage();
-                                }
-                            } catch (Exception fallbackEx) {
-                                logger.log(Level.SEVERE, "Fallback navigation failed: " + fallbackEx.getMessage(), fallbackEx);
-                            }
-                        }
-                    });
-                }
-                
-                @Override
-                protected void failed() {
-                    Platform.runLater(() -> {
-                        logger.log(Level.SEVERE, "Nutrition analysis task failed completely", getException());
-                        
-                        // Still try to save post without nutrition data
-                        try {
-                            processingController.updateStatus("Saving post with default values...");
-                            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null)); // Creates fallback nutrition
-                            List<Post> posts = repository.loadPosts();
-                            posts.add(0, newPost);
-                            repository.savePosts(posts);
-                            success = true;
-                            
-                            // Close the processing dialog
-                            processingController.closeDialog();
-                            
-                            // Show success popup (post was still created)
-                            showResultDialog("post_created_success");
-                            
-                            // Refresh the community page
-                            if (mainController != null) {
-                                mainController.refreshCommunityPage();
-                            }
-                        } catch (Exception e) {
-                            logger.log(Level.SEVERE, "Failed to save post: " + e.getMessage(), e);
-                            
-                            // Close the processing dialog and show failure message
-                            try {
-                                processingController.closeDialog();
-                                showResultDialog("post_creation_failed");
-                                if (mainController != null) {
-                                    mainController.refreshCommunityPage();
-                                }
-                            } catch (Exception ex) {
-                                logger.log(Level.SEVERE, "Failed to close dialog or refresh community page: " + ex.getMessage(), ex);
-                            }
-                        }
-                    });
-                }
-            };
-            
-            // Start the task in a background thread
-            Thread analysisThread = new Thread(analysisTask);
-            analysisThread.setDaemon(true);
-            analysisThread.start();
-            
+            ProcessingDialogController processingController = createAndShowProcessingDialog();
+            startNutritionAnalysis(newPost, ingredients, processingController);
         } catch (Exception e) {
             logger.log(Level.SEVERE, "Failed to show processing screen: {0}", new Object[]{e.getMessage()});
             logger.log(Level.SEVERE, EXCEPTION_DETAILS, e);
-            
-            // Fallback: try to save post and navigate directly
-            try {
-                newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null)); // Creates fallback nutrition
-                List<Post> posts = repository.loadPosts();
-                posts.add(0, newPost);
-                repository.savePosts(posts);
-                success = true;
-                if (mainController != null) {
-                    mainController.refreshCommunityPage();
-                }
-            } catch (Exception fallbackEx) {
-                logger.log(Level.SEVERE, "Fallback save and navigation failed: {0}", new Object[]{fallbackEx.getMessage()});
-                logger.log(Level.SEVERE, EXCEPTION_DETAILS, fallbackEx);
+            fallbackSavePost(newPost);
+        }
+    }
+
+    private ProcessingDialogController createAndShowProcessingDialog() throws Exception {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/com/starlight/view/processingDialog.fxml"));
+        Parent root = loader.load();
+        ProcessingDialogController controller = loader.getController();
+        Stage dialogStage = new Stage();
+        dialogStage.setTitle("Creating Post");
+        dialogStage.initModality(Modality.APPLICATION_MODAL);
+        dialogStage.setScene(new Scene(root));
+        dialogStage.setResizable(false);
+        controller.setDialogStage(dialogStage);
+        dialogStage.centerOnScreen();
+        dialogStage.show();
+        return controller;
+    }
+
+    private void startNutritionAnalysis(Post newPost, String ingredients, ProcessingDialogController processingController) {
+        Task<Void> analysisTask = new Task<>() {
+            @Override
+            protected Void call() {
+                AnalysisOutcome outcome = performNutritionAnalysisWithRetries(newPost, ingredients, processingController);
+                handlePostAnalysisOutcome(outcome, newPost, processingController);
+                return null;
+            }
+
+            @Override
+            protected void succeeded() {
+                Platform.runLater(() -> finalizeSuccessfulPostCreation(newPost, processingController));
+            }
+
+            @Override
+            protected void failed() {
+                Platform.runLater(() -> finalizeFailedAnalysis(newPost, processingController, getException()));
+            }
+        };
+        Thread analysisThread = new Thread(analysisTask);
+        analysisThread.setDaemon(true);
+        analysisThread.start();
+    }
+
+    private AnalysisOutcome performNutritionAnalysisWithRetries(Post newPost, String ingredients, ProcessingDialogController processingController) {
+        Exception lastException = null;
+        for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+            AnalysisOutcome outcome = attemptNutritionAnalysisAttempt(newPost, ingredients, processingController, attempt);
+            if (outcome.type == AnalysisOutcome.Type.SUCCESS) return outcome;
+            if (outcome.type == AnalysisOutcome.Type.API_KEY || outcome.type == AnalysisOutcome.Type.NETWORK || attempt == MAX_RETRIES) {
+                return outcome;
             }
+            lastException = outcome.exception;
+            scheduleRetryStatusUpdate(processingController, attempt + 1);
+            sleepQuietly(RETRY_DELAY_MS);
         }
+        return AnalysisOutcome.failure(lastException);
     }
-    
+
+    private AnalysisOutcome attemptNutritionAnalysisAttempt(Post newPost, String ingredients, ProcessingDialogController controller, int attempt) {
+        try {
+            logInfo("Analyzing nutrition facts for ingredients (attempt {0}/{1}): {2}", attempt, MAX_RETRIES, ingredients);
+            updateStatus(controller, attempt == 1 ? "Analyzing nutrition facts..." : java.text.MessageFormat.format("Analyzing nutrition facts... (retry {0}/{1})", attempt, MAX_RETRIES));
+            String response = chatbotAPI.analyzeNutritionFacts(ingredients);
+            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(response));
+            if (hasValidNutrition(newPost)) {
+                logInfo("Nutrition analysis completed successfully on attempt {0}", attempt);
+                updateStatus(controller, "Nutrition analysis completed successfully!");
+                return AnalysisOutcome.success();
+            }
+            throw new InvalidNutritionDataException("Empty or invalid nutrition data");
+        } catch (Exception e) {
+            String msg = e.getMessage() != null ? e.getMessage().toLowerCase() : "";
+            if (isApiKeyIssue(msg)) return AnalysisOutcome.apiKeyIssue(e);
+            if (isNetworkIssue(msg)) return AnalysisOutcome.networkIssue(e);
+            return AnalysisOutcome.failure(e);
+        }
+    }
+
+    private void handlePostAnalysisOutcome(AnalysisOutcome outcome, Post newPost, ProcessingDialogController controller) {
+        if (outcome.type == AnalysisOutcome.Type.SUCCESS) {
+            return;
+        }
+        Platform.runLater(() -> {
+            switch (outcome.type) {
+                case API_KEY:
+                    logWarn("Skipping nutrition analysis - API key not configured");
+                    controller.updateStatus("API key not configured. Using default values...");
+                    showPopupDialog(POPUP_APIKEY);
+                    break;
+                case NETWORK:
+                    logWarn("Skipping nutrition analysis - network issues detected");
+                    controller.updateStatus("Network issues detected. Using default values...");
+                    showPopupDialog(POPUP_NETWORK);
+                    break;
+                case FAILURE:
+                    logSevere("All nutrition analysis attempts failed. Last error: {0}", outcome.exception != null ? outcome.exception.getMessage() : "Unknown");
+                    controller.updateStatus("Nutrition analysis failed. Using default values...");
+                    showPopupDialog(POPUP_ANALYSIS_FAILED);
+                    break;
+                case SUCCESS:
+                default:
+                    break; // no action
+            }
+            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null));
+        });
+    }
+
+    private boolean hasValidNutrition(Post post) {
+        return post.getNutrition() != null && post.getNutrition().getIngredient() != null && !post.getNutrition().getIngredient().isEmpty();
+    }
+
+    private boolean isApiKeyIssue(String msg) {
+        return msg.contains("api key") || msg.contains("configure your openai api key");
+    }
+
+    private boolean isNetworkIssue(String msg) {
+    return msg.contains(POPUP_NETWORK) || msg.contains("connection") || msg.contains("timeout") || msg.contains("unreachable") || msg.contains("failed to get response");
+    }
+
+    private void scheduleRetryStatusUpdate(ProcessingDialogController controller, int nextAttempt) {
+        Platform.runLater(() -> updateStatus(controller, java.text.MessageFormat.format("Analysis failed, retrying... ({0}/{1})", nextAttempt, MAX_RETRIES)));
+    }
+
+    private void sleepQuietly(int ms) {
+        try { Thread.sleep(ms); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); }
+    }
+
+    private void finalizeSuccessfulPostCreation(Post newPost, ProcessingDialogController controller) {
+        try {
+            updateStatus(controller, "Saving post...");
+            saveNewPost(newPost);
+            success = true;
+            controller.closeDialog();
+            showResultDialog(RESULT_POST_CREATED_SUCCESS);
+            refreshCommunity();
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, () -> "Failed to save post or refresh community page: " + e.getMessage());
+            logger.log(Level.SEVERE, EXCEPTION_DETAILS, e);
+            handleFinalizeFailure(controller);
+        }
+    }
+
+    private void finalizeFailedAnalysis(Post newPost, ProcessingDialogController controller, Throwable error) {
+        logger.log(Level.SEVERE, "Nutrition analysis task failed completely", error);
+        try {
+            updateStatus(controller, "Saving post with default values...");
+            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null));
+            saveNewPost(newPost);
+            success = true;
+            controller.closeDialog();
+            showResultDialog(RESULT_POST_CREATED_SUCCESS);
+            refreshCommunity();
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, () -> "Failed to save post: " + e.getMessage());
+            logger.log(Level.SEVERE, EXCEPTION_DETAILS, e);
+            handleFinalizeFailure(controller);
+        }
+    }
+
+    private void handleFinalizeFailure(ProcessingDialogController controller) {
+        try {
+            controller.closeDialog();
+            showResultDialog(RESULT_POST_CREATION_FAILED);
+            refreshCommunity();
+        } catch (Exception fallbackEx) {
+            logger.log(Level.SEVERE, () -> "Fallback navigation failed: " + fallbackEx.getMessage());
+        }
+    }
+
+    private void saveNewPost(Post post) {
+        List<Post> posts = repository.loadPosts();
+        posts.add(0, post);
+        repository.savePosts(posts);
+    }
+
+    private void refreshCommunity() {
+        if (mainController != null) {
+            mainController.refreshCommunityPage();
+        }
+    }
+
+    private void fallbackSavePost(Post newPost) {
+        try {
+            newPost.setNutrition(nutritionParser.parseNutritionFromResponse(null));
+            saveNewPost(newPost);
+            success = true;
+            refreshCommunity();
+        } catch (Exception fallbackEx) {
+            logger.log(Level.SEVERE, () -> "Fallback save and navigation failed: " + fallbackEx.getMessage());
+            logger.log(Level.SEVERE, EXCEPTION_DETAILS, fallbackEx);
+        }
+    }
+
+    private void logWarn(String pattern, Object... args) { if (logger.isLoggable(Level.WARNING)) logger.log(Level.WARNING, java.text.MessageFormat.format(pattern, args)); }
+    private void logSevere(String pattern, Object... args) { if (logger.isLoggable(Level.SEVERE)) logger.log(Level.SEVERE, java.text.MessageFormat.format(pattern, args)); }
+    private void logInfo(String pattern, Object... args) { if (logger.isLoggable(Level.INFO)) logger.log(Level.INFO, java.text.MessageFormat.format(pattern, args)); }
+
+    private void updateStatus(ProcessingDialogController controller, String message) {
+        try { controller.updateStatus(message); } catch (Exception ignored) { /* dialog may be closed */ }
+    }
+
+    private static class AnalysisOutcome {
+        enum Type { SUCCESS, API_KEY, NETWORK, FAILURE }
+        final Type type;
+        final Exception exception;
+        private AnalysisOutcome(Type type, Exception exception) { this.type = type; this.exception = exception; }
+        static AnalysisOutcome success() { return new AnalysisOutcome(Type.SUCCESS, null); }
+        static AnalysisOutcome apiKeyIssue(Exception e) { return new AnalysisOutcome(Type.API_KEY, e); }
+        static AnalysisOutcome networkIssue(Exception e) { return new AnalysisOutcome(Type.NETWORK, e); }
+        static AnalysisOutcome failure(Exception e) { return new AnalysisOutcome(Type.FAILURE, e); }
+    }
+    private static class InvalidNutritionDataException extends Exception { InvalidNutritionDataException(String msg) { super(msg); } }
+    private static final String POPUP_APIKEY = "apikey";
+    private static final String POPUP_NETWORK = "network";
+    private static final String POPUP_ANALYSIS_FAILED = "analysis_failed";
+    private static final String RESULT_POST_CREATED_SUCCESS = "post_created_success";
+    private static final String RESULT_POST_CREATION_FAILED = "post_creation_failed";
+    private static final String RESULT_NUTRITION_ANALYSIS_SUCCESS = "nutrition_analysis_success";
     /**
      * Shows a popup dialog for nutrition analysis issues
      */
@@ -473,18 +441,10 @@ private void showPopupDialog(String warningType) {
             
             // Set appropriate warning message based on type
             switch (warningType) {
-                case "apikey":
-                    controller.setApiKeyWarning();
-                    break;
-                case "network":
-                    controller.setNetworkWarning();
-                    break;
-                case "analysis_failed":
-                    controller.setAnalysisFailedWarning();
-                    break;
-                default:
-                    controller.setMessage("An error occurred during nutrition analysis. Using default values.");
-                    break;
+                case POPUP_APIKEY -> controller.setApiKeyWarning();
+                case POPUP_NETWORK -> controller.setNetworkWarning();
+                case POPUP_ANALYSIS_FAILED -> controller.setAnalysisFailedWarning();
+                default -> controller.setMessage("An error occurred during nutrition analysis. Using default values.");
             }
             
             Stage dialogStage = new Stage();
@@ -519,18 +479,10 @@ private void showResultDialog(String resultType) {
             
             // Set appropriate message based on result type
             switch (resultType) {
-                case "post_created_success":
-                    controller.setPostCreatedSuccess();
-                    break;
-                case "post_creation_failed":
-                    controller.setPostCreationFailed();
-                    break;
-                case "nutrition_analysis_success":
-                    controller.setNutritionAnalysisSuccess();
-                    break;
-                default:
-                    controller.setMessage("Operation completed.");
-                    break;
+                case RESULT_POST_CREATED_SUCCESS -> controller.setPostCreatedSuccess();
+                case RESULT_POST_CREATION_FAILED -> controller.setPostCreationFailed();
+                case RESULT_NUTRITION_ANALYSIS_SUCCESS -> controller.setNutritionAnalysisSuccess();
+                default -> controller.setMessage("Operation completed.");
             }
             
             Stage dialogStage = new Stage();
diff --git a/src/main/java/com/starlight/controller/MainController.java b/src/main/java/com/starlight/controller/MainController.java
index d317ab4..37787ea 100644
--- a/src/main/java/com/starlight/controller/MainController.java
+++ b/src/main/java/com/starlight/controller/MainController.java
@@ -6,6 +6,7 @@
 import java.util.logging.Logger;
 
 import com.starlight.model.Post;
+import java.util.function.Consumer;
 import com.starlight.util.Session;
 
 import io.github.palexdev.materialfx.controls.MFXButton;
@@ -75,9 +76,8 @@ public class MainController implements Initializable {
     private NavbarController navbarController;
     
     private MFXButton currentActiveButton;
-    
-    private Post currentPost; // Current post for navigation to post view
-    
+    // PostController setup handled via openPost initializer when needed
+
     @FXML
     private BorderPane bp;
     
@@ -117,42 +117,42 @@ void home(MouseEvent event) {
     /** Handles navigation to the achievement view. */
     @FXML
     void achievement(MouseEvent event) {
-        loadPage("underDevelopment");
+    loadPage(PAGE_UNDER_DEVELOPMENT);
         selected(achievement);
     }
 
     /** Handles navigation to the community view. */
     @FXML
     void community(MouseEvent event) {
-        loadPage("community");
+    loadPage(PAGE_COMMUNITY);
         selected(community);
     }
 
     /** Handles navigation to the consult view. */
     @FXML
     void consult(MouseEvent event) {
-        loadPage("consult");
+        loadPage(PAGE_CONSULT);
         selected(consult);
     }
 
     /** Handles navigation to the games view. */
     @FXML
     void games(MouseEvent event) {
-        loadPage("underDevelopment");
+        loadPage(PAGE_UNDER_DEVELOPMENT);
         selected(games);
     }
 
     /** Handles navigation to the mission view. */
     @FXML
     void mission(MouseEvent event) {
-        loadPage("underDevelopment");
+    loadPage(PAGE_UNDER_DEVELOPMENT);
         selected(mission);
     }
 
     /** Handles navigation to the wiki view. */
     @FXML
     void wiki(MouseEvent event) {
-        loadPage("underDevelopment");
+    loadPage(PAGE_UNDER_DEVELOPMENT);
         selected(wiki);
     }
 
@@ -160,7 +160,7 @@ void wiki(MouseEvent event) {
     @FXML
     void recipeManager(MouseEvent event) {
         // This should only be called if button is visible (admin user logged in)
-        loadPage("recipeManager");
+    loadPage(PAGE_RECIPE_MANAGER);
         selected(recipeManager);
     }
 
@@ -168,7 +168,7 @@ void recipeManager(MouseEvent event) {
     @FXML
     void userManager(MouseEvent event) {
         // This should only be called if button is visible (admin user logged in)
-        loadPage("userManager");
+    loadPage(PAGE_USER_MANAGER);
         selected(userManager);
     }
     
@@ -224,7 +224,7 @@ public void refreshNavigationState() {
      */
     public void refreshCommunityPage() {
         if (bp.getCenter() != null) {
-            Object controller = bp.getCenter().getProperties().get("controller");
+            Object controller = bp.getCenter().getProperties().get(PROP_CONTROLLER);
             if (controller instanceof CommunityController) {
                 ((CommunityController) controller).refreshPosts();
             }
@@ -234,55 +234,31 @@ public void refreshCommunityPage() {
     /**
      * Loads the given FXML page into the grid pane container.
     */
-    void loadPage(String page) {
+    private static final String PAGE_UNDER_DEVELOPMENT = "underDevelopment";
+    private static final String PAGE_COMMUNITY = "community";
+    private static final String PAGE_CONSULT = "consult";
+    private static final String PAGE_RECIPE_MANAGER = "recipeManager";
+    private static final String PAGE_USER_MANAGER = "userManager";
+    private static final String PROP_CONTROLLER = "controller";
+    private static final String STYLE_ACTIVE = "button-active";
+    private static final String STYLE_SIDEBAR = "button-sidebar";
+
+    void loadPage(String page) { loadPage(page, null); }
+
+    private void loadPage(String page, Consumer<Object> controllerInitializer) {
         String fxmlPath = "/com/starlight/view/" + page + ".fxml";
 
         try {
-            // Show the loading screen inside the main grid pane while loading
-            Parent loadingRoot = FXMLLoader.load(getClass().getResource("/com/starlight/view/loading.fxml"));
-            gp.getChildren().removeIf(node ->
-                GridPane.getColumnIndex(node) != null && GridPane.getRowIndex(node) != null &&
-                GridPane.getColumnIndex(node) == 0 && GridPane.getRowIndex(node) == 1
-            );
-            gp.add(loadingRoot, 0, 1);
-            GridPane.setValignment(loadingRoot, VPos.CENTER);
-            GridPane.setHalignment(loadingRoot, HPos.CENTER);
-
-            Task<Parent> task = new Task<>() {
-            @Override
-            protected Parent call() throws Exception {
-                FXMLLoader loader = new FXMLLoader(getClass().getResource(fxmlPath));
-                Parent root = loader.load();
-                
-                // Get the controller and pass user data if applicable
-                Object controller = loader.getController();
-                if (controller instanceof EditProfileController) {
-                    ((EditProfileController) controller).setUser(
-                        Session.getCurrentUser()
-                    );
-                }
-                if (controller instanceof CommunityController) {
-                    ((CommunityController) controller).setMainController(MainController.this);
-                }
-                if (controller instanceof ProfileController) {
-                    ((ProfileController) controller).setMainController(MainController.this);
-                }
-                if (controller instanceof PostController) {
-                    PostController postController = (PostController) controller;
-                    postController.setPost(currentPost); 
-                    postController.setMainController(MainController.this);
-                }
-                if (controller instanceof SettingController) {
-                    ((SettingController) controller).setMainController(MainController.this);
-                }
-                
-                return root;
-            }
-        };
+            Parent loadingRoot = showLoadingScreen();
+            Task<Parent> task = createLoadTask(fxmlPath);
 
             task.setOnSucceeded(ev -> {
                 Parent root = task.getValue();
-                root.getProperties().put("controller", task.getValue().getProperties().get("controller"));
+                root.getProperties().put(PROP_CONTROLLER, task.getValue().getProperties().get(PROP_CONTROLLER));
+                if (controllerInitializer != null) {
+                    Object ctrl = loaderController(root);
+                    if (ctrl != null) controllerInitializer.accept(ctrl);
+                }
                 gp.getChildren().remove(loadingRoot);
                 gp.getChildren().removeIf(node ->
                     GridPane.getColumnIndex(node) != null && GridPane.getRowIndex(node) != null &&
@@ -295,8 +271,7 @@ protected Parent call() throws Exception {
 
             task.setOnFailed(ev -> {
                 gp.getChildren().remove(loadingRoot);
-                Logger.getLogger(MainController.class.getName()).log(Level.SEVERE,
-                        "Failed to load FXML page: " + fxmlPath, task.getException());
+                Logger.getLogger(MainController.class.getName()).log(Level.SEVERE, "Failed to load FXML page: " + fxmlPath, task.getException());
             });
 
             new Thread(task).start();
@@ -306,6 +281,38 @@ protected Parent call() throws Exception {
         }
     }
 
+    private Parent showLoadingScreen() throws IOException {
+        Parent loadingRoot = FXMLLoader.load(getClass().getResource("/com/starlight/view/loading.fxml"));
+        gp.getChildren().removeIf(node ->
+            GridPane.getColumnIndex(node) != null && GridPane.getRowIndex(node) != null &&
+            GridPane.getColumnIndex(node) == 0 && GridPane.getRowIndex(node) == 1
+        );
+        gp.add(loadingRoot, 0, 1);
+        GridPane.setValignment(loadingRoot, VPos.CENTER);
+        GridPane.setHalignment(loadingRoot, HPos.CENTER);
+        return loadingRoot;
+    }
+
+    private Task<Parent> createLoadTask(String fxmlPath) {
+        return new Task<>() {
+            @Override
+            protected Parent call() throws Exception {
+                FXMLLoader loader = new FXMLLoader(getClass().getResource(fxmlPath));
+                Parent root = loader.load();
+                Object controller = loader.getController();
+                configureController(controller);
+                return root;
+            }
+        };
+    }
+
+    private void configureController(Object controller) {
+        if (controller instanceof EditProfileController epc) epc.setUser(Session.getCurrentUser());
+        if (controller instanceof CommunityController cc) cc.setMainController(this);
+        if (controller instanceof ProfileController pc) pc.setMainController(this);
+        if (controller instanceof SettingController sc) sc.setMainController(this);
+    }
+
     /**
      * Updates the navigation bar to mark the given button as active.
      */
@@ -322,14 +329,14 @@ void selected(MFXButton button) {
 
         // Reset previous active button to inactive state
         if (currentActiveButton != null) {
-            currentActiveButton.getStyleClass().remove("button-active");
-            currentActiveButton.getStyleClass().add("button-sidebar");
+            currentActiveButton.getStyleClass().remove(STYLE_ACTIVE);
+            currentActiveButton.getStyleClass().add(STYLE_SIDEBAR);
             setButtonIcon(currentActiveButton, false); // Set to inactive icon
         }
 
         // Set new active button state
-        button.getStyleClass().remove("button-sidebar");
-        button.getStyleClass().add("button-active");
+    button.getStyleClass().remove(STYLE_SIDEBAR);
+    button.getStyleClass().add(STYLE_ACTIVE);
         setButtonIcon(button, true); // Set to active icon
 
         // Track the current active button
@@ -353,7 +360,7 @@ private void setButtonIcon(MFXButton button, boolean isActive) {
                 iconView = homeIcon;
                 iconBaseName = "Home";
                 break;
-            case "community":
+            case PAGE_COMMUNITY:
                 iconView = communityIcon;
                 iconBaseName = "Community";
                 break;
@@ -361,7 +368,7 @@ private void setButtonIcon(MFXButton button, boolean isActive) {
                 iconView = wikiIcon;
                 iconBaseName = "Wiki";
                 break;
-            case "consult":
+            case PAGE_CONSULT:
                 iconView = consultIcon;
                 iconBaseName = "Consult";
                 break;
@@ -377,11 +384,11 @@ private void setButtonIcon(MFXButton button, boolean isActive) {
                 iconView = achievemntIcon;
                 iconBaseName = "Achievements";
                 break;
-            case "recipeManager":
+            case PAGE_RECIPE_MANAGER:
                 iconView = recipeManagerIcon;
                 iconBaseName = "RecipeManager";
                 break;
-            case "userManager":
+            case PAGE_USER_MANAGER:
                 iconView = userManagerIcon;
                 iconBaseName = "UserManager";
                 break;
@@ -396,8 +403,8 @@ private void setButtonIcon(MFXButton button, boolean isActive) {
             Image newImage = new Image(getClass().getResourceAsStream(iconPath));
             iconView.setImage(newImage);
         } catch (Exception e) {
-            Logger.getLogger(MainController.class.getName()).log(Level.WARNING,
-                    "Failed to load icon for button: " + buttonId, e);
+            Logger.getLogger(MainController.class.getName()).log(Level.WARNING, () -> "Failed to load icon for button: " + buttonId);
+            Logger.getLogger(MainController.class.getName()).log(Level.WARNING, "Icon load stacktrace", e);
         }
     }
 
@@ -408,14 +415,14 @@ private void setButtonIcon(MFXButton button, boolean isActive) {
      */
     private String getButtonIdentifier(MFXButton button) {
         if (button == home) return "home";
-        if (button == community) return "community";
+        if (button == community) return PAGE_COMMUNITY;
         if (button == wiki) return "wiki";
-        if (button == consult) return "consult";
+        if (button == consult) return PAGE_CONSULT;
         if (button == mission) return "mission";
         if (button == games) return "games";
         if (button == achievement) return "achievement";
-        if (button == recipeManager) return "recipeManager";
-        if (button == userManager) return "userManager";
+        if (button == recipeManager) return PAGE_RECIPE_MANAGER;
+        if (button == userManager) return PAGE_USER_MANAGER;
         return null;
     }
 
@@ -464,9 +471,9 @@ public void initialize(URL url, ResourceBundle rb) {
     private void initializeButtons() {
         // Set all buttons to inactive style class
         MFXButton[] buttons = {home, community, wiki, consult, mission, games, achievement, recipeManager, userManager};
-        for (MFXButton button : buttons) {
-            button.getStyleClass().remove("button-active");
-            button.getStyleClass().add("button-sidebar");
+        for (MFXButton btn : buttons) {
+            btn.getStyleClass().remove(STYLE_ACTIVE);
+            if (!btn.getStyleClass().contains(STYLE_SIDEBAR)) btn.getStyleClass().add(STYLE_SIDEBAR);
         }
 
         // Set all icons to inactive state
@@ -493,15 +500,19 @@ private void initializeButtons() {
      * Public method to navigate to community page with proper button selection
      * Used by other controllers like PostController for navigation
      */
-    public void navigateToCommunity() {
-        loadPage("community");
-        selected(community);
-    }
+    public void navigateToCommunity() { loadPage(PAGE_COMMUNITY); selected(community); }
     
     /**
      * Sets the current post for navigation to post view
      */
-    public void setCurrentPost(Post post) {
-        this.currentPost = post;
+    public void openPost(Post post) {
+        loadPage("Post", controller -> {
+            if (controller instanceof PostController pc) {
+                pc.setPost(post);
+                pc.setMainController(this);
+            }
+        });
     }
+
+    private Object loaderController(Parent root) { return root.getProperties().get(PROP_CONTROLLER); }
 }
diff --git a/src/main/java/com/starlight/controller/PostController.java b/src/main/java/com/starlight/controller/PostController.java
index 0df2eaf..08b41b1 100644
--- a/src/main/java/com/starlight/controller/PostController.java
+++ b/src/main/java/com/starlight/controller/PostController.java
@@ -83,12 +83,19 @@ public class PostController implements Initializable {
     private MainController mainController; // Reference to main controller for navigation
     private static final Logger logger = Logger.getLogger(PostController.class.getName());
     private static final int MAX_RETRIES = 3;
+    // Duplicated literal constants (Sonar S1192)
+    private static final String UNKNOWN = "Unknown";
+    private static final String STYLE_VERDICT_UNKNOWN = "verdict-unknown";
+    private static final String FONT_POPPINS = "Poppins";
+    private static final String TITLE_NUTRITION_FACTS = "Nutrition Facts";
 
-    @FXML
-    private void initialize() {
-        // Initialize with placeholder data or wait for post data to be set
+    // Dedicated exception for analysis retries
+    private static class NutritionAnalysisException extends Exception {
+        NutritionAnalysisException(String message, Throwable cause) { super(message, cause); }
     }
-    
+
+    // @FXML initialize method intentionally omitted; Initializable#initialize used instead.
+
     /**
      * Handles the go back button click - navigates back to community view
      */
@@ -129,6 +136,7 @@ public void setMainController(MainController mainController) {
     
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        // Intentionally left blank (S1186): UI is populated only after a Post is injected via setPost()
     }
     
     /**
@@ -143,95 +151,78 @@ public void setPost(Post post) {
      * Updates all UI elements with the current post data
      */
     private void updateUIFromPost() {
-        if (currentPost == null) return;
+        if (currentPost == null) {
+            return;
+        }
+        updateBasicTextFields();
+        updateVerdictButton();
+        updateAnalysisButtonState();
+        loadUserImages();
+        populateRecipeContainer();
+        populateNutritionFacts();
+    }
 
+    private void updateBasicTextFields() {
         if (description != null) {
             description.setText(currentPost.getDescription() != null ? currentPost.getDescription() : "");
         }
-
         if (uploadtime != null) {
             uploadtime.setText(formatRelativeTime(currentPost.getUploadtime()));
         }
-        
-        // Update username with display name from UserData
         if (username != null) {
             String displayUsername = getDisplayUsernameForUser(currentPost.getUsername());
             username.setText(displayUsername != null ? displayUsername : currentPost.getUsername());
         }
-        
-        // Update verdict button if available
-        if (verdict != null && currentPost.getNutrition() != null) {
-            String verdictText = currentPost.getNutrition().getVerdict() != null ? 
-                currentPost.getNutrition().getVerdict() : "Unknown";
+    }
+
+    private void updateVerdictButton() {
+        if (verdict == null) {
+            return;
+        }
+        if (currentPost.getNutrition() != null) {
+            String verdictText = currentPost.getNutrition().getVerdict() != null ? currentPost.getNutrition().getVerdict() : UNKNOWN;
             verdict.setText(verdictText);
-            
-            // Apply different styling based on verdict
             verdict.getStyleClass().clear();
             verdict.getStyleClass().add("food-tag");
             switch (verdictText) {
-                case "Healthy":
-                    verdict.getStyleClass().add("verdict-healthy");
-                    break;
-                case "Moderate":
-                    verdict.getStyleClass().add("verdict-moderate");
-                    break;
-                case "Unhealthy":
-                    verdict.getStyleClass().add("verdict-unhealthy");
-                    break;
-                case "Junk Food":
-                    verdict.getStyleClass().add("verdict-junk");
-                    break;
-                case "Unknown":
-                    verdict.getStyleClass().add("verdict-unknown");
-                    break;
-                default:
-                    verdict.getStyleClass().add("verdict-unknown");
-                    break;
+                case "Healthy" -> verdict.getStyleClass().add("verdict-healthy");
+                case "Moderate" -> verdict.getStyleClass().add("verdict-moderate");
+                case "Unhealthy" -> verdict.getStyleClass().add("verdict-unhealthy");
+                case "Junk Food" -> verdict.getStyleClass().add("verdict-junk");
+                case UNKNOWN -> verdict.getStyleClass().add(STYLE_VERDICT_UNKNOWN);
+                default -> verdict.getStyleClass().add(STYLE_VERDICT_UNKNOWN);
             }
-        } else if (verdict != null) {
-            verdict.setText("Unknown");
+        } else {
+            verdict.setText(UNKNOWN);
             verdict.getStyleClass().clear();
             verdict.getStyleClass().add("food-tag");
-            verdict.getStyleClass().add("verdict-unknown");
+            verdict.getStyleClass().add(STYLE_VERDICT_UNKNOWN);
         }
-        
-        // Update doAnalysis button state based on current nutrition status
-        if (doAnalysis != null) {
-            if (currentPost.getNutrition() != null && currentPost.getNutrition().getVerdict() != null && !currentPost.getNutrition().getVerdict().equals("Unknown")) {
-                // Recipe has been analyzed - button can re-analyze
-                doAnalysis.setText("Re-analyze");
-                doAnalysis.setDisable(false);
-            } else {
-                // Recipe hasn't been analyzed - button can analyze
-                doAnalysis.setText("Analyze");
-                doAnalysis.setDisable(false);
-            }
-            
-            // Disable if no ingredients available
-            if (currentPost.getIngredients() == null || currentPost.getIngredients().trim().isEmpty()) {
-                doAnalysis.setText("No Ingredients");
-                doAnalysis.setDisable(true);
-            }
+    }
+
+    private void updateAnalysisButtonState() {
+        if (doAnalysis == null) {
+            return;
         }
-        
-        // Load profile picture
+        boolean analyzed = currentPost.getNutrition() != null && currentPost.getNutrition().getVerdict() != null && !UNKNOWN.equals(currentPost.getNutrition().getVerdict());
+        doAnalysis.setText(analyzed ? "Re-analyze" : "Analyze");
+        doAnalysis.setDisable(false);
+        if (currentPost.getIngredients() == null || currentPost.getIngredients().trim().isEmpty()) {
+            doAnalysis.setText("No Ingredients");
+            doAnalysis.setDisable(true);
+        }
+    }
+
+    private void loadUserImages() {
         if (profile1 != null) {
             String profilePicture = getProfilePictureForUser(currentPost.getUsername());
             ImageUtils.loadImage(profile1, profilePicture, ImageUtils.DEFAULT_MISSING_IMAGE);
             ImageUtils.scaleToFit(profile1, 80, 80, 500);
         }
-        
-        // Load post image
         if (recentphoto1 != null) {
             ImageUtils.loadImage(recentphoto1, currentPost.getImage(), ImageUtils.DEFAULT_MISSING_IMAGE);
             ImageUtils.scaleToFit(recentphoto1, 1270, 990, 20);
         }
-        
-    // Populate recipe container with formatted text
-    populateRecipeContainer();
-        
-        // Populate nutrition facts chart
-        populateNutritionFacts();
     }
     
     /**
@@ -289,7 +280,7 @@ private void addBulletList(TextFlow textFlow, String content) {
             line = line.trim();
             if (!line.isEmpty()) {
                 Text bullet = new Text("• " + line);
-                bullet.setFont(Font.font("Poppins", 24));
+                bullet.setFont(Font.font(FONT_POPPINS, 24));
                 bullet.setFill(Color.rgb(63, 63, 91)); // #3F3F5B
                 textFlow.getChildren().add(bullet);
                 addNewLine(textFlow, 1);
@@ -307,7 +298,7 @@ private void addNumberedList(TextFlow textFlow, String content) {
             line = line.trim();
             if (!line.isEmpty()) {
                 Text numberedItem = new Text(counter + ". " + line);
-                numberedItem.setFont(Font.font("Poppins", 24));
+                numberedItem.setFont(Font.font(FONT_POPPINS, 24));
                 numberedItem.setFill(Color.rgb(63, 63, 91)); // #3F3F5B
                 textFlow.getChildren().add(numberedItem);
                 addNewLine(textFlow, 1);
@@ -334,8 +325,8 @@ private void addNewLine(TextFlow textFlow, int count) {
     private void parseAndAddFormattedText(TextFlow textFlow, String message) {
         // Base text color and fonts
         Color textColor = Color.rgb(63, 63, 91); // #3F3F5B
-        Font baseFont = Font.font("Poppins", 24);
-        Font boldFont = Font.font("Poppins", FontWeight.BOLD, 24);
+    Font baseFont = Font.font(FONT_POPPINS, 24);
+    Font boldFont = Font.font(FONT_POPPINS, FontWeight.BOLD, 24);
         
         String[] parts = message.split("\\*\\*");
         
@@ -410,101 +401,76 @@ private String formatRelativeTime(String timeString) {
      * Populates the nutrition facts DoughnutChart with data from the current post.
      */
     private void populateNutritionFacts() {
-        if (nutritionFacts == null || currentPost == null) {
-            return;
-        }
-        
-        // Show placeholder data when no nutrition analysis available
+        if (nutritionFacts == null || currentPost == null) return;
         if (currentPost.getNutrition() == null) {
-            ObservableList<PieChart.Data> placeholderData = FXCollections.observableArrayList(
-                new PieChart.Data("No nutrition analysis available", 1)
-            );
-            nutritionFacts.setData(placeholderData);
-            nutritionFacts.setTitle("Nutrition Facts");
-            nutritionFacts.setLegendVisible(true);
-            nutritionFacts.getStyleClass().add("nutrition-chart");
-            
-            // Force layout update to ensure DoughnutChart inner circle is properly displayed
-            refreshDoughnutChart();
+            setPlaceholderNutritionFacts();
             return;
         }
-        
         try {
-            Nutrition nutrition = currentPost.getNutrition();
-            ObservableList<PieChart.Data> pieChartData = FXCollections.observableArrayList();
-            
-            // Get total values for all nutrients
-            double totalProtein = nutrition.getTotalProtein();
-            double totalFat = nutrition.getTotalFat();
-            double totalCarbs = nutrition.getTotalCarbohydrates();
-            double totalFiber = nutrition.getTotalFiber();
-            double totalSugar = nutrition.getTotalSugar();
-            double totalSalt = nutrition.getTotalSalt();
-            
-            // Create pie chart data for macronutrients and key micronutrients
-            if (totalProtein > 0) {
-                pieChartData.add(new PieChart.Data("Protein (" + String.format("%.1f", totalProtein) + "g)", totalProtein));
-            }
-            
-            if (totalFat > 0) {
-                pieChartData.add(new PieChart.Data("Fat (" + String.format("%.1f", totalFat) + "g)", totalFat));
-            }
-            
-            if (totalCarbs > 0) {
-                pieChartData.add(new PieChart.Data("Carbohydrates (" + String.format("%.1f", totalCarbs) + "g)", totalCarbs));
-            }
-            
-            if (totalFiber > 0) {
-                pieChartData.add(new PieChart.Data("Fiber (" + String.format("%.1f", totalFiber) + "g)", totalFiber));
-            }
-            
-            if (totalSugar > 0) {
-                pieChartData.add(new PieChart.Data("Sugar (" + String.format("%.1f", totalSugar) + "g)", totalSugar));
-            }
-            
-            if (totalSalt > 0) {
-                // Convert mg to g for display consistency, or keep as mg if preferred
-                if (totalSalt >= 1000) {
-                    pieChartData.add(new PieChart.Data("Salt (" + String.format("%.1f", totalSalt/1000) + "g)", totalSalt/100)); // Scale down for chart
-                } else {
-                    pieChartData.add(new PieChart.Data("Salt (" + String.format("%.0f", totalSalt) + "mg)", totalSalt/100)); // Scale down for chart
-                }
-            }
-            
-            // If no macronutrient data, show calories breakdown
-            if (pieChartData.isEmpty()) {
-                double totalCalories = nutrition.getTotalCalories();
-                if (totalCalories > 0) {
-                    pieChartData.add(new PieChart.Data("Calories (" + String.format("%.0f", totalCalories) + " kcal)", totalCalories));
-                } else {
-                    // Fallback: show a placeholder
-                    pieChartData.add(new PieChart.Data("No nutrition data available", 1));
-                }
-            }
-            
-            nutritionFacts.setData(pieChartData);
-            nutritionFacts.setTitle("Nutrition Facts");
+            ObservableList<PieChart.Data> data = buildNutritionPieData(currentPost.getNutrition());
+            nutritionFacts.setData(data);
+            nutritionFacts.setTitle(TITLE_NUTRITION_FACTS);
             nutritionFacts.setLegendVisible(true);
-            
-            // Apply custom styling if needed
             nutritionFacts.getStyleClass().add("nutrition-chart");
-            
-            // Force layout update to ensure DoughnutChart inner circle is properly displayed
             refreshDoughnutChart();
-            
         } catch (Exception e) {
-            java.util.logging.Logger.getLogger(PostController.class.getName())
-                    .warning("Failed to populate nutrition facts: " + e.getMessage());
-            
-            // Show fallback data
-            ObservableList<PieChart.Data> fallbackData = FXCollections.observableArrayList(
-                new PieChart.Data("Nutrition data unavailable", 1)
-            );
-            nutritionFacts.setData(fallbackData);
-            nutritionFacts.setTitle("Nutrition Facts");
-            
-            // Force layout update to ensure DoughnutChart inner circle is properly displayed
-            refreshDoughnutChart();
+            // Defer message construction (Sonar S3457) while keeping stack trace
+            logger.log(Level.WARNING, e, () -> "Failed to populate nutrition facts: " + e.getMessage());
+            setFallbackNutritionFacts();
+        }
+    }
+
+    private void setPlaceholderNutritionFacts() {
+        ObservableList<PieChart.Data> placeholderData = FXCollections.observableArrayList(
+            new PieChart.Data("No nutrition analysis available", 1)
+        );
+        nutritionFacts.setData(placeholderData);
+        nutritionFacts.setTitle(TITLE_NUTRITION_FACTS);
+        nutritionFacts.setLegendVisible(true);
+        nutritionFacts.getStyleClass().add("nutrition-chart");
+        refreshDoughnutChart();
+    }
+
+    private void setFallbackNutritionFacts() {
+        ObservableList<PieChart.Data> fallbackData = FXCollections.observableArrayList(
+            new PieChart.Data("Nutrition data unavailable", 1)
+        );
+        nutritionFacts.setData(fallbackData);
+        nutritionFacts.setTitle(TITLE_NUTRITION_FACTS);
+        refreshDoughnutChart();
+    }
+
+    private ObservableList<PieChart.Data> buildNutritionPieData(Nutrition nutrition) {
+        ObservableList<PieChart.Data> pieChartData = FXCollections.observableArrayList();
+        addIfPositive(pieChartData, "Protein", nutrition.getTotalProtein(), "g");
+        addIfPositive(pieChartData, "Fat", nutrition.getTotalFat(), "g");
+        addIfPositive(pieChartData, "Carbohydrates", nutrition.getTotalCarbohydrates(), "g");
+        addIfPositive(pieChartData, "Fiber", nutrition.getTotalFiber(), "g");
+        addIfPositive(pieChartData, "Sugar", nutrition.getTotalSugar(), "g");
+        addSaltData(pieChartData, nutrition.getTotalSalt());
+        if (pieChartData.isEmpty()) addCaloriesOrPlaceholder(pieChartData, nutrition.getTotalCalories());
+        return pieChartData;
+    }
+
+    private void addIfPositive(ObservableList<PieChart.Data> list, String label, double value, String unit) {
+        if (value > 0) list.add(new PieChart.Data(label + " (" + String.format("%.1f", value) + unit + ")", value));
+    }
+
+    private void addSaltData(ObservableList<PieChart.Data> list, double totalSalt) {
+        if (totalSalt > 0) {
+            if (totalSalt >= 1000) {
+                list.add(new PieChart.Data("Salt (" + String.format("%.1f", totalSalt/1000) + "g)", totalSalt/100));
+            } else {
+                list.add(new PieChart.Data("Salt (" + String.format("%.0f", totalSalt) + "mg)", totalSalt/100));
+            }
+        }
+    }
+
+    private void addCaloriesOrPlaceholder(ObservableList<PieChart.Data> list, double totalCalories) {
+        if (totalCalories > 0) {
+            list.add(new PieChart.Data("Calories (" + String.format("%.0f", totalCalories) + " kcal)", totalCalories));
+        } else {
+            list.add(new PieChart.Data("No nutrition data available", 1));
         }
     }
     
@@ -518,9 +484,7 @@ private void refreshDoughnutChart() {
             nutritionFacts.refreshDoughnut();
             
             // Additional delayed refresh to ensure proper rendering
-            Platform.runLater(() -> {
-                nutritionFacts.refreshDoughnut();
-            });
+            Platform.runLater(() -> nutritionFacts.refreshDoughnut());
         }
     }
     
@@ -553,46 +517,28 @@ private void showProcessingAndAnalyzeNutrition() {
             Task<Nutrition> nutritionTask = createNutritionAnalysisTask(processingController);
             
             // Handle task completion
-            nutritionTask.setOnSucceeded(e -> {
-                Platform.runLater(() -> {
-                    dialogStage.close();
-                    
-                    Nutrition newNutrition = nutritionTask.getValue();
-                    if (newNutrition != null && !newNutrition.getIngredient().isEmpty()) {
-                        // Update the current post's nutrition
-                        currentPost.setNutrition(newNutrition);
-                        
-                        // Save the updated post to XML
-                        saveUpdatedPost();
-                        
-                        // Update UI to reflect new nutrition data
-                        updateUIFromPost();
-                        
-                        // Show success dialog
-                        showResultDialog(true, "Nutrition analysis completed successfully!");
-                        
-                        logger.info("Nutrition analysis completed and saved successfully");
-                    } else {
-                        showResultDialog(false, "Nutrition analysis failed. Please try again.");
-                        logger.warning("Nutrition analysis returned empty or invalid results");
-                    }
-                });
-            });
+            nutritionTask.setOnSucceeded(e -> Platform.runLater(() -> {
+                dialogStage.close();
+                Nutrition newNutrition = nutritionTask.getValue();
+                if (newNutrition != null && !newNutrition.getIngredient().isEmpty()) {
+                    currentPost.setNutrition(newNutrition);
+                    saveUpdatedPost();
+                    updateUIFromPost();
+                    showResultDialog(true, "Nutrition analysis completed successfully!");
+                    logger.info("Nutrition analysis completed and saved successfully");
+                } else {
+                    showResultDialog(false, "Nutrition analysis failed. Please try again.");
+                    logger.warning("Nutrition analysis returned empty or invalid results");
+                }
+            }));
             
-            nutritionTask.setOnFailed(e -> {
-                Platform.runLater(() -> {
-                    dialogStage.close();
-                    
-                    Throwable exception = nutritionTask.getException();
-                    String errorMessage = "Nutrition analysis failed";
-                    if (exception != null) {
-                        errorMessage += ": " + exception.getMessage();
-                    }
-                    
-                    showResultDialog(false, errorMessage);
-                    logger.log(Level.SEVERE, "Nutrition analysis task failed", exception);
-                });
-            });
+            nutritionTask.setOnFailed(e -> Platform.runLater(() -> {
+                dialogStage.close();
+                Throwable exception = nutritionTask.getException();
+                String errorMessage = "Nutrition analysis failed" + (exception != null ? ": " + exception.getMessage() : "");
+                showResultDialog(false, errorMessage);
+                logger.log(Level.SEVERE, "Nutrition analysis task failed", exception);
+            }));
             
             // Start the task in a background thread
             Thread taskThread = new Thread(nutritionTask);
@@ -610,57 +556,40 @@ private void showProcessingAndAnalyzeNutrition() {
      * Based on CreatePostController implementation.
      */
     private Task<Nutrition> createNutritionAnalysisTask(ProcessingDialogController processingController) {
-        return new Task<Nutrition>() {
+        return new Task<>() {
             @Override
-            protected Nutrition call() throws Exception {
-                String ingredients = currentPost.getIngredients();
-                Exception lastException = null;
-                
-                // Try analysis up to MAX_RETRIES times
-                for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) {
-                    final int currentAttempt = attempt; // Make effectively final for lambda
-                    try {
-                        Platform.runLater(() -> 
-                            processingController.updateStatus("Analyzing nutrition... (Attempt " + currentAttempt + "/" + MAX_RETRIES + ")")
-                        );
-                        
-                        // Perform nutrition analysis using ChatGPT API
-                        String nutritionResponse = chatbotAPI.analyzeNutritionFacts(ingredients);
-                        
-                        // Parse the AI response into Nutrition object
-                        Nutrition nutrition = nutritionParser.parseNutritionFromResponse(nutritionResponse);
-                        
-                        if (nutrition != null && !nutrition.getIngredient().isEmpty()) {
-                            logger.info(() -> "Nutrition analysis completed successfully on attempt " + currentAttempt);
-                            Platform.runLater(() -> 
-                                processingController.updateStatus("Analysis completed successfully!")
-                            );
-                            return nutrition;
-                        } else {
-                            throw new Exception("AI returned empty or invalid nutrition data");
-                        }
-                        
-                    } catch (Exception e) {
-                        lastException = e;
-                        logger.log(Level.WARNING, "Nutrition analysis attempt " + currentAttempt + " failed: " + e.getMessage(), e);
-                        
-                        if (currentAttempt < MAX_RETRIES) {
-                            Platform.runLater(() -> 
-                                processingController.updateStatus("Attempt " + currentAttempt + " failed, retrying...")
-                            );
-                            Thread.sleep(1000); // Brief pause between attempts
-                        }
-                    }
-                }
-                
-                // All attempts failed
-                Platform.runLater(() -> 
-                    processingController.updateStatus("Analysis failed after " + MAX_RETRIES + " attempts")
-                );
-                throw lastException != null ? lastException : new Exception("All nutrition analysis attempts failed");
+            protected Nutrition call() throws NutritionAnalysisException {
+                return performNutritionAnalysisWithRetries(currentPost.getIngredients(), processingController);
             }
         };
     }
+
+    private Nutrition performNutritionAnalysisWithRetries(String ingredients, ProcessingDialogController controller) throws NutritionAnalysisException {
+        Exception lastException = null;
+        for (int attempt = 1; attempt <= MAX_RETRIES; attempt++) {
+            int currentAttempt = attempt;
+            Platform.runLater(() -> controller.updateStatus("Analyzing nutrition... (Attempt " + currentAttempt + "/" + MAX_RETRIES + ")"));
+            try {
+                String response = chatbotAPI.analyzeNutritionFacts(ingredients);
+                Nutrition nutrition = nutritionParser.parseNutritionFromResponse(response);
+                if (nutrition != null && !nutrition.getIngredient().isEmpty()) {
+                    logger.info(() -> "Nutrition analysis completed successfully on attempt " + currentAttempt);
+                    Platform.runLater(() -> controller.updateStatus("Analysis completed successfully!"));
+                    return nutrition;
+                }
+                throw new IllegalStateException("AI returned empty or invalid nutrition data");
+            } catch (Exception e) {
+                lastException = e;
+                logger.log(Level.WARNING, e, () -> "Nutrition analysis attempt " + currentAttempt + " failed: " + e.getMessage());
+                if (currentAttempt < MAX_RETRIES) {
+                    Platform.runLater(() -> controller.updateStatus("Attempt " + currentAttempt + " failed, retrying..."));
+                    try { Thread.sleep(1000); } catch (InterruptedException ie) { Thread.currentThread().interrupt(); }
+                }
+            }
+        }
+        Platform.runLater(() -> controller.updateStatus("Analysis failed after " + MAX_RETRIES + " attempts"));
+        throw new NutritionAnalysisException("Analysis failed after retries", lastException);
+    }
     
     /**
      * Saves the updated post with new nutrition data to XML.
@@ -692,8 +621,8 @@ private void saveUpdatedPost() {
             logger.info("Post nutrition data updated and saved to XML successfully");
             
         } catch (Exception e) {
+            // Handle locally: log only (Sonar S2139 - do not log then rethrow)
             logger.log(Level.SEVERE, "Failed to save updated post to XML", e);
-            throw new RuntimeException("Failed to save nutrition analysis results", e);
         }
     }
     
@@ -722,6 +651,7 @@ private void showResultDialog(boolean success, String message) {
             dialogStage.showAndWait();
             
         } catch (Exception e) {
+            // Log and swallow (dialog already failed, no further recovery path). S2139: choose logging only.
             logger.log(Level.SEVERE, "Failed to show result dialog", e);
         }
     }
@@ -745,6 +675,7 @@ private void showAnalysisErrorDialog(String errorMessage) {
             dialogStage.showAndWait();
             
         } catch (Exception e) {
+            // Log and swallow (cannot show error dialog about failing to show error dialog). S2139 compliance.
             logger.log(Level.SEVERE, "Failed to show error dialog", e);
         }
     }
diff --git a/src/main/java/com/starlight/controller/PostItemController.java b/src/main/java/com/starlight/controller/PostItemController.java
index 58cb1b9..a0e7c5e 100644
--- a/src/main/java/com/starlight/controller/PostItemController.java
+++ b/src/main/java/com/starlight/controller/PostItemController.java
@@ -268,8 +268,7 @@ private boolean isClickableButton(javafx.scene.Node target) {
      */
     private void handlePostClick() {
         if (currentPost != null && mainController != null) {
-            mainController.setCurrentPost(currentPost);
-            mainController.loadPage("Post");
+            mainController.openPost(currentPost);
         } else {
             if (currentPost == null) {
                 logger.warning("Cannot navigate: currentPost is null");
diff --git a/src/main/java/com/starlight/controller/RecipeItemController.java b/src/main/java/com/starlight/controller/RecipeItemController.java
index 498995a..bd919d0 100644
--- a/src/main/java/com/starlight/controller/RecipeItemController.java
+++ b/src/main/java/com/starlight/controller/RecipeItemController.java
@@ -252,8 +252,7 @@ private boolean isClickableButton(javafx.scene.Node target) {
      */
     private void handleRecipeClick() {
         if (currentPost != null && mainController != null) {
-            mainController.setCurrentPost(currentPost);
-            mainController.loadPage("Post");
+            mainController.openPost(currentPost);
         } else {
             if (currentPost == null) {
                 logger.warning("Cannot navigate: currentPost is null");
diff --git a/src/main/java/com/starlight/util/ChatHistoryManager.java b/src/main/java/com/starlight/util/ChatHistoryManager.java
index 67111ca..f740bee 100644
--- a/src/main/java/com/starlight/util/ChatHistoryManager.java
+++ b/src/main/java/com/starlight/util/ChatHistoryManager.java
@@ -22,6 +22,9 @@ public class ChatHistoryManager {
     private static final Logger logger = Logger.getLogger(ChatHistoryManager.class.getName());
     private static final String CHAT_HISTORY_DIR = "ChatHistory";
     private static final String FILE_EXTENSION = ".xml";
+    private static final String PROP_USER_HOME = "user.home";
+    private static final String DATABASE_DIR_NAME = "Database";
+    private static final String APP_DIR_NAME = ".tabemonpal";
     
     private final XStream xstream;
     private ChatHistory currentSession;
@@ -49,7 +52,7 @@ public void startSession(String username) {
         }
         
         currentSession = new ChatHistory(username);
-        logger.info("Started new chat session for user: " + username);
+    logger.log(Level.INFO, () -> "Started new chat session for user: " + username);
     }
     
     /**
@@ -61,7 +64,7 @@ public void startSession(String username) {
      */
     public void addMessage(String content, boolean isUser, String username) {
         if (currentSession == null) {
-            logger.warning("No active session. Starting new session for user: " + username);
+            logger.log(Level.WARNING, () -> "No active session. Starting new session for user: " + username);
             startSession(username);
         }
         
@@ -83,7 +86,7 @@ public void endSession() {
         currentSession.endSession();
         saveCurrentSession();
         
-        logger.info("Ended chat session: " + currentSession.getSessionSummary());
+    logger.log(Level.INFO, () -> "Ended chat session: " + currentSession.getSessionSummary());
         currentSession = null;
     }
     
@@ -96,8 +99,8 @@ private void saveCurrentSession() {
         }
         
         try {
-            String userHome = System.getProperty("user.home");
-            Path historyDir = Paths.get(userHome, ".tabemonpal", "Database", CHAT_HISTORY_DIR);
+            String userHome = System.getProperty(PROP_USER_HOME);
+            Path historyDir = Paths.get(userHome, APP_DIR_NAME, DATABASE_DIR_NAME, CHAT_HISTORY_DIR);
             
             // Create directory if it doesn't exist
             Files.createDirectories(historyDir);
@@ -112,10 +115,11 @@ private void saveCurrentSession() {
                 fos.write(xml.getBytes());
             }
             
-            logger.fine("Saved chat history: " + historyFile);
+            logger.log(Level.FINE, () -> "Saved chat history: " + historyFile);
             
         } catch (Exception e) {
-            logger.log(Level.SEVERE, "Failed to save chat history: " + e.getMessage(), e);
+            logger.log(Level.SEVERE, "Failed to save chat history: {0}", e.getMessage());
+            logger.log(Level.SEVERE, "Save chat history stacktrace", e);
         }
     }
     
@@ -129,8 +133,8 @@ public List<ChatHistory> loadUserHistory(String username) {
         List<ChatHistory> histories = new ArrayList<>();
         
         try {
-            String userHome = System.getProperty("user.home");
-            Path historyDir = Paths.get(userHome, ".tabemonpal", "Database", CHAT_HISTORY_DIR);
+            String userHome = System.getProperty(PROP_USER_HOME);
+            Path historyDir = Paths.get(userHome, APP_DIR_NAME, DATABASE_DIR_NAME, CHAT_HISTORY_DIR);
             
             if (!Files.exists(historyDir)) {
                 return histories; // Empty list if directory doesn't exist
@@ -148,7 +152,8 @@ public List<ChatHistory> loadUserHistory(String username) {
                             histories.add(history);
                         }
                     } catch (Exception e) {
-                        logger.log(Level.WARNING, "Failed to load chat history file: " + path, e);
+                        logger.log(Level.WARNING, () -> "Failed to load chat history file: " + path);
+                        logger.log(Level.WARNING, "Load chat history file stacktrace", e);
                     }
                 });
             
@@ -156,7 +161,8 @@ public List<ChatHistory> loadUserHistory(String username) {
             histories.sort(Comparator.comparing(ChatHistory::getSessionStart).reversed());
             
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Failed to load chat histories: " + e.getMessage(), e);
+            logger.log(Level.WARNING, "Failed to load chat histories: {0}", e.getMessage());
+            logger.log(Level.WARNING, "Load chat histories stacktrace", e);
         }
         
         return histories;
@@ -181,16 +187,17 @@ public ChatHistory loadRecentHistory(String username) {
      */
     public boolean deleteHistory(String sessionId) {
         try {
-            String userHome = System.getProperty("user.home");
-            Path historyFile = Paths.get(userHome, ".tabemonpal", "Database", CHAT_HISTORY_DIR, sessionId + FILE_EXTENSION);
+            String userHome = System.getProperty(PROP_USER_HOME);
+            Path historyFile = Paths.get(userHome, APP_DIR_NAME, DATABASE_DIR_NAME, CHAT_HISTORY_DIR, sessionId + FILE_EXTENSION);
             
             if (Files.exists(historyFile)) {
                 Files.delete(historyFile);
-                logger.info("Deleted chat history: " + sessionId);
+                logger.log(Level.INFO, () -> "Deleted chat history: " + sessionId);
                 return true;
             }
         } catch (Exception e) {
-            logger.log(Level.WARNING, "Failed to delete chat history: " + sessionId, e);
+            logger.log(Level.WARNING, () -> "Failed to delete chat history: " + sessionId);
+            logger.log(Level.WARNING, "Delete chat history stacktrace", e);
         }
         
         return false;
@@ -212,7 +219,8 @@ public int clearUserHistory(String username) {
             }
         }
         
-        logger.info("Cleared " + deletedCount + " chat history files for user: " + username);
+    final int finalDeletedCount = deletedCount;
+    logger.log(Level.INFO, () -> "Cleared " + finalDeletedCount + " chat history files for user: " + username);
         return deletedCount;
     }
     
diff --git a/src/main/java/com/starlight/util/FileSystemManager.java b/src/main/java/com/starlight/util/FileSystemManager.java
index 7153b3d..1129397 100644
--- a/src/main/java/com/starlight/util/FileSystemManager.java
+++ b/src/main/java/com/starlight/util/FileSystemManager.java
@@ -3,6 +3,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -53,18 +54,21 @@ public static void initializeAppDataDirectory() {
             // Create .SECRET_KEY.xml file if it doesn't exist
             Path secretKeyPath = databaseDir.resolve(".SECRET_KEY.xml");
             if (!Files.exists(secretKeyPath)) {
-                String secretKeyContent = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-                                        "<config>\n" +
-                                        "    <openai-key>PASTE-YOUR-SECRET-KEY-HERE</openai-key>\n" +
-                                        "</config>";
-                Files.write(secretKeyPath, secretKeyContent.getBytes("UTF-8"));
-                LOGGER.info("Paste your secret key at: " + secretKeyPath);
+                String secretKeyContent = """
+                        <?xml version="1.0" encoding="UTF-8"?>
+                        <config>
+                            <openai-key>PASTE-YOUR-SECRET-KEY-HERE</openai-key>
+                        </config>
+                        """.stripIndent();
+                Files.write(secretKeyPath, secretKeyContent.getBytes(StandardCharsets.UTF_8));
+                LOGGER.log(Level.INFO, "Paste your secret key at: {0}", secretKeyPath);
             }
-            
-            LOGGER.info("App data directory initialized at: " + APP_DATA_DIR);
+
+            LOGGER.log(Level.INFO, () -> "App data directory initialized at: " + APP_DATA_DIR);
             
         } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Failed to initialize app data directory: " + e.getMessage(), e);
+            LOGGER.log(Level.SEVERE, "Failed to initialize app data directory: {0}", e.getMessage());
+            LOGGER.log(Level.SEVERE, "Initialization stacktrace", e);
         }
     }
 
@@ -103,7 +107,8 @@ public static String createUserImageDirectory(String username) {
             Files.createDirectories(userDir);
             return userDir.toString();
         } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Failed to create user directory for " + username + ": " + e.getMessage(), e);
+            LOGGER.log(Level.SEVERE, "Failed to create user directory for {0}: {1}", new Object[]{username, e.getMessage()});
+            LOGGER.log(Level.SEVERE, "Create user directory stacktrace", e);
             return null;
         }
     }
@@ -130,11 +135,12 @@ public static String copyFileToUserDirectory(File sourceFile, String username, S
             // Copy file
             Files.copy(sourceFile.toPath(), targetPath, StandardCopyOption.REPLACE_EXISTING);
             
-            LOGGER.info("File copied to: " + targetPath.toString());
+            LOGGER.log(Level.INFO, () -> "File copied to: " + targetPath);
             return targetPath.toString();
             
         } catch (IOException e) {
-            LOGGER.log(Level.SEVERE, "Failed to copy file to user directory: " + e.getMessage(), e);
+            LOGGER.log(Level.SEVERE, "Failed to copy file to user directory: {0}", e.getMessage());
+            LOGGER.log(Level.SEVERE, "Copy stacktrace", e);
             return null;
         }
     }
@@ -145,7 +151,7 @@ public static String copyFileToUserDirectory(File sourceFile, String username, S
      * @param username the username whose directory to copy to
      * @return the path to the copied file in the user directory
      */
-    public static String copyFileToUserDirectoryWithUniqueFilename(File sourceFile, String username) throws IOException {
+    public static String copyFileToUserDirectoryWithUniqueFilename(File sourceFile, String username) {
         try {
             // Get file extension
             String originalName = sourceFile.getName();
@@ -174,7 +180,8 @@ public static String copyFileToUserDirectoryWithUniqueFilename(File sourceFile,
             
             return copyFileToUserDirectory(sourceFile, username, uniqueFileName);
         } catch (SecurityException e) {
-            LOGGER.log(Level.SEVERE, "Failed to copy file with unique filename: " + e.getMessage(), e);
+            LOGGER.log(Level.SEVERE, "Failed to copy file with unique filename: {0}", e.getMessage());
+            LOGGER.log(Level.SEVERE, "Unique filename copy stacktrace", e);
             return null;
         }
     }
@@ -198,108 +205,74 @@ public static boolean isAppDataDirectoryAccessible() {
             
             // Try creating a test file
             Path testFile = appDir.resolve("test_access.tmp");
-            Files.write(testFile, "test".getBytes());
+            Files.write(testFile, "test".getBytes(StandardCharsets.UTF_8));
             Files.deleteIfExists(testFile);
             
             return true;
             
         } catch (Exception e) {
-            LOGGER.log(Level.SEVERE, "App data directory is not accessible: " + e.getMessage(), e);
+            LOGGER.log(Level.SEVERE, "App data directory is not accessible: {0}", e.getMessage());
+            LOGGER.log(Level.SEVERE, "Accessibility stacktrace", e);
             return false;
         }
     }
+    // -------- Image path resolution (refactored to reduce complexity) --------
+    private static final String PROJECT_RESOURCES = "src/main/resources";
+    private static final String PROJECT_RESOURCES_PREFIX = PROJECT_RESOURCES + "/";
+    private static final String RESOURCE_MARKER = "resource:";
 
     /**
-     * Resolves an image path to an absolute path, handling various path formats
-     * @param imagePath The image path from XML (could be relative, absolute, or resource path)
-     * @return Resolved absolute path or null if not found
+     * Resolves an image path to an absolute path, handling various path formats.
      */
     public static Path resolveImagePath(String imagePath) {
-        if (imagePath == null || imagePath.trim().isEmpty()) {
-            return null;
-        }
-        
-        // Handle paths starting with "src/main/resources/" - these are project resource paths
-        if (imagePath.startsWith("src/main/resources/")) {
-            Path projectResourcesPath = Paths.get(imagePath);
-            if (Files.exists(projectResourcesPath)) {
-                return projectResourcesPath;
-            }
-            
-            // Try to convert to classpath resource path and resolve
-            String resourcePath = imagePath.substring("src/main/resources".length());
-            URL resource = FileSystemManager.class.getResource(resourcePath);
-            if (resource != null) {
-                try {
-                    return Paths.get(resource.toURI());
-                } catch (Exception e) {
-                    // Resource exists but cannot convert to path (might be in JAR)
-                    // Return a special marker indicating it's a valid resource
-                    return Paths.get("resource:" + resourcePath);
-                }
-            }
-            
-            LOGGER.warning("Could not resolve image path: " + imagePath);
-            return null;
-        }
-        
-        // Handle resource paths (paths starting with /) - check this before absolute paths
-        if (imagePath.startsWith("/") && imagePath.contains("com/starlight")) {
-            // Try to resolve as resource from classpath first
-            URL resource = FileSystemManager.class.getResource(imagePath);
-            if (resource != null) {
-                try {
-                    return Paths.get(resource.toURI());
-                } catch (Exception e) {
-                    // Resource exists but cannot convert to path (might be in JAR)
-                    // Return a special marker indicating it's a valid resource
-                    return Paths.get("resource:" + imagePath);
-                }
-            }
-            
-            // If not found as resource, try relative to project src/main/resources
-            String resourcePath = imagePath.substring(1);
-            Path projectResourcesPath = Paths.get("src/main/resources").resolve(resourcePath);
-            if (Files.exists(projectResourcesPath)) {
-                return projectResourcesPath;
-            }
-            
-            LOGGER.warning("Could not resolve resource path: " + imagePath);
-            return null;
+        if (isNullOrBlank(imagePath)) return null;
+        if (isProjectResourcePath(imagePath)) return resolveProjectResourcePath(imagePath);
+        if (isClasspathResourcePath(imagePath)) return resolveClasspathResourcePath(imagePath);
+        Path absolute = Paths.get(imagePath);
+        if (absolute.isAbsolute()) return validateAbsolute(absolute, imagePath);
+        return resolveRelativeImagePath(imagePath);
+    }
+
+    private static boolean isNullOrBlank(String s) { return s == null || s.trim().isEmpty(); }
+    private static boolean isProjectResourcePath(String p) { return p.startsWith(PROJECT_RESOURCES_PREFIX); }
+    private static boolean isClasspathResourcePath(String p) { return p.startsWith("/") && p.contains("com/starlight"); }
+
+    private static Path resolveProjectResourcePath(String imagePath) {
+        Path projectResourcesPath = Paths.get(imagePath);
+        if (Files.exists(projectResourcesPath)) return projectResourcesPath;
+        String resourcePath = imagePath.substring(PROJECT_RESOURCES.length());
+        URL resource = FileSystemManager.class.getResource(resourcePath);
+        if (resource != null) {
+            try { return Paths.get(resource.toURI()); } catch (Exception e) { return Paths.get(RESOURCE_MARKER + resourcePath); }
         }
-        
-        // Handle absolute filesystem paths (but not resource paths)
-        Path absolutePath = Paths.get(imagePath);
-        if (absolutePath.isAbsolute()) {
-            if (Files.exists(absolutePath)) {
-                return absolutePath;
-            } else {
-                LOGGER.warning("Could not resolve absolute path: " + imagePath);
-                return null;
-            }
+        LOGGER.log(Level.WARNING, () -> "Could not resolve project resource image path: " + imagePath);
+        return null;
+    }
+
+    private static Path resolveClasspathResourcePath(String imagePath) {
+        URL resource = FileSystemManager.class.getResource(imagePath);
+        if (resource != null) {
+            try { return Paths.get(resource.toURI()); } catch (Exception e) { return Paths.get(RESOURCE_MARKER + imagePath); }
         }
-        
-        // Handle relative paths - try different base directories
-        
-        // Try relative to user data directory
+        String resourcePath = imagePath.substring(1);
+        Path projectResourcesPath = Paths.get(PROJECT_RESOURCES).resolve(resourcePath);
+        if (Files.exists(projectResourcesPath)) return projectResourcesPath;
+        LOGGER.log(Level.WARNING, () -> "Could not resolve classpath resource path: " + imagePath);
+        return null;
+    }
+
+    private static Path validateAbsolute(Path absolute, String original) {
+        if (Files.exists(absolute)) return absolute;
+        LOGGER.log(Level.WARNING, () -> "Could not resolve absolute path: " + original);
+        return null;
+    }
+
+    private static Path resolveRelativeImagePath(String imagePath) {
         Path userDataPath = Paths.get(getUserDataDirectory()).resolve(imagePath);
-        if (Files.exists(userDataPath)) {
-            return userDataPath;
-        }
-        
-        // Try relative to user images directory (UserData subdirectory)
-        Path userImagesPath = Paths.get(getUserDataDirectory()).resolve(imagePath);
-        if (Files.exists(userImagesPath)) {
-            return userImagesPath;
-        }
-        
-        // Try relative to project resources
-        Path projectResourcesPath = Paths.get("src/main/resources").resolve(imagePath);
-        if (Files.exists(projectResourcesPath)) {
-            return projectResourcesPath;
-        }
-        
-        LOGGER.warning("Could not resolve image path: " + imagePath);
+        if (Files.exists(userDataPath)) return userDataPath;
+        Path projectResourcesPath = Paths.get(PROJECT_RESOURCES).resolve(imagePath);
+        if (Files.exists(projectResourcesPath)) return projectResourcesPath;
+        LOGGER.log(Level.WARNING, () -> "Could not resolve relative image path: " + imagePath);
         return null;
     }
 
@@ -308,12 +281,14 @@ public static Path resolveImagePath(String imagePath) {
      * @param imageType type of image (e.g., "profile", "post", "default")
      * @return path to a fallback image, or null if no fallback available
      */
+    private static final String DEFAULT_MISSING_IMAGE = PROJECT_RESOURCES + "/com/starlight/images/missing.png";
+
     public static String getFallbackImagePath(String imageType) {
-        String fallbackPath = "src/main/resources/com/starlight/images/missing.png";
+        // Potential hook for different fallback images per type in future.
+        String fallbackPath = DEFAULT_MISSING_IMAGE;
         Path resolvedPath = resolveImagePath(fallbackPath);
-        if (resolvedPath != null) {
-            return resolvedPath.toString();
-        }
+        if (resolvedPath != null) return resolvedPath.toString();
+        LOGGER.log(Level.WARNING, () -> "No fallback image available for type: " + imageType);
         return null;
     }
 
@@ -331,11 +306,10 @@ public static String resolveImagePathWithFallback(String imagePath, String image
         
         String fallbackPath = getFallbackImagePath(imageType);
         if (fallbackPath != null) {
-            LOGGER.info("Using fallback image for: " + imagePath);
+            LOGGER.log(Level.INFO, () -> "Using fallback image for: " + imagePath);
             return fallbackPath;
         }
-        
-        LOGGER.severe("No image found for path: " + imagePath);
+        LOGGER.log(Level.SEVERE, () -> "No image found for path: " + imagePath);
         return null;
     }
 }

From 5348065604184cc094788b3cb82bda8496fb5114 Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Fri, 22 Aug 2025 08:21:40 +0700
Subject: [PATCH 8/9] minor fix

---
 .../controller/SplashScreenController.java    | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/starlight/controller/SplashScreenController.java b/src/main/java/com/starlight/controller/SplashScreenController.java
index 3474813..a4e3065 100644
--- a/src/main/java/com/starlight/controller/SplashScreenController.java
+++ b/src/main/java/com/starlight/controller/SplashScreenController.java
@@ -1,6 +1,22 @@
 package com.starlight.controller;
 
-public interface SplashScreenController {
+import javafx.fxml.Initializable;
+import java.net.URL;
+import java.util.ResourceBundle;
+import java.util.logging.Logger;
 
-    
-}  
+/**
+ * Splash screen controller backing the splashScreen.fxml.
+ * Previously declared as an interface causing FXML instantiation failure (NoSuchMethodException).
+ */
+public class SplashScreenController implements Initializable {
+	private static final Logger logger = Logger.getLogger(SplashScreenController.class.getName());
+
+	private SplashScreenController() {}
+
+	@Override
+	public void initialize(URL location, ResourceBundle resources) {
+		// No initialization logic yet – placeholder for potential progress animation.
+		logger.fine("SplashScreen initialized");
+	}
+}

From 5f5bb211822ba7d30bdf7b1ef02b146ee07f3628 Mon Sep 17 00:00:00 2001
From: ZanDev32 <52073144+ZanDev32@users.noreply.github.com>
Date: Sat, 23 Aug 2025 18:04:49 +0700
Subject: [PATCH 9/9] Fix Test Files

---
 pom.xml                                       |  60 +++------
 .../controller/AuthorizationController.java   |   8 +-
 .../controller/SplashScreenController.java    |   8 +-
 .../com/starlight/api/ChatbotAPITest.java     |  24 ++--
 .../com/starlight/api/UserApiServerTest.java  | 127 +++++++++++-------
 5 files changed, 124 insertions(+), 103 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6fcd2fa..865755d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>com.starlight</groupId>
     <artifactId>tabemonpal</artifactId>
-    <version>1.0-ALPHA</version>
+    <version>1.1-ALPHA</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -99,6 +99,12 @@
             <version>17.0.10</version>
             <scope>test</scope>
          </dependency>
+        <dependency>
+            <groupId>org.awaitility</groupId>
+            <artifactId>awaitility</artifactId>
+            <version>4.2.0</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -144,40 +150,14 @@
                     </filesets>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.openjfx</groupId>
-                <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.8</version>
-                <configuration>
-                    <mainClass>com.starlight.App</mainClass>
-                    <commandlineArgs>
-                        --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
-                        --add-exports=javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui=org.testfx
-                        --add-opens=javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
-                        --add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
-                        --add-opens=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.glass.ui.monocle.input.devices=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.glass.ui.monocle=org.testfx
-                        --add-exports=javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED,org.testfx.monocle
-                        --add-opens=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui.monocle.input=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui.monocle.input.devices=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.javafx.application.HostServicesDelegate=ALL-UNNAMED
-                    </commandlineArgs>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.0.0-M9</version>
                 <configuration>
+                    <!-- Run tests on the classpath (not module path) so TestFX/Monocle can access internal Glass classes -->
+                    <useModulePath>false</useModulePath>
+                    <!-- Minimal internal access + headless flags (removed invalid/duplicate opens to silence warnings) -->
                     <argLine>
                         --add-exports=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
                         --add-opens=javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
@@ -185,25 +165,19 @@
                         --add-opens=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED
                         --add-exports=javafx.graphics/com.sun.javafx.util=ALL-UNNAMED
                         --add-exports=javafx.base/com.sun.javafx.logging=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui=org.testfx
                         --add-opens=javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
+                        --add-exports=javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
                         --add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
                         --add-opens=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.glass.ui.monocle.input.devices=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.glass.ui.monocle=org.testfx
-                        --add-exports=javafx.graphics/com.sun.glass.ui.monocle=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.glass.ui=ALL-UNNAMED,org.testfx.monocle
-                        --add-opens=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
-                        --add-exports=javafx.graphics/com.sun.javafx.tk=ALL-UNNAMED
                         --add-exports=javafx.graphics/com.sun.glass.ui.monocle.input=ALL-UNNAMED
                         --add-exports=javafx.graphics/com.sun.glass.ui.monocle.input.devices=ALL-UNNAMED
-                        --add-opens=javafx.graphics/com.sun.javafx.application.HostServicesDelegate=ALL-UNNAMED
-                        --add-opens=com.starlight/com.starlight=ALL-UNNAMED
-                        --add-opens=com.starlight/com.starlight.api=ALL-UNNAMED
-                        --add-opens=com.starlight/com.starlight.model=ALL-UNNAMED
-                        --add-opens=com.starlight/com.starlight.util=ALL-UNNAMED
-                        --add-opens=com.starlight/com.starlight.controller=ALL-UNNAMED
+                        -Dtestfx.headless=true -Dprism.order=sw -Dprism.verbose=false -Djava.awt.headless=true
                     </argLine>
+                    <systemPropertyVariables>
+                        <testfx.headless>true</testfx.headless>
+                        <prism.order>sw</prism.order>
+                        <java.awt.headless>true</java.awt.headless>
+                    </systemPropertyVariables>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/com/starlight/controller/AuthorizationController.java b/src/main/java/com/starlight/controller/AuthorizationController.java
index bb2b3a1..d05d885 100644
--- a/src/main/java/com/starlight/controller/AuthorizationController.java
+++ b/src/main/java/com/starlight/controller/AuthorizationController.java
@@ -50,13 +50,17 @@ public void initialize(URL location, ResourceBundle resources) {
      * Shows the login view in the right section of the BorderPane.
      */
     public void showLoginView() {
-        authPanel.setRight(loginView);
+        if (authPanel != null && loginView != null) {
+            authPanel.setRight(loginView);
+        }
     }
     
     /**
      * Shows the register view in the right section of the BorderPane.
      */
     public void showRegisterView() {
-        authPanel.setRight(registerView);
+        if (authPanel != null && registerView != null) {
+            authPanel.setRight(registerView);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/starlight/controller/SplashScreenController.java b/src/main/java/com/starlight/controller/SplashScreenController.java
index a4e3065..5e1e48e 100644
--- a/src/main/java/com/starlight/controller/SplashScreenController.java
+++ b/src/main/java/com/starlight/controller/SplashScreenController.java
@@ -12,7 +12,13 @@
 public class SplashScreenController implements Initializable {
 	private static final Logger logger = Logger.getLogger(SplashScreenController.class.getName());
 
-	private SplashScreenController() {}
+	/**
+	 * Public no-arg constructor required by the JavaFX FXMLLoader to instantiate
+	 * the controller. (Was private causing IllegalAccessException in tests.)
+	 */
+	public SplashScreenController() {
+		// Intentionally empty
+	}
 
 	@Override
 	public void initialize(URL location, ResourceBundle resources) {
diff --git a/src/test/java/com/starlight/api/ChatbotAPITest.java b/src/test/java/com/starlight/api/ChatbotAPITest.java
index 4aa0490..f4b1a93 100644
--- a/src/test/java/com/starlight/api/ChatbotAPITest.java
+++ b/src/test/java/com/starlight/api/ChatbotAPITest.java
@@ -96,20 +96,22 @@ void testJsonResponseParsingWithEscapedCharacters() throws ChatbotAPI.ChatbotExc
         // Test JSON parsing with escaped characters
         ChatbotAPI chatbot = new ChatbotAPI();
         
-                String mockResponse = """
+        // Note: In JSON, embedded quotes and newline must be escaped. In a Java text block
+        // we need to double the backslash so the generated JSON still contains the escape.
+        String mockResponse = """
+                {
+                    "choices": [
                         {
-                            "choices": [
-                                {
-                                    "message": {
-                                        "content": "Hello! I can help with \"nutrition\" and \n food advice."
-                                    }
-                                }
-                            ]
+                            "message": {
+                                "content": "Hello! I can help with \\\"nutrition\\\" and \\n food advice."
+                            }
                         }
-                        """;
+                    ]
+                }
+                """;
         
-        String result = chatbot.parseResponse(mockResponse);
-        assertEquals("Hello! I can help with \"nutrition\" and \n food advice.", result);
+    String result = chatbot.parseResponse(mockResponse);
+    assertEquals("Hello! I can help with \"nutrition\" and \n food advice.", result);
     }
     
     @Test
diff --git a/src/test/java/com/starlight/api/UserApiServerTest.java b/src/test/java/com/starlight/api/UserApiServerTest.java
index 621ac5e..ecb84d4 100644
--- a/src/test/java/com/starlight/api/UserApiServerTest.java
+++ b/src/test/java/com/starlight/api/UserApiServerTest.java
@@ -4,6 +4,7 @@
 
 import java.io.IOException;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -33,7 +34,7 @@ void tearDown() {
     }
     
     @Test
-    void testServerConstruction() throws IOException {
+    void testServerConstruction() {
         // Test that server can be constructed without throwing
         assertDoesNotThrow(() -> {
             int testPort = 9100 + rng.nextInt(500);
@@ -44,21 +45,25 @@ void testServerConstruction() throws IOException {
     }
     
     @Test
-    void testServerConstructionWithPortInUse() throws IOException {
+    void testServerConstructionWithPortInUse() {
         // Start first server
-    int basePort = 9200 + rng.nextInt(100);
-        UserApiServer firstServer = new UserApiServer(basePort);
-        firstServer.start();
-        
+        int basePort = 9200 + rng.nextInt(100);
         try {
-            // Creating second server on same port should work (it will find next available port)
-            assertDoesNotThrow(() -> {
-                UserApiServer secondServer = new UserApiServer(basePort);
-                assertNotNull(secondServer);
-                secondServer.stop();
-            });
-        } finally {
-            firstServer.stop();
+            UserApiServer firstServer = new UserApiServer(basePort);
+            firstServer.start();
+            
+            try {
+                // Creating second server on same port should work (it will find next available port)
+                assertDoesNotThrow(() -> {
+                    UserApiServer secondServer = new UserApiServer(basePort);
+                    assertNotNull(secondServer);
+                    secondServer.stop();
+                });
+            } finally {
+                firstServer.stop();
+            }
+        } catch (IOException e) {
+            fail("Failed to create test server: " + e.getMessage());
         }
     }
     
@@ -82,9 +87,19 @@ void testStartStopCycle() {
         // Test start/stop cycle (Note: HttpServer cannot be restarted once stopped)
         assertDoesNotThrow(() -> {
             server.start();
-            Thread.sleep(10); // Give server time to start
+            // Give server time to start - using a small wait
+            try {
+                TimeUnit.MILLISECONDS.sleep(10);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
             server.stop();
-            Thread.sleep(10); // Give server time to stop
+            // Give server time to stop
+            try {
+                TimeUnit.MILLISECONDS.sleep(10);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
             // Cannot restart the same HttpServer instance - this is a Java HttpServer limitation
         });
     }
@@ -125,11 +140,21 @@ void testServerState() {
             
             // Start server
             server.start();
-            Thread.sleep(10); // Give server time to start
+            // Give server time to start
+            try {
+                TimeUnit.MILLISECONDS.sleep(10);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
             
             // Stop server
             server.stop();
-            Thread.sleep(10); // Give server time to stop
+            // Give server time to stop
+            try {
+                TimeUnit.MILLISECONDS.sleep(10);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+            }
             
             // Note: HttpServer cannot be restarted once stopped - this is a Java limitation
             // So we don't test restart here
@@ -137,10 +162,10 @@ void testServerState() {
     }
     
     @Test
-    void testRestartWithNewInstance() throws IOException {
+    void testRestartWithNewInstance() {
         // Test restart functionality by creating new server instances
         // (since HttpServer cannot be restarted once stopped)
-            int testPort = 9800 + rng.nextInt(100);
+        int testPort = 9800 + rng.nextInt(100);
         
         assertDoesNotThrow(() -> {
             // First instance
@@ -156,26 +181,31 @@ void testRestartWithNewInstance() throws IOException {
     }
     
     @Test
-    void testMultipleServerInstances() throws IOException {
+    void testMultipleServerInstances() {
         // Test that multiple server instances can coexist (on different ports)
-    int port1 = 9300 + rng.nextInt(50);
-    int port2 = 9350 + rng.nextInt(50);
-        UserApiServer server1 = new UserApiServer(port1);
-        UserApiServer server2 = new UserApiServer(port2);
+        int port1 = 9300 + rng.nextInt(50);
+        int port2 = 9350 + rng.nextInt(50);
         
         try {
-            assertDoesNotThrow(() -> {
-                server1.start();
-                server2.start();
-            });
+            UserApiServer server1 = new UserApiServer(port1);
+            UserApiServer server2 = new UserApiServer(port2);
             
-            assertDoesNotThrow(() -> {
+            try {
+                assertDoesNotThrow(() -> {
+                    server1.start();
+                    server2.start();
+                });
+                
+                assertDoesNotThrow(() -> {
+                    server1.stop();
+                    server2.stop();
+                });
+            } finally {
                 server1.stop();
                 server2.stop();
-            });
-        } finally {
-            server1.stop();
-            server2.stop();
+            }
+        } catch (IOException e) {
+            fail("Failed to create test servers: " + e.getMessage());
         }
     }
     
@@ -192,23 +222,28 @@ void testServerConstructionPortRange() {
     }
     
     @Test
-    void testServerResourceCleanup() throws IOException {
+    void testServerResourceCleanup() {
         // Test that server properly cleans up resources
-    int testPort = 9500 + rng.nextInt(100);
-        UserApiServer testServer = new UserApiServer(testPort);
-        
-        testServer.start();
-        testServer.stop();
+        int testPort = 9500 + rng.nextInt(100);
         
-        // Should be able to create another server on same port after proper cleanup
-        assertDoesNotThrow(() -> {
-            UserApiServer secondServer = new UserApiServer(testPort);
-            secondServer.stop();
-        });
+        try {
+            UserApiServer testServer = new UserApiServer(testPort);
+            
+            testServer.start();
+            testServer.stop();
+            
+            // Should be able to create another server on same port after proper cleanup
+            assertDoesNotThrow(() -> {
+                UserApiServer secondServer = new UserApiServer(testPort);
+                secondServer.stop();
+            });
+        } catch (IOException e) {
+            fail("Failed to create test server: " + e.getMessage());
+        }
     }
     
     @Test
-    void testServerStartAfterException() throws IOException {
+    void testServerStartAfterException() {
         // Test that server can be started after handling construction exceptions
         try {
             // This should succeed since we handle port conflicts