chore: cleanup

Author: shon-button

bc_obps/service/operation_service.py

@@ -754,6 +754,14 @@ def handle_change_of_registration_purpose(
 
         return payload
 
+    @staticmethod
+    def _is_reportable_operation_year(
+        operation_year: tuple[UUID, int],
+        added_operation_years: set[tuple[UUID, int]],
+        existing_reports: set[tuple[UUID, int]],
+    ) -> bool:
+        return operation_year not in added_operation_years and operation_year not in existing_reports
+
     @classmethod
     def _get_previous_reporting_years(cls) -> QuerySet[ReportingYear]:
         """
@@ -788,9 +796,9 @@ def list_previous_reportable_operations(
         user_guid: UUID,
     ) -> list[dict]:
         """
-        Returns the reporting year/operation  combinations for which the current user is eligible to create a report
+        Returns the reporting year/operation combinations for which the current user is eligible to create a report
 
-        An reporting year/operation  combination is eligible if:
+        An reporting year/operation combination is eligible if:
         1. The operation was designated to the user's operator for that reporting year, or
         2. The operation is currently registered to the user's operator as a fallback
 
@@ -802,7 +810,6 @@ def list_previous_reportable_operations(
         reporting_years = cls._get_previous_reporting_years()
         year_values = {reporting_year.reporting_year for reporting_year in reporting_years}
 
-        # Find all registered operation timelines associated with the user's operator
         timelines = list(
             OperationDesignatedOperatorTimeline.objects.select_related("operation")
             .filter(
@@ -812,7 +819,6 @@ def list_previous_reportable_operations(
             .order_by("operation__name", "start_date")
         )
 
-        # Find all currently registered operations for fallback handling
         current_registered_operations = list(
             Operation.objects.filter(
                 operator_id=user_operator.operator_id,
@@ -824,7 +830,6 @@ def list_previous_reportable_operations(
             operation.id for operation in current_registered_operations
         }
 
-        # Bulk fetch existing reports
         existing_reports = set(
             Report.objects.filter(
                 operation_id__in=all_operation_ids,
@@ -835,7 +840,6 @@ def list_previous_reportable_operations(
             )
         )
 
-        # Bulk fetch designated operator timelines
         designations_lookup = (
             OperationDesignatedOperatorTimelineService.get_operation_designated_operators_for_reporting_years(
                 operation_ids=all_operation_ids,
@@ -846,52 +850,50 @@ def list_previous_reportable_operations(
         reportable_operations: list[dict] = []
         added_operation_years: set[tuple[UUID, int]] = set()
 
-        # Add combinations that are valid based on historical designated operator timelines
         for timeline in timelines:
             for reporting_year in reporting_years:
                 operation_year = (
                     timeline.operation.id,
                     reporting_year.reporting_year,
                 )
 
-                if operation_year in added_operation_years:
-                    continue
-
-                if operation_year in existing_reports:
+                if not cls._is_reportable_operation_year(
+                    operation_year,
+                    added_operation_years,
+                    existing_reports,
+                ):
                     continue
 
                 designated_operator_timeline = designations_lookup.get(operation_year)
 
-                if not designated_operator_timeline:
-                    continue
-
-                if designated_operator_timeline.operator.id != user_operator.operator_id:
-                    continue
-
-                reportable_operations.append(
-                    {
-                        **cls._build_reportable_operation_row(
-                            timeline,
-                            reporting_year,
-                        ),
-                        "is_current_registered_fallback": False,
-                    }
-                )
+                if (
+                    designated_operator_timeline
+                    and designated_operator_timeline.operator.id == user_operator.operator_id
+                ):
+                    reportable_operations.append(
+                        {
+                            **cls._build_reportable_operation_row(
+                                timeline,
+                                reporting_year,
+                            ),
+                            "is_current_registered_fallback": False,
+                        }
+                    )
 
-                added_operation_years.add(operation_year)
+                    added_operation_years.add(operation_year)
 
-        # Fallback: include current registered operations for operation/year combinations not already returned by the historical designation logic
         for operation in current_registered_operations:
             for reporting_year in reporting_years:
                 operation_year = (
                     operation.id,
                     reporting_year.reporting_year,
                 )
 
-                if operation_year in added_operation_years:
-                    continue
-
-                if operation_year in existing_reports:
+                if not cls._is_reportable_operation_year(
+                    operation_year,
+                    added_operation_years,
+                    existing_reports,
+                ):
                     continue
 
                 reportable_operations.append(

bciers/apps/reporting/src/app/components/report/StartReportForm.tsx

@@ -49,7 +49,7 @@ export default function StartReportForm({
       return;
     }
 
-    router.push(`/reporting/reports/${response}/review-operation-information`);
+    router.push(`/reports/${response}/review-operation-information`);
   };
 
   return (