Merge pull request #88 from tahzeer/1.0

Enhance request handling with new fields and unify record ID logic

Author: venky-ganapathy

openg2p-registry-core/src/openg2p_registry_core/controller_services/g2p_intake_form_controller_service.py

@@ -24,7 +24,7 @@
 class G2PIntakeFormControllerService(BaseService):
     async def save_submission_draft(self, save_submission_draft_request: SaveSubmissionDraftRequest) -> SubmissionResponsePayload:
         payload: SaveSubmissionDraftRequestPayload = save_submission_draft_request.request_body.request_payload
-        created_by = save_submission_draft_request.request_header.sender_app_mnemonic
+        created_by = payload.created_by or save_submission_draft_request.request_header.sender_app_mnemonic
         _logger.info(f"Saving intake form for register_id: {payload.register_id} through controller service")
         g2p_intake_form_service = G2PIntakeFormService.get_component()
         g2p_intake_form: G2PIntakeForm = await g2p_intake_form_service.save_submission_draft(
@@ -48,7 +48,7 @@ async def finalize_submission(self, finalize_submission_request: FinalizeSubmiss
     async def approve_submission(self, approve_submission_request: ApproveRejectSubmissionRequest) -> SubmissionResponsePayload:
         payload: ApproveRejectSubmissionRequestPayload = approve_submission_request.request_body.request_payload
         submission_id = payload.submission_id
-        approved_by = approve_submission_request.request_header.sender_app_mnemonic
+        approved_by = payload.approved_by or approve_submission_request.request_header.sender_app_mnemonic
         _logger.info(f"Approving intake form with submission_id: {submission_id} through controller service")
         g2p_intake_form_service = G2PIntakeFormService.get_component()
         g2p_intake_form: G2PIntakeForm = await g2p_intake_form_service.approve_submission(
@@ -60,7 +60,7 @@ async def approve_submission(self, approve_submission_request: ApproveRejectSubm
     async def reject_submission(self, reject_submission_request: ApproveRejectSubmissionRequest) -> SubmissionResponsePayload:
         payload: ApproveRejectSubmissionRequestPayload = reject_submission_request.request_body.request_payload
         submission_id = payload.submission_id
-        rejected_by = reject_submission_request.request_header.sender_app_mnemonic
+        rejected_by = payload.approved_by or reject_submission_request.request_header.sender_app_mnemonic
         _logger.info(f"Rejecting intake form with submission_id: {submission_id} through controller service")
         g2p_intake_form_service = G2PIntakeFormService.get_component()
         g2p_intake_form: G2PIntakeForm = await g2p_intake_form_service.reject_submission(

openg2p-registry-core/src/openg2p_registry_core/controller_services/g2p_register_change_request_controller_service.py

@@ -27,6 +27,7 @@ async def create_change_request(self, change_request_request: ChangeRequestReque
         _logger.info("Creating change request through controller service")
         g2p_register_service = G2PRegisterService.get_component()
         change_request_request_payload: ChangeRequestRequestPayload = change_request_request.request_body.request_payload
+        created_by = change_request_request_payload.created_by or change_request_request.request_header.sender_app_mnemonic
 
         module = importlib.import_module("openg2p_registry_extensions.register_domain.factory")
         domain_factory_class_name = "G2PRegisterDomainFactory"
@@ -36,7 +37,8 @@ async def create_change_request(self, change_request_request: ChangeRequestReque
 
         g2p_register_change_request: G2PRegisterChangeRequest = await g2p_register_service.create_change_request(
             change_request_request_payload=change_request_request_payload,
-            source_partner_id=change_request_request.request_header.sender_app_mnemonic
+            source_partner_id=change_request_request.request_header.sender_app_mnemonic,
+            created_by=created_by,
         )
 
         change_request_response_payload: ChangeRequestResponsePayload = self._build_change_request_response_payload(change_request_request_payload, g2p_register_change_request)
@@ -45,18 +47,33 @@ async def create_change_request(self, change_request_request: ChangeRequestReque
 
     async def approve_change_request(self, change_request_request: ChangeRequestRequest) -> ChangeRequestResponsePayload:
         change_request_id = change_request_request.request_body.request_payload.change_request_id
+        approved_by = (
+            change_request_request.request_body.request_payload.approved_by
+            or change_request_request.request_header.sender_app_mnemonic
+        )
         _logger.info(f"Approving change request with change_request_id: {change_request_id} through controller service")
         g2p_register_service = G2PRegisterService.get_component()
-        g2p_register_change_request: G2PRegisterChangeRequest = await g2p_register_service.approve_change_request(change_request_id)
+        g2p_register_change_request: G2PRegisterChangeRequest = await g2p_register_service.approve_change_request(
+            change_request_id,
+            approved_by=approved_by,
+        )
         change_request_response_payload: ChangeRequestResponsePayload = self._build_change_request_response_payload(None, g2p_register_change_request)
         return change_request_response_payload
 
     async def reject_change_request(self, change_request_request: ChangeRequestRequest) -> ChangeRequestResponsePayload:
         change_request_id = change_request_request.request_body.request_payload.change_request_id
         rejection_reason: str = getattr(change_request_request.request_body.request_payload, 'rejection_reason', None)
+        rejected_by = (
+            change_request_request.request_body.request_payload.approved_by
+            or change_request_request.request_header.sender_app_mnemonic
+        )
         _logger.info(f"Rejecting change request with change_request_id: {change_request_id} through controller service")
         g2p_register_service = G2PRegisterService.get_component()
-        g2p_register_change_request: G2PRegisterChangeRequest = await g2p_register_service.reject_change_request(change_request_id, rejection_reason)
+        g2p_register_change_request: G2PRegisterChangeRequest = await g2p_register_service.reject_change_request(
+            change_request_id,
+            rejection_reason,
+            rejected_by=rejected_by,
+        )
         change_request_response_payload: ChangeRequestResponsePayload = self._build_change_request_response_payload(None, g2p_register_change_request)
         return change_request_response_payload
 

openg2p-registry-core/src/openg2p_registry_core/schemas/register_payload.py

@@ -333,6 +333,8 @@ class ChangeRequestRequestPayload(RegisterPayload):
     # For approve/reject operations
     change_request_id: Optional[str] = None
     rejection_reason: Optional[str] = None
+    created_by: Optional[str] = None
+    approved_by: Optional[str] = None
 
 
 class ChangeRequestResponsePayload(RegisterPayload):
@@ -426,6 +428,7 @@ class SaveSubmissionDraftRequestPayload(BaseModel):
     internal_record_id: Optional[str] = None
     no_of_verifications_required: Optional[int] = 0
     section_payloads: Optional[List[SectionPayloadInput]] = None
+    created_by: Optional[str] = None
 
 
 class FinalizeSubmissionRequestPayload(BaseModel):
@@ -436,6 +439,7 @@ class FinalizeSubmissionRequestPayload(BaseModel):
 class ApproveRejectSubmissionRequestPayload(BaseModel):
     """Request payload for approve_submission / reject_submission."""
     submission_id: str
+    approved_by: Optional[str] = None
 
 
 class GetSubmissionRequestPayload(BaseModel):
@@ -686,6 +690,7 @@ class AddVerificationPayload(BaseModel):
     submission_id: Optional[str] = None
     change_request_id: Optional[str] = None
     verification_observations: Optional[str] = None
+    verified_by: Optional[str] = None
     is_approved: bool