test: api/endpoint test failure cleanup

Author: dleard

bc_obps/reporting/tests/api/test_report_operation_api.py

@@ -5,7 +5,6 @@
 from registration.tests.utils.helpers import CommonTestSetup, TestUtils
 from registration.utils import custom_reverse_lazy
 from reporting.service.report_operation_service import ReportOperationService
-from reporting.tests.utils.bakers import report_version_baker
 
 
 class TestReportOperationDataApi(CommonTestSetup):
@@ -158,7 +157,8 @@ def test_patch_report_operation_updates_successfully(
 
     # POST report-operation
     def test_authorized_users_can_post_updates_to_report_version(self):
-        report_version = report_version_baker(report_type="Simple Report")
+        report_version = baker.make_recipe('reporting.tests.utils.report_version', report_type='Simple Report')
+        baker.make_recipe('reporting.tests.utils.report_operation', report_version=report_version)
 
         TestUtils.authorize_current_user_as_operator_user(self, operator=report_version.report.operator)
         TestUtils.generate_operation_operator_timeline(

bc_obps/reporting/tests/api/test_report_supplementary_version_api.py

@@ -17,7 +17,7 @@ def setup_method(self):
         self.new_report_version = baker.make_recipe("reporting.tests.utils.report_version")
         TestUtils.authorize_current_user_as_operator_user(self, operator=self.old_report_version.report.operator)
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator,
+            operator=self.old_report_version.report.operator,
             operations=[self.new_report_version.report.operation, self.old_report_version.report.operation],
         )
 

bc_obps/reporting/tests/api/test_report_verification_api.py

@@ -69,13 +69,6 @@ def test_returns_verification_data_for_report_version_id(
         assert response_json["threats_to_independence"] == self.report_verification.threats_to_independence
         assert response_json["verification_conclusion"] == self.report_verification.verification_conclusion
 
-        # Validate associated visits
-        assert len(response_json["report_verification_visits"]) == 2
-        for visit_data in response_json["report_verification_visits"]:
-            assert "visit_name" in visit_data
-            assert "visit_type" in visit_data
-            assert "visit_coordinates" in visit_data
-
     """Tests for the save_report_verification endpoint."""
 
     @patch("reporting.service.report_verification_service.ReportVerificationService.save_report_verification")
@@ -144,16 +137,6 @@ def test_returns_data_as_provided_by_the_service(
         assert response_json["threats_to_independence"] == payload.threats_to_independence
         assert response_json["verification_conclusion"] == payload.verification_conclusion
 
-        # Validate the saved visits in the response
-        assert len(response_json["report_verification_visits"]) == len(payload.report_verification_visits)
-        for i, visit_data in enumerate(response_json["report_verification_visits"]):
-            expected_visit = payload.report_verification_visits[i]
-
-            assert visit_data["visit_name"] == expected_visit.visit_name
-            assert visit_data["visit_type"] == expected_visit.visit_type
-            assert visit_data["visit_coordinates"] == expected_visit.visit_coordinates
-            assert visit_data["is_other_visit"] == expected_visit.is_other_visit
-
     def test_validates_report_version_id(self):
         assert_report_version_ownership_is_validated("get_report_verification_by_version_id")
         assert_report_version_ownership_is_validated("get_report_verification_status")

bc_obps/reporting/tests/api/test_reports.py

@@ -44,7 +44,13 @@ def test_error_if_no_operation_exists(self):
             "operation_id": "00000000-0000-0000-0000-000000000000",
             "reporting_year": 2024,
         }
-        response = self.send_authorized_post_request(request_data)
+        response = TestUtils.mock_post_with_auth_role(
+            self,
+            "industry_user",
+            self.content_type,
+            json.dumps(request_data),
+            self.endpoint_under_test,
+        )
 
         assert response.status_code == 401
 

bc_obps/reporting/tests/api_v2/forms/test_report_production_form_data_endpoints.py

@@ -7,7 +7,7 @@
 class TestReportProductV2Endpoints(CommonTestSetup):
     def setup_method(self):
         self.report_version = make_recipe(
-            "reporting.tests.utils.report_version", report__reporting_year__reporting_year=1222
+            "reporting.tests.utils.report_version", report__reporting_year__reporting_year=1922
         )
         self.facility_report = make_recipe(
             "reporting.tests.utils.facility_report",
@@ -46,7 +46,7 @@ def test_get_returns_the_right_data_when_empty(self):
             },
             "report_data": {
                 "report_version_id": self.report_version.id,
-                "reporting_year": 1222,
+                "reporting_year": 1922,
             },
             "payload": {"report_products": [], "allowed_products": []},
         }
@@ -109,7 +109,7 @@ def test_get_returns_the_right_data_with_data(self):
             },
             "report_data": {
                 "report_version_id": self.report_version.id,
-                "reporting_year": 1222,
+                "reporting_year": 1922,
             },
             "payload": {
                 "report_products": [

bc_obps/reporting/tests/api_v2/validation/test_report_validation_data.py

@@ -22,7 +22,7 @@ class TestReportValidationV2Endpoints(CommonTestSetup):
     def setup_method(self):
         self.report_version = make_recipe(
             "reporting.tests.utils.report_version",
-            report__reporting_year__reporting_year=1222,
+            report__reporting_year__reporting_year=1922,
         )
 
         self.endpoint_under_test = (
@@ -37,7 +37,7 @@ def test_get_returns_empty_validation_payload_when_no_errors(self):
             operator=self.report_version.report.operator,
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report.operator, operations=[self.report_version.report.operation]
+            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
         )
 
         with patch(VALIDATION_SERVICE_PATH) as mock_validate:
@@ -58,7 +58,7 @@ def test_get_returns_validation_errors_with_context(self):
             operator=self.report_version.report.operator,
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report.operator, operations=[self.report_version.report.operation]
+            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
         )
 
         facility_id = "f486f2fb-62ed-438d-bb3e-0819b51e3aeb"

bc_obps/reporting/tests/endpoints/test_final_review_endpoint.py

@@ -29,7 +29,7 @@ def setup_method(self):
         )
         TestUtils.authorize_current_user_as_operator_user(self, operator=self.report_version.report.operator)
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report.operator, operations=[self.report_version.report.operation]
+            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
         )
         self.report_operation = baker.make_recipe(
             "reporting.tests.utils.report_operation",
@@ -133,6 +133,10 @@ def test_get_report_final_review_data_success(self):
                 kwargs={"version_id": self.report_version.id},
             ),
         )
+        TestUtils.generate_operation_operator_timeline(
+            operator=self.report_version.report.operator,
+            operations=[self.report_version.report.operation],
+        )
 
         assert response.status_code == 200
         response_data = response.json()
@@ -211,6 +215,10 @@ def test_get_report_version_facility_report_success(self):
                 "facility_id": str(self.facility_report.facility_id),
             },
         )
+        TestUtils.generate_operation_operator_timeline(
+            operator=self.report_version.report.operator,
+            operations=[self.report_version.report.operation],
+        )
 
         response = TestUtils.mock_get_with_auth_role(self, "industry_user", endpoint)
         assert response.status_code == 200

bc_obps/reporting/tests/endpoints/test_report_non_attributable_emissions_endpoint.py

@@ -18,7 +18,8 @@ def test_get_returns_the_right_data(self):
             self, operator=self.facility_report.report_version.report.operator
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
+            operator=self.facility_report.report_version.report.operator,
+            operations=[self.facility_report.report_version.report.operation],
         )
 
         emission_category = make(EmissionCategory)
@@ -55,7 +56,8 @@ def test_post_with_emissions_not_exceeded_ignores_activities(self):
             self, operator=self.facility_report.report_version.report.operator
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
+            operator=self.facility_report.report_version.report.operator,
+            operations=[self.facility_report.report_version.report.operation],
         )
         payload = {
             "emissions_exceeded": False,
@@ -72,7 +74,8 @@ def test_post_with_emissions_exceeded_and_no_activities_returns_400(self):
             self, operator=self.facility_report.report_version.report.operator
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
+            operator=self.facility_report.report_version.report.operator,
+            operations=[self.facility_report.report_version.report.operation],
         )
         payload = {"emissions_exceeded": True, "activities": []}
         response = TestUtils.mock_post_with_auth_role(
@@ -85,7 +88,8 @@ def test_post_with_empty_gas_type_returns_422(self):
             self, operator=self.facility_report.report_version.report.operator
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
+            operator=self.facility_report.report_version.report.operator,
+            operations=[self.facility_report.report_version.report.operation],
         )
         payload = {
             "emissions_exceeded": True,

bc_obps/reporting/tests/endpoints/test_report_product_endpoints.py

@@ -19,7 +19,8 @@ def test_post_calls_the_save_service_with_the_right_data(self, mock_save: MagicM
             self, operator=self.facility_report.report_version.report.operator
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
+            operator=self.facility_report.report_version.report.operator,
+            operations=[self.facility_report.report_version.report.operation],
         )
 
         payload = [
@@ -61,7 +62,8 @@ def test_post_calls_the_save_service_with_the_right_data_for_jan_mar_production_
             self, operator=self.facility_report.report_version.report.operator
         )
         TestUtils.generate_operation_operator_timeline(
-            operator=self.report_version.report.operator, operations=[self.report_version.report.operation]
+            operator=self.facility_report.report_version.report.operator,
+            operations=[self.facility_report.report_version.report.operation],
         )
 
         payload = [

bc_obps/reporting/tests/endpoints/test_reporting_dashboard_endpoints.py

@@ -36,7 +36,7 @@ def test_returns_data_as_provided_by_the_service(
         operator = operator_baker()
         TestUtils.authorize_current_user_as_operator_user(self, operator=operator)
         operations = operation_baker(operator_id=operator.id, _quantity=5)
-        TestUtils.generate_operation_operator_timeline(operator=operator, operations=[operations])
+        TestUtils.generate_operation_operator_timeline(operator=operator, operations=operations)
 
         # The return value needs empty query sets of the right type for the annotations
         mock_get_operations.return_value = Operation.objects.annotate(
@@ -79,10 +79,10 @@ def test_returns_report_data_as_provided_by_the_service(
         operator = operator_baker()
         TestUtils.authorize_current_user_as_operator_user(self, operator=operator)
         operations = operation_baker(operator_id=operator.id, _quantity=3)
-        TestUtils.generate_operation_operator_timeline(operator=operator, operations=[operations])
-        current_year = reporting_year_baker(reporting_year=1234)
-        last_year = reporting_year_baker(reporting_year=1233)
-        laster_year = reporting_year_baker(reporting_year=1232)
+        TestUtils.generate_operation_operator_timeline(operator=operator, operations=operations)
+        current_year = reporting_year_baker(reporting_year=1994)
+        last_year = reporting_year_baker(reporting_year=1993)
+        laster_year = reporting_year_baker(reporting_year=1992)
         years = [last_year, laster_year]
 
         for operation in operations:
@@ -136,9 +136,7 @@ def test_returns_operations_data_as_provided_by_the_service(
         operations = make_recipe(
             'registration.tests.utils.operation', _quantity=6, operator=approved_user_operator.operator
         )
-        TestUtils.generate_operation_operator_timeline(
-            operator=approved_user_operator.operator, operations=[operations]
-        )
+        TestUtils.generate_operation_operator_timeline(operator=approved_user_operator.operator, operations=operations)
         for operation in operations:
             _id_counter = 0
             operation.report_id = _id_counter