Merge pull request #97 from PSNAppz/2.0

venky-ganapathy · web-flow · commit 9a2914fb4ccc · 2025-11-03T10:17:49.000+05:30
G2P-3343 Add Bridge Beneportal Controllers and Services + G2P-3489
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/app.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/app.py
@@ -24,7 +24,7 @@
     EnvelopeControl,
     NotificationLog,
 )
-from openg2p_g2pconnect_common_lib.jwt_validation_helper import JWTValidationHelper
+from openg2p_fastapi_partner_auth.jwt_validation_helper import JWTValidationHelper
 
 from .controllers import (
     AccountStatementController,
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/config.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/config.py
@@ -1,4 +1,4 @@
-from openg2p_g2pconnect_common_lib.config import Settings as BaseSettings
+from openg2p_fastapi_common.config import Settings as BaseSettings
 from pydantic_settings import SettingsConfigDict
 
 from . import __version__
@@ -25,5 +25,5 @@ class Settings(BaseSettings):
         "text/plain",
     ]
 
-    jwt_validate_keymanager_app_id: str = "G2PBRIDGE"
+    keymanager_sign_app_id: str = "G2PBRIDGE"
     keymanager_auth_enabled: bool = False
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement.py
@@ -12,7 +12,7 @@
     DisbursementRequest,
     DisbursementResponse,
 )
-from openg2p_g2pconnect_common_lib.jwt_signature_validator import JWTSignatureValidator
+from openg2p_fastapi_partner_auth.jwt_signature_validator import JWTSignatureValidator
 
 from ..config import Settings
 from ..services import DisbursementService, RequestValidation
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_envelope.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_envelope.py
@@ -12,7 +12,7 @@
     DisbursementEnvelopeRequest,
     DisbursementEnvelopeResponse,
 )
-from openg2p_g2pconnect_common_lib.jwt_signature_validator import JWTSignatureValidator
+from openg2p_fastapi_partner_auth.jwt_signature_validator import JWTSignatureValidator
 
 from ..config import Settings
 from ..services import (
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_envelope_status.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_envelope_status.py
@@ -12,7 +12,7 @@
     DisbursementEnvelopeStatusRequest,
     DisbursementEnvelopeStatusResponse,
 )
-from openg2p_g2pconnect_common_lib.jwt_signature_validator import JWTSignatureValidator
+from openg2p_fastapi_partner_auth.jwt_signature_validator import JWTSignatureValidator
 
 from ..config import Settings
 from ..services import DisbursementEnvelopeStatusService, RequestValidation
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_status.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_status.py
@@ -15,7 +15,7 @@
     DisbursementStatusRequest,
     DisbursementStatusResponse,
 )
-from openg2p_g2pconnect_common_lib.jwt_signature_validator import JWTSignatureValidator
+from openg2p_fastapi_partner_auth.jwt_signature_validator import JWTSignatureValidator
 
 from ..config import Settings
 from ..services import DisbursementStatusService, RequestValidation
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/account_statement.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/account_statement.py
@@ -7,8 +7,7 @@
 from openg2p_fastapi_common.service import BaseService
 from openg2p_g2p_bridge_models.errors.codes import G2PBridgeErrorCodes
 from openg2p_g2p_bridge_models.models import AccountStatement, AccountStatementLob
-from openg2p_g2p_bridge_models.schemas import AccountStatementResponse
-from openg2p_g2pconnect_common_lib.schemas import StatusEnum, SyncResponseHeader
+from openg2p_g2p_bridge_models.schemas import AccountStatementResponse, StatusEnum, SyncResponseHeader
 from sqlalchemy.ext.asyncio import async_sessionmaker
 
 from ..config import Settings
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement.py
@@ -23,7 +23,7 @@
     DisbursementRequest,
     DisbursementResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     StatusEnum,
     SyncResponseHeader,
 )
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_envelope.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_envelope.py
@@ -20,7 +20,7 @@
     DisbursementEnvelopeRequest,
     DisbursementEnvelopeResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     StatusEnum,
     SyncResponseHeader,
 )
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_envelope_status.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_envelope_status.py
@@ -20,7 +20,7 @@
     DisbursementEnvelopeStatusRequest,
     DisbursementEnvelopeStatusResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     StatusEnum,
     SyncResponseHeader,
 )
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_status.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_status.py
@@ -24,7 +24,7 @@
     DisbursementStatusRequest,
     DisbursementStatusResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     StatusEnum,
     SyncResponseHeader,
 )
diff --git a/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/request_validations.py b/openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/request_validations.py
@@ -3,7 +3,7 @@
 from fastapi import UploadFile
 from openg2p_fastapi_common.service import BaseService
 from openg2p_g2p_bridge_models.errors.exceptions import RequestValidationException
-from openg2p_g2pconnect_common_lib.schemas import SyncResponseStatusReasonCodeEnum
+from openg2p_g2p_bridge_models.schemas import SyncResponseStatusReasonCodeEnum
 
 from ..config import Settings
 
diff --git a/openg2p-g2p-bridge-api/tests/test_disbursement.py b/openg2p-g2p-bridge-api/tests/test_disbursement.py
@@ -11,7 +11,7 @@
     DisbursementRequest,
     DisbursementResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     RequestHeader,
     StatusEnum,
     SyncResponseHeader,
diff --git a/openg2p-g2p-bridge-api/tests/test_disbursement_envelope.py b/openg2p-g2p-bridge-api/tests/test_disbursement_envelope.py
@@ -13,7 +13,7 @@
     DisbursementEnvelopeRequest,
     DisbursementEnvelopeResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     RequestHeader,
     StatusEnum,
     SyncResponseHeader,
diff --git a/openg2p-g2p-bridge-api/tests/test_disbursement_envelope_status.py b/openg2p-g2p-bridge-api/tests/test_disbursement_envelope_status.py
@@ -14,7 +14,7 @@
     DisbursementEnvelopeStatusRequest,
     DisbursementEnvelopeStatusResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     RequestHeader,
     StatusEnum,
     SyncResponseHeader,
diff --git a/openg2p-g2p-bridge-api/tests/test_disbursement_status.py b/openg2p-g2p-bridge-api/tests/test_disbursement_status.py
@@ -10,7 +10,7 @@
     DisbursementStatusRequest,
     DisbursementStatusResponse,
 )
-from openg2p_g2pconnect_common_lib.schemas import (
+from openg2p_g2p_bridge_models.schemas import (
     RequestHeader,
     StatusEnum,
     SyncResponseHeader,
diff --git a/openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/config.py b/openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/config.py
@@ -21,8 +21,6 @@ class Settings(BaseSettings):
     celery_broker_url: str = "redis://localhost:6379/0"
     celery_backend_url: str = "redis://localhost:6379/0"
 
-    mapper_resolve_api_url: str = ""
-
     bank_fa_deconstruct_strategy: str = (
         r"^account_number:(?P<account_number>.*)\.branch_code:(?P<branch_code>.*)\.bank_code:(?P<bank_code>.*)\.mobile_number:(?P<mobile_number>.*)\.email_address:(?P<email_address>.*)\.fa_type:(?P<fa_type>.*)$"
     )
diff --git a/openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/helpers/resolve_helper.py b/openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/helpers/resolve_helper.py
@@ -2,19 +2,15 @@
 import enum
 import logging
 import re
-import uuid
 from datetime import datetime, timedelta, timezone
 from typing import List
 
 import httpx
 import orjson
 from openg2p_fastapi_common.service import BaseService
 from openg2p_g2p_bridge_models.models import MapperResolvedFaType
-from openg2p_g2pconnect_common_lib.schemas import RequestHeader
-from openg2p_g2pconnect_mapper_lib.schemas import (
+from openg2p_g2p_bridge_mapper_connectors.schemas import (
     ResolveRequest,
-    ResolveRequestMessage,
-    SingleResolveRequest,
 )
 from pydantic import BaseModel
 
@@ -47,42 +43,12 @@ def __init__(self, **kw):
         self._keymanager_auth_token: str = None
         self._keymanager_auth_token_expiry: datetime = None
 
-    def construct_single_resolve_request(self, id: str) -> SingleResolveRequest:
-        _logger.info(f"Constructing single resolve request for ID: {id}")
-        single_resolve_request = SingleResolveRequest(
-            reference_id=str(uuid.uuid4()),
-            timestamp=str(datetime.now()),
-            id=id,
-            scope="details",
-        )
-        _logger.info(f"Constructed single resolve request for ID: {id}")
-        return single_resolve_request
-
-    def construct_resolve_request(
-        self, single_resolve_requests: List[SingleResolveRequest]
-    ) -> ResolveRequest:
-        _logger.info(
-            f"Constructing resolve request for {len(single_resolve_requests)} single resolve requests"
-        )
-        resolve_request_message = ResolveRequestMessage(
-            transaction_id=str(uuid.uuid4()),
-            resolve_request=single_resolve_requests,
-        )
-
+    def construct_resolve_request(self, beneficiary_ids: List[str]) -> ResolveRequest:
+        _logger.info(f"Constructing resolve request for {len(beneficiary_ids)} beneficiary IDs")
         resolve_request = ResolveRequest(
-            header=RequestHeader(
-                message_id=str(uuid.uuid4()),
-                message_ts=str(datetime.now()),
-                action="resolve",
-                sender_id=_config.mapper_request_sender_id,
-                sender_uri="",
-                total_count=len(single_resolve_requests),
-            ),
-            message=resolve_request_message,
-        )
-        _logger.info(
-            f"Constructed resolve request for {len(single_resolve_requests)} single resolve requests"
+            beneficiary_ids=beneficiary_ids,
         )
+        _logger.info(f"Constructed resolve request for {len(beneficiary_ids)} single resolve requests")
         return resolve_request
 
     def _deconstruct(self, value: str, strategy: str) -> List[KeyValuePair]:
diff --git a/openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/tasks/mapper_resolution_task.py b/openg2p-g2p-bridge-celery-workers/src/openg2p_g2p_bridge_celery_workers/tasks/mapper_resolution_task.py
@@ -8,8 +8,7 @@
     DisbursementResolutionFinancialAddress,
     ProcessStatus,
 )
-from openg2p_g2pconnect_mapper_lib.client import MapperResolveClient
-from openg2p_g2pconnect_mapper_lib.schemas import ResolveRequest
+from openg2p_g2p_bridge_mapper_connectors.schemas import ResolveRequest, ResolveResponse
 
 from openg2p_g2p_bridge_mapper_connectors.factory import MapperFactory
 
@@ -66,7 +65,6 @@ def mapper_resolution_worker(disbursement_batch_control_id: str):
             )
 
             beneficiary_disbursement_map = {d.beneficiary_id: d.id for d in disbursements}
-            _logger.info(f"Sending resolve request to url {_config.mapper_resolve_api_url}")
             loop = asyncio.new_event_loop()
             asyncio.set_event_loop(loop)
             try:
@@ -108,13 +106,11 @@ async def make_resolve_request(disbursements):
     _logger.info("Making resolve request")
     resolve_helper = ResolveHelper.get_component()
 
-    single_resolve_requests = [
-        resolve_helper.construct_single_resolve_request(d.beneficiary_id) for d in disbursements
-    ]
-    resolve_request: ResolveRequest = resolve_helper.construct_resolve_request(single_resolve_requests)
+    beneficiary_ids = [d.beneficiary_id for d in disbursements]
+    resolve_request: ResolveRequest = resolve_helper.construct_resolve_request(beneficiary_ids)
 
     mapper = MapperFactory.get_component().get_mapper()
-    resolve_response: ResolveResponse | None = mapper.resolve(resolve_request)
+    resolve_response: ResolveResponse = await mapper.resolve(resolve_request)
     if not resolve_response:
         return None, "Failed to resolve the request"
     return resolve_response, None
@@ -127,34 +123,33 @@ def process_and_store_resolution(
     session,
 ):
     _logger.info("Processing and storing resolution")
-    resolve_helper = ResolveHelper.get_component()
     disbursement_resolution_financial_address_list = []
     batch_has_error = False
-    for single_response in resolve_response.message.resolve_response:
+    _logger.info("Iterating through resolved responses")
+    _logger.info(f"Processing {len(resolve_response.results)} resolved responses")
+    _logger.info(f"Resolve Response Details: {resolve_response.results}")
+    for single_response in resolve_response.results:
         _logger.info(f"Processing the response for beneficiary: {single_response.id}")
         disbursement_id = beneficiary_disbursement_map.get(single_response.id)
         if disbursement_id and single_response.fa:
+            # convert single_response.fa to a dict if it's not already
+            if not isinstance(single_response.fa, dict):
+                single_response.fa = single_response.fa.model_dump()
             _logger.info(f"Resolved the request for beneficiary: {single_response.id}")
-            deconstructed_fa = resolve_helper.deconstruct_fa(single_response.fa)
-            _logger.info(f"Deconstructed FA To Store: {deconstructed_fa}")
             disbursement_resolution_financial_address = DisbursementResolutionFinancialAddress(
                 disbursement_batch_control_id=disbursement_batch_control_id,
                 disbursement_id=disbursement_id,
                 beneficiary_id=single_response.id,
-                mapper_resolved_fa=single_response.fa,
-                mapper_resolved_name=(
-                    single_response.account_provider_info.name
-                    if single_response.account_provider_info
-                    else None
-                ),
-                bank_account_number=deconstructed_fa.get(FAKeys.account_number.value, None),
-                bank_code=deconstructed_fa.get(FAKeys.bank_code.value, None),
-                branch_code=deconstructed_fa.get(FAKeys.branch_code.value, None),
-                mapper_resolved_fa_type=deconstructed_fa.get(FAKeys.fa_type.value, None),
-                mobile_number=deconstructed_fa.get(FAKeys.mobile_number.value, None),
-                mobile_wallet_provider=deconstructed_fa.get(FAKeys.mobile_wallet_provider.value, None),
-                email_address=deconstructed_fa.get(FAKeys.email_address.value, None),
-                email_wallet_provider=deconstructed_fa.get(FAKeys.email_wallet_provider.value, None),
+                mapper_resolved_fa=str(single_response.fa),
+                mapper_resolved_name=single_response.name,
+                bank_account_number=single_response.fa.get(FAKeys.account_number.value, None),
+                bank_code=single_response.fa.get(FAKeys.bank_code.value, None),
+                branch_code=single_response.fa.get(FAKeys.branch_code.value, None),
+                mapper_resolved_fa_type=single_response.fa.get(FAKeys.fa_type.value, None),
+                mobile_number=single_response.fa.get(FAKeys.mobile_number.value, None),
+                mobile_wallet_provider=single_response.fa.get(FAKeys.mobile_wallet_provider.value, None),
+                email_address=single_response.fa.get(FAKeys.email_address.value, None),
+                email_wallet_provider=single_response.fa.get(FAKeys.email_wallet_provider.value, None),
             )
             disbursement_resolution_financial_address_list.append(disbursement_resolution_financial_address)
         else:
diff --git a/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/errors/exceptions.py b/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/errors/exceptions.py
@@ -1,6 +1,7 @@
-from typing import List, Optional
+from typing import List, Optional, TYPE_CHECKING
 
-from ..schemas import DisbursementPayload
+if TYPE_CHECKING:
+    from ..schemas import DisbursementPayload
 from .codes import G2PBridgeErrorCodes
 
 
@@ -22,12 +23,12 @@ class DisbursementException(Exception):
     def __init__(
         self,
         code: G2PBridgeErrorCodes,
-        disbursement_payloads: List[DisbursementPayload],
+        disbursement_payloads: List["DisbursementPayload"],
         message: Optional[str] = None,
     ):
         self.code: G2PBridgeErrorCodes = code
         self.message: Optional[str] = message
-        self.disbursement_payloads: List[DisbursementPayload] = disbursement_payloads
+        self.disbursement_payloads: List["DisbursementPayload"] = disbursement_payloads
         super().__init__(code, self.message)
 
 
diff --git a/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/__init__.py b/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/__init__.py
@@ -43,3 +43,11 @@
     AgencyDetailForPayment,
     SponsorBankConfiguration,
 )
+from .bridge_schemas import (
+    StatusEnum,
+    SyncResponseStatusReasonCodeEnum,
+    SyncResponseHeader,
+    SyncResponse,
+    RequestHeader,
+    Request,
+)
diff --git a/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/account_statement.py b/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/account_statement.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from openg2p_g2pconnect_common_lib.schemas import SyncResponse
+from .bridge_schemas import SyncResponse
 
 
 class AccountStatementResponse(SyncResponse):
diff --git a/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/bridge_schemas.py b/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/bridge_schemas.py
diff --git a/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/disbursement.py b/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/disbursement.py
diff --git a/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/disbursement_envelope.py b/openg2p-g2p-bridge-models/src/openg2p_g2p_bridge_models/schemas/disbursement_envelope.py
diff --git a/test-requirements.txt b/test-requirements.txt

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`EnvelopeControl,`
`25`	`25`	`NotificationLog,`
`26`	`26`	`)`
`27`		`-from openg2p_g2pconnect_common_lib.jwt_validation_helper import JWTValidationHelper`
	`27`	`+from openg2p_fastapi_partner_auth.jwt_validation_helper import JWTValidationHelper`
`28`	`28`
`29`	`29`	`from .controllers import (`
`30`	`30`	`AccountStatementController,`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`DisbursementRequest,`
`13`	`13`	`DisbursementResponse,`
`14`	`14`	`)`
`15`		`-from openg2p_g2pconnect_common_lib.jwt_signature_validator import JWTSignatureValidator`
	`15`	`+from openg2p_fastapi_partner_auth.jwt_signature_validator import JWTSignatureValidator`
`16`	`16`
`17`	`17`	`from ..config import Settings`
`18`	`18`	`from ..services import DisbursementService, RequestValidation`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`DisbursementStatusRequest,`
`16`	`16`	`DisbursementStatusResponse,`
`17`	`17`	`)`
`18`		`-from openg2p_g2pconnect_common_lib.jwt_signature_validator import JWTSignatureValidator`
	`18`	`+from openg2p_fastapi_partner_auth.jwt_signature_validator import JWTSignatureValidator`
`19`	`19`
`20`	`20`	`from ..config import Settings`
`21`	`21`	`from ..services import DisbursementStatusService, RequestValidation`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`DisbursementRequest,`
`24`	`24`	`DisbursementResponse,`
`25`	`25`	`)`
`26`		`-from openg2p_g2pconnect_common_lib.schemas import (`
	`26`	`+from openg2p_g2p_bridge_models.schemas import (`
`27`	`27`	`StatusEnum,`
`28`	`28`	`SyncResponseHeader,`
`29`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`DisbursementEnvelopeRequest,`
`21`	`21`	`DisbursementEnvelopeResponse,`
`22`	`22`	`)`
`23`		`-from openg2p_g2pconnect_common_lib.schemas import (`
	`23`	`+from openg2p_g2p_bridge_models.schemas import (`
`24`	`24`	`StatusEnum,`
`25`	`25`	`SyncResponseHeader,`
`26`	`26`	`)`