sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewController.java (1)

313-356: Bug: caze.setTherapy(therapy) is never reached.

The method modifies the therapy object but each branch has an early return statement, making line 355 (caze.setTherapy(therapy)) unreachable. The therapy changes are lost and never assigned back to the case.

Proposed fix

     private void updateTherapyBasedOnSelection(CaseDataDto caze, TreatmentOption selectedOption) {

         if (selectedOption == null) {
             return;
         }

         TherapyDto therapy = caze.getTherapy();

         if (therapy == null) {
             therapy = TherapyDto.build();
+            caze.setTherapy(therapy);
         }

         if (selectedOption.equals(TreatmentOption.YES)) {
             therapy.setTreatmentStarted(YesNoUnknown.YES);
             therapy.setTreatmentNotApplicable(false);
             if (therapy.getTreatmentStartDate() == null) {
                 therapy.setTreatmentStartDate(new java.util.Date());
             }
-            return;
+        } else if (selectedOption.equals(TreatmentOption.NO)) {
-        }
-
-        if (selectedOption.equals(TreatmentOption.NO)) {
             therapy.setTreatmentStarted(YesNoUnknown.NO);
             therapy.setTreatmentNotApplicable(false);
             therapy.setTreatmentStartDate(null);
-            return;
+        } else if (selectedOption.equals(TreatmentOption.NOT_APPLICABLE)) {
-        }
-
-        if (selectedOption.equals(TreatmentOption.NOT_APPLICABLE)) {
             therapy.setTreatmentNotApplicable(true);
             therapy.setTreatmentStarted(null);
             therapy.setTreatmentStartDate(null);
-            return;
+        } else if (selectedOption.equals(TreatmentOption.UNKNOWN)) {
-        }
-
-        if (selectedOption.equals(TreatmentOption.UNKNOWN)) {
             therapy.setTreatmentStarted(YesNoUnknown.UNKNOWN);
             therapy.setTreatmentNotApplicable(false);
             therapy.setTreatmentStartDate(null);
-            return;
         }
-
-        caze.setTherapy(therapy);
     }

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewContent.java (2)

61-77: Outdated Javadoc.

The Javadoc at lines 68-70 still references oldestReport parameter, but the constructor signature was changed to accept dateOfDiagnosis and notificationDate.

Proposed fix

     /**
      * Creates a new case notifier side view content.
      * 
      * `@param` caze
      *            the case data
      * `@param` notifier
      *            the notifier details
-     * `@param` oldestReport
-     *            the oldest surveillance report for the case
+     * `@param` dateOfDiagnosis
+     *            the date of diagnosis (may be null)
+     * `@param` notificationDate
+     *            the notification date (may be null)
      */
     public CaseNotifierSideViewContent(CaseDataDto caze, NotifierDto notifier, Date dateOfDiagnosis, Date notificationDate) {

---

149-161: Potential NPE on notifier.getAgentLastName().toUpperCase().

The condition at lines 149-150 uses ||, so the block is entered if either agentFirstName or agentLastName is non-null/non-blank. However, line 158 unconditionally calls toUpperCase() on getAgentLastName(), which will throw NPE if only agentFirstName is set.

Proposed fix

         if ((notifier.getAgentFirstName() != null && !notifier.getAgentFirstName().isBlank())
             || (notifier.getAgentLastName() != null && !notifier.getAgentLastName().isBlank())) {
             // Spacer before Reporting Agent label
             Label spacerAgent = new Label();
             spacerAgent.setHeight("0.1rem");
             addComponent(spacerAgent);
             Label reportingAgent = new Label(I18nProperties.getCaption(Captions.Notification_reportingAgent));
             CssStyles.style(reportingAgent, CssStyles.LABEL_BOLD, CssStyles.LABEL_BOTTOM_LINE);
             addComponent(reportingAgent);
-            Label agentNameLabel = new Label(notifier.getAgentFirstName() + " " + notifier.getAgentLastName().toUpperCase(Locale.ROOT));
+            String firstName = notifier.getAgentFirstName() != null ? notifier.getAgentFirstName() : "";
+            String lastName = notifier.getAgentLastName() != null ? notifier.getAgentLastName().toUpperCase(Locale.ROOT) : "";
+            Label agentNameLabel = new Label((firstName + " " + lastName).trim());
             CssStyles.style(agentNameLabel, CssStyles.LABEL_RELEVANT);
             addComponent(agentNameLabel);
         }

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewContent.java (1)

58-68: Javadoc parameter mismatch with actual constructor signature.

The Javadoc at line 65-66 still documents @param oldestReport but the constructor now accepts Date dateOfDiagnosis and Date notificationDate parameters.

Proposed fix

     /**
      * Creates a new case notifier side view content.
      * 
      * `@param` caze
      *            the case data
      * `@param` notifier
      *            the notifier details
-     * `@param` oldestReport
-     *            the oldest surveillance report for the case
+     * `@param` dateOfDiagnosis
+     *            the date of diagnosis (may be null)
+     * `@param` notificationDate
+     *            the notification date (may be null)
      */
     public CaseNotifierSideViewContent(CaseDataDto caze, NotifierDto notifier, Date dateOfDiagnosis, Date notificationDate) {

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/notifier/CaseNotifierSideViewController.java (1)

104-107: Stale comment references non-existent method.

The comment mentions getDate() but the code uses getReportDate(). Consider updating or removing the comment.

Proposed fix

-        // Filter to get the oldest report
-        return reports.stream()
-            .min(Comparator.comparing(SurveillanceReportDto::getReportDate)) // Assuming getDate() returns the report date
+        return reports.stream()
+            .min(Comparator.comparing(SurveillanceReportDto::getReportDate))
             .orElse(null);