Merge pull request #103 from tahzeer/2.0

[G2P-3639] Remove g2p prefix from bridge beneficiary portal api

Author: venky-ganapathy

openg2p-g2p-bridge-bene-portal-api/src/openg2p_g2p_bridge_bene_portal_api/services/disbursement.py

@@ -39,8 +39,8 @@ async def get_all_disbursements(
         _logger.info("Get All Disbursements Request")
 
         pagination = (
-            disbursement_request.g2p_request_body.g2p_pagination_request
-            if disbursement_request.g2p_request_body
+            disbursement_request.request_body.pagination_request
+            if disbursement_request.request_body
             else None
         )
 
@@ -121,17 +121,17 @@ async def construct_disbursement_success_response(
         total_pages: int = 0,
     ) -> DisbursementResponseForPortal:
         disbursement_response = DisbursementResponseForPortal(
-            g2p_response_header={
-                "request_id": disbursement_request.g2p_request_header.request_id,
+            response_header={
+                "request_id": disbursement_request.request_header.request_id,
                 "response_status": G2PResponseStatus.SUCCESS.value,
                 "response_timestamp": datetime.now(),
             },
-            g2p_response_body=DisbursementResponseBody(
-                g2p_pagination_response={
+            response_body=DisbursementResponseBody(
+                pagination_response={
                     "number_of_items": total_count,
                     "number_of_pages": total_pages,
                 },
-                g2p_response_payload=disbursements,
+                response_payload=disbursements,
             ),
         )
         return disbursement_response
@@ -143,19 +143,19 @@ async def construct_disbursement_failure_response(
         error_message: str | None = None,
     ) -> DisbursementResponseForPortal:
         disbursement_response = DisbursementResponseForPortal(
-            g2p_response_header={
-                "request_id": disbursement_request.g2p_request_header.request_id,
+            response_header={
+                "request_id": disbursement_request.request_header.request_id,
                 "response_status": G2PResponseStatus.ERROR.value,
                 "response_error_code": error_code,
                 "response_error_message": error_message,
                 "response_timestamp": datetime.now(),
             },
-            g2p_response_body=DisbursementResponseBody(
-                g2p_pagination_response={
+            response_body=DisbursementResponseBody(
+                pagination_response={
                     "number_of_items": 0,
                     "number_of_pages": 0,
                 },
-                g2p_response_payload=[],
+                response_payload=[],
             ),
         )
         return disbursement_response
@@ -222,13 +222,13 @@ async def construct_disbursement_summary_success_response(
         disbursement_summaries: List[DisbursementSummary],
     ) -> DisbursementSummaryResponse:
         disbursement_summary_response = DisbursementSummaryResponse(
-            g2p_response_header={
-                "request_id": disbursement_summary_request.g2p_request_header.request_id,
+            response_header={
+                "request_id": disbursement_summary_request.request_header.request_id,
                 "response_status": G2PResponseStatus.SUCCESS.value,
                 "response_timestamp": datetime.now(),
             },
-            g2p_response_body=DisbursementSummaryResponseBody(
-                g2p_response_payload=disbursement_summaries,
+            response_body=DisbursementSummaryResponseBody(
+                response_payload=disbursement_summaries,
             ),
         )
         return disbursement_summary_response
@@ -240,15 +240,15 @@ async def construct_disbursement_summary_failure_response(
         error_message: str | None = None,
     ) -> DisbursementSummaryResponse:
         disbursement_summary_response = DisbursementSummaryResponse(
-            g2p_response_header={
-                "request_id": disbursement_summary_request.g2p_request_header.request_id,
+            response_header={
+                "request_id": disbursement_summary_request.request_header.request_id,
                 "response_status": G2PResponseStatus.ERROR.value,
                 "response_error_code": error_code,
                 "response_error_message": error_message,
                 "response_timestamp": datetime.now(),
             },
-            g2p_response_body=DisbursementSummaryResponseBody(
-                g2p_response_payload=[],
+            response_body=DisbursementSummaryResponseBody(
+                response_payload=[],
             ),
         )
         return disbursement_summary_response

openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/disbursement_portal.py

@@ -31,38 +31,38 @@ class DisbursementSummary(BaseModel):
 
 
 class DisbursementRequestBody(BaseModel):
-    g2p_pagination_request: Optional[G2PPaginationRequest] = None
-    g2p_request_payload: Optional[dict] = None
+    pagination_request: Optional[G2PPaginationRequest] = None
+    request_payload: Optional[dict] = None
 
 
 class DisbursementRequest(BaseModel):
-    g2p_request_header: G2PRequestHeader
-    g2p_request_body: Optional[DisbursementRequestBody] = None
+    request_header: G2PRequestHeader
+    request_body: Optional[DisbursementRequestBody] = None
 
 
 class DisbursementResponse(BaseModel):
-    g2p_response_header: G2PResponseHeader
-    g2p_response_body: "DisbursementResponseBody"
+    response_header: G2PResponseHeader
+    response_body: "DisbursementResponseBody"
 
 
 class DisbursementResponseBody(BaseModel):
-    g2p_pagination_response: Optional[G2PPaginationResponse] = None
-    g2p_response_payload: List[Disbursement]
+    pagination_response: Optional[G2PPaginationResponse] = None
+    response_payload: List[Disbursement]
 
 
 class DisbursementSummaryRequestBody(BaseModel):
-    g2p_request_payload: Optional[dict] = None
+    equest_payload: Optional[dict] = None
 
 
 class DisbursementSummaryRequest(BaseModel):
-    g2p_request_header: G2PRequestHeader
-    g2p_request_body: Optional[DisbursementSummaryRequestBody] = None
+    request_header: G2PRequestHeader
+    request_body: Optional[DisbursementSummaryRequestBody] = None
 
 
 class DisbursementSummaryResponse(BaseModel):
-    g2p_response_header: G2PResponseHeader
-    g2p_response_body: "DisbursementSummaryResponseBody"
+    response_header: G2PResponseHeader
+    response_body: "DisbursementSummaryResponseBody"
 
 
 class DisbursementSummaryResponseBody(BaseModel):
-    g2p_response_payload: List[DisbursementSummary]
+    response_payload: List[DisbursementSummary]