test

Author: qcdyx

api/src/feeds/impl/models/latest_dataset_impl.py

@@ -2,6 +2,7 @@
 
 from shared.database_gen.sqlacodegen_models import Gtfsdataset
 from feeds.impl.models.bounding_box_impl import BoundingBoxImpl
+from feeds.impl.models.validation_report_impl import ValidationReportImpl
 from feeds_gen.models.latest_dataset import LatestDataset
 from feeds_gen.models.latest_dataset_validation_report import LatestDatasetValidationReport
 from utils.model_utils import compare_java_versions
@@ -29,13 +30,21 @@ def from_orm(cls, dataset: Gtfsdataset | None) -> LatestDataset | None:
                 lambda a, b: a if compare_java_versions(a.validator_version, b.validator_version) == 1 else b,
                 dataset.validation_reports,
             )
+            (
+                total_error,
+                total_info,
+                total_warning,
+                unique_error_count,
+                unique_info_count,
+                unique_warning_count,
+            ) = ValidationReportImpl.compute_totals(latest_report)
             validation_report = LatestDatasetValidationReport(
-                total_error=latest_report.total_error,
-                total_warning=latest_report.total_warning,
-                total_info=latest_report.total_info,
-                unique_error_count=latest_report.unique_error_count,
-                unique_warning_count=latest_report.unique_warning_count,
-                unique_info_count=latest_report.unique_info_count,
+                total_error=total_error,
+                total_warning=total_warning,
+                total_info=total_info,
+                unique_error_count=unique_error_count,
+                unique_warning_count=unique_warning_count,
+                unique_info_count=unique_info_count,
             )
         return cls(
             id=dataset.stable_id,

api/src/feeds/impl/models/validation_report_impl.py

@@ -16,26 +16,26 @@ class Config:
 
         from_attributes = True
 
-    # @staticmethod
-    # def compute_totals(validation_report) -> tuple[int, int, int, int, int, int]:
-    #     """Compute the total number of errors, info, and warnings from a validation report,
-    #     and count the number of distinct codes for each."""
-    #     total_info, total_warning, total_error = 0, 0, 0
-    #     info_codes, warning_codes, error_codes = set(), set(), set()
-    #     for notice in validation_report.notices:
-    #         match notice.severity:
-    #             case "INFO":
-    #                 total_info += notice.total_notices
-    #                 info_codes.add(notice.notice_code)
-    #             case "WARNING":
-    #                 total_warning += notice.total_notices
-    #                 warning_codes.add(notice.notice_code)
-    #             case "ERROR":
-    #                 total_error += notice.total_notices
-    #                 error_codes.add(notice.notice_code)
-    #             case _:
-    #                 ValidationReportImpl._get_logger().warning(f"Unknown severity: {notice.severity}")
-    #     return total_error, total_info, total_warning, len(error_codes), len(info_codes), len(warning_codes)
+    @staticmethod
+    def compute_totals(validation_report) -> tuple[int, int, int, int, int, int]:
+        """Compute the total number of errors, info, and warnings from a validation report,
+        and count the number of distinct codes for each."""
+        total_info, total_warning, total_error = 0, 0, 0
+        info_codes, warning_codes, error_codes = set(), set(), set()
+        for notice in validation_report.notices:
+            match notice.severity:
+                case "INFO":
+                    total_info += notice.total_notices
+                    info_codes.add(notice.notice_code)
+                case "WARNING":
+                    total_warning += notice.total_notices
+                    warning_codes.add(notice.notice_code)
+                case "ERROR":
+                    total_error += notice.total_notices
+                    error_codes.add(notice.notice_code)
+                case _:
+                    ValidationReportImpl._get_logger().warning(f"Unknown severity: {notice.severity}")
+        return total_error, total_info, total_warning, len(error_codes), len(info_codes), len(warning_codes)
 
     @classmethod
     def _get_logger(cls):