Rj tests (#559)

* administrative penalty integration tests

* restorative justice test cases

* test cases

Author: dinesh-aot

compliance-api/src/compliance_api/resources/charge_recommendation.py

@@ -152,9 +152,10 @@ def patch(charge_recommendation_id):
     @API.response(code=204, description="NoContent")
     def delete(charge_recommendation_id):
         """Delete a charge recommendation."""
-        return ChargeRecommendationService.delete_charge_recommendation(
+        ChargeRecommendationService.delete_charge_recommendation(
             charge_recommendation_id
         )
+        return {}, HTTPStatus.NO_CONTENT
 
 
 @cors_preflight("GET, OPTIONS")

compliance-api/src/compliance_api/resources/restorative_justice.py

@@ -146,9 +146,10 @@ def patch(restorative_justice_id):
     @API.response(code=204, description="NoContent")
     def delete(restorative_justice_id):
         """Delete a restorative justice."""
-        return RestorativeJusticeService.delete_restorative_justice(
+        RestorativeJusticeService.delete_restorative_justice(
             restorative_justice_id
         )
+        return {}, HTTPStatus.NO_CONTENT
 
 
 @cors_preflight("GET, OPTIONS")

compliance-api/src/compliance_api/schemas/charge_recommendation.py

@@ -126,6 +126,7 @@ class Meta:  # pylint: disable=too-few-public-methods
 
         model = ChargeRecommendation
         load_instance = True
+        include_fk = True
 
     court_appearances = fields.String(
         allow_none=True,

compliance-api/src/compliance_api/services/restorative_justice.py

@@ -1,7 +1,5 @@
 """Restorative Justice Service."""
 
-from http import HTTPStatus
-
 from compliance_api.exceptions import BadRequestError, ResourceNotFoundError, UnprocessableEntityError
 from compliance_api.models.case_file import CaseFile as CaseFileModel
 from compliance_api.models.db import session_scope
@@ -146,7 +144,6 @@ def delete_restorative_justice(cls, restorative_justice_id: int):
             RestorativeJusticeInspectionRequirementMap.delete_by_restorative_justice_id(
                 restorative_justice_id, session
             )
-        return HTTPStatus.NO_CONTENT
 
     @classmethod
     def insert_or_update_inspection_requirements(

compliance-api/tests/conftest.py

@@ -30,11 +30,25 @@
 from .utilities.factory_scenario.administrative_penalty_fixture import (  # noqa: F401
     created_administrative_penalty, created_administrative_penalty_inspection_requirement,
     created_administrative_penalty_requirement_map)
+from .utilities.factory_scenario.charge_recommendation_fixture import (  # noqa: F401
+    created_charge_recommendation, created_charge_recommendation_deputy_review, created_charge_recommendation_drafting,
+    created_charge_recommendation_inspection_requirement, created_charge_recommendation_not_proceeding,
+    created_charge_recommendation_requirement_map, created_charge_recommendation_submitted,
+    created_charge_recommendation_with_court_details)
 from .utilities.factory_scenario.common_fixture import (  # noqa: F401
     created_case_file, created_inspection, created_inspection_requirement, created_staff, mock_auth_service,
     mock_doc_gen_service, mock_doc_service, mock_track_service)
 from .utilities.factory_scenario.order_fixture import (  # noqa: F401
     created_order, created_order_requirement_map, created_section)
+from .utilities.factory_scenario.restorative_justice_fixture import (  # noqa: F401
+    created_restorative_justice, created_restorative_justice_closed, created_restorative_justice_drafting,
+    created_restorative_justice_inspection_requirement, created_restorative_justice_open,
+    created_restorative_justice_requirement_map)
+from .utilities.factory_scenario.violation_ticket_fixture import (  # noqa: F401
+    created_violation_ticket, created_violation_ticket_disputed, created_violation_ticket_inspection_requirement,
+    created_violation_ticket_issued, created_violation_ticket_no_fine, created_violation_ticket_paid,
+    created_violation_ticket_requirement_map, created_violation_ticket_with_large_fine,
+    created_violation_ticket_zero_fine)
 from .utilities.factory_utils import factory_auth_header