Fix mapper schema imports + controller path refactoring

src/openg2p_spar_mapper_api/app.py

@@ -3,7 +3,7 @@
 
 from .config import Settings
 from openg2p_fastapi_common.app import Initializer as BaseInitializer
-from .controllers.g2pconnect import (
+from .controllers import (
     SyncMapperController,
     AsyncMapperController,
 )
@@ -17,6 +17,7 @@
     AsyncRequestHelper,
     AsyncResponseHelper,
 )
+
 _config = Settings.get_config()
 
 

src/openg2p_spar_mapper_api/config.py

@@ -22,8 +22,8 @@ class Settings(BaseSettings):
     """
     openapi_version: str = __version__
 
-    db_dbname: str = "spar-db"
-    
+    db_dbname: str = "mapper-db"
+
     default_callback_url: Optional[AnyUrl] = None
     default_callback_timeout: int = 10
-    callback_sender_id: str = "spar.dev.openg2p.net"
+    callback_sender_id: str = "mapper.dev.openg2p.net"

src/openg2p_spar_mapper_api/controllers/__init__.py

@@ -0,0 +1,2 @@
+from .sync_mapper_controller import SyncMapperController
+from .async_mapper_controller import AsyncMapperController

src/openg2p_spar_mapper_api/controllers/g2pconnect/async_mapper_controller.py → src/openg2p_spar_mapper_api/controllers/async_mapper_controller.py

@@ -9,11 +9,11 @@
     AsyncResponse,
     AsyncCallbackRequest,
 )
-from openg2p_g2pconnect_common_lib.spar.schemas.link import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.link import (
     SingleLinkResponse,
 )
-from ...config import Settings
-from ...services import (
+from src.openg2p_spar_mapper_api.config import Settings
+from src.openg2p_spar_mapper_api.services import (
     RequestValidation,
     AsyncResponseHelper,
     MapperService,

src/openg2p_spar_mapper_api/controllers/g2pconnect/sync_mapper_controller.py → src/openg2p_spar_mapper_api/controllers/sync_mapper_controller.py

@@ -3,16 +3,21 @@
     Request,
     SyncResponse,
 )
-from openg2p_g2pconnect_common_lib.spar.schemas.link import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.link import (
     SingleLinkResponse,
 )
-from openg2p_g2pconnect_common_lib.spar.schemas.update import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.update import (
     SingleUpdateResponse,
 )
-from openg2p_g2pconnect_common_lib.spar.schemas.resolve import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.resolve import (
     SingleResolveResponse,
 )
-from ...services import RequestValidation, SyncResponseHelper, MapperService, RequestValidationException
+from src.openg2p_spar_mapper_api.services import (
+    RequestValidation,
+    SyncResponseHelper,
+    MapperService,
+    RequestValidationException,
+)
 
 
 class SyncMapperController(BaseController):
@@ -55,8 +60,10 @@ async def link_sync(self, request: Request):
             RequestValidation.validate_request(request)
             RequestValidation.validate_link_request_header(request)
         except RequestValidationException as e:
-            error_response = SyncResponseHelper.get_component().construct_error_sync_response(
-                request, e
+            error_response = (
+                SyncResponseHelper.get_component().construct_error_sync_response(
+                    request, e
+                )
             )
             return error_response
 
@@ -74,51 +81,63 @@ async def update_sync(self, request: Request):
             RequestValidation.validate_request(request)
             RequestValidation.validate_update_request_header(request)
         except RequestValidationException as e:
-            error_response = SyncResponseHelper.get_component().construct_error_sync_response(
-                request, e
+            error_response = (
+                SyncResponseHelper.get_component().construct_error_sync_response(
+                    request, e
+                )
             )
             return error_response
 
         single_update_responses: list[SingleUpdateResponse] = (
             await self.mapper_service.update(request)
         )
-        return SyncResponseHelper.get_component().construct_success_sync_update_response(
-            request,
-            single_update_responses,
+        return (
+            SyncResponseHelper.get_component().construct_success_sync_update_response(
+                request,
+                single_update_responses,
+            )
         )
 
     async def resolve_sync(self, request: Request):
         try:
             RequestValidation.validate_request(request)
             RequestValidation.validate_resolve_request_header(request)
         except RequestValidationException as e:
-            error_response = SyncResponseHelper.get_component().construct_error_sync_response(
-                request, e
+            error_response = (
+                SyncResponseHelper.get_component().construct_error_sync_response(
+                    request, e
+                )
             )
             return error_response
 
         single_resolve_responses: list[SingleResolveResponse] = (
             await self.mapper_service.resolve(request)
         )
-        return SyncResponseHelper.get_component().construct_success_sync_resolve_response(
-            request,
-            single_resolve_responses,
+        return (
+            SyncResponseHelper.get_component().construct_success_sync_resolve_response(
+                request,
+                single_resolve_responses,
+            )
         )
 
     async def unlink_sync(self, request: Request):
         try:
             RequestValidation.validate_request(request)
             RequestValidation.validate_unlink_request_header(request)
         except RequestValidationException as e:
-            error_response = SyncResponseHelper.get_component().construct_error_sync_response(
-                request, e
+            error_response = (
+                SyncResponseHelper.get_component().construct_error_sync_response(
+                    request, e
+                )
             )
             return error_response
 
         single_unlink_responses: list[SingleResolveResponse] = (
             await self.mapper_service.unlink(request)
         )
-        return SyncResponseHelper.get_component().construct_success_sync_unlink_response(
-            request,
-            single_unlink_responses,
+        return (
+            SyncResponseHelper.get_component().construct_success_sync_unlink_response(
+                request,
+                single_unlink_responses,
+            )
         )

src/openg2p_spar_mapper_api/services/exceptions.py

@@ -1,6 +1,10 @@
 from openg2p_g2pconnect_common_lib.common.schemas import StatusEnum
-from openg2p_g2pconnect_common_lib.spar.schemas import LinkStatusReasonCode,ResolveStatusReasonCode,UpdateStatusReasonCode,UnlinkStatusReasonCode
-
+from openg2p_g2pconnect_common_lib.mapper.schemas import (
+    LinkStatusReasonCode,
+    ResolveStatusReasonCode,
+    UpdateStatusReasonCode,
+    UnlinkStatusReasonCode,
+)
 
 
 class LinkValidationException(Exception):
@@ -34,6 +38,7 @@ def __init__(self, message, status, validation_error_type: UnlinkStatusReasonCod
         self.status: StatusEnum = status
         self.validation_error_type: UnlinkStatusReasonCode = validation_error_type
 
+
 class RequestValidationException(Exception):
     # TODO : Add code
     def __init__(self, code, message):

src/openg2p_spar_mapper_api/services/id_fa_mapping_validations.py

@@ -1,10 +1,10 @@
-from openg2p_g2pconnect_common_lib.spar.schemas.resolve import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.resolve import (
     SingleResolveRequest,
     ResolveStatusReasonCode,
 )
 
 from openg2p_fastapi_common.service import BaseService
-from openg2p_g2pconnect_common_lib.spar.schemas import (
+from openg2p_g2pconnect_common_lib.mapper.schemas import (
     LinkStatusReasonCode,
     SingleUpdateRequest,
     UpdateStatusReasonCode,
@@ -20,7 +20,7 @@
     LinkValidationException,
     UpdateValidationException,
     ResolveValidationException,
-    UnlinkValidationException
+    UnlinkValidationException,
 )
 from ..models import IdFaMapping
 
@@ -139,18 +139,18 @@ async def validate_resolve_request(
                 validation_error_type=ResolveStatusReasonCode.rjct_reference_id_duplicate,
             )
         return None
-    
+
     @staticmethod
     async def validate_unlink_request(
         connection, single_unlink_request: SingleUnlinkRequest
     ) -> None:
-        
+
         if not single_unlink_request.id:
             raise UnlinkValidationException(
                 message="ID is null",
                 validation_error_type=UnlinkValidationException.rjct_id_invalid,
             )
-        
+
         if not single_unlink_request.fa:
             raise UnlinkValidationException(
                 message="FA is null",
@@ -172,4 +172,4 @@ async def validate_unlink_request(
                 validation_error_type=UnlinkStatusReasonCode.rjct_reference_id_duplicate,
             )
 
-        return None
+        return None

src/openg2p_spar_mapper_api/services/mapper.py

@@ -1,15 +1,15 @@
 import logging
 from datetime import datetime
 
-from openg2p_g2pconnect_common_lib.spar.schemas.resolve import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.resolve import (
     ResolveStatusReasonCode,
     ResolveScope,
 )
 
 from openg2p_fastapi_common.context import dbengine
 from openg2p_fastapi_common.service import BaseService
 from openg2p_g2pconnect_common_lib.common.schemas import Request, StatusEnum
-from openg2p_g2pconnect_common_lib.spar.schemas import (
+from openg2p_g2pconnect_common_lib.mapper.schemas import (
     SingleLinkResponse,
     SingleUpdateResponse,
     SingleResolveResponse,
@@ -20,7 +20,7 @@
     UpdateStatusReasonCode,
     UnlinkRequest,
     SingleUnlinkResponse,
-    UnlinkStatusReasonCode
+    UnlinkStatusReasonCode,
 )
 from sqlalchemy.ext.asyncio import async_sessionmaker
 from sqlalchemy import and_, select
@@ -413,6 +413,7 @@ def unlink_id_fa_mapping(single_unlink_request):
             additional_info=single_unlink_request.additional_info,
             active=True,
         )
+
     @staticmethod
     def construct_single_unlink_response_for_success(single_unlink_request):
         return SingleUnlinkResponse(
@@ -438,4 +439,4 @@ def construct_single_unlink_response_for_failure(single_unlink_request, error):
             status_reason_message=error.message,
             additional_info=None,
             locale=single_unlink_request.locale,
-        )
+        )

src/openg2p_spar_mapper_api/services/request_helper.py

@@ -4,7 +4,7 @@
 from openg2p_g2pconnect_common_lib.common.schemas import (
     Request,
 )
-from openg2p_g2pconnect_common_lib.spar.schemas.link import (
+from openg2p_g2pconnect_common_lib.mapper.schemas.link import (
     LinkRequest,
 )
 

src/openg2p_spar_mapper_api/services/response_helper.py

@@ -12,7 +12,7 @@
     AsyncCallbackRequestHeader,
     AsyncAck,
 )
-from openg2p_g2pconnect_common_lib.spar.schemas import (
+from openg2p_g2pconnect_common_lib.mapper.schemas import (
     LinkResponse,
     LinkRequest,
     SingleLinkResponse,
@@ -36,7 +36,7 @@
     LinkValidationException,
     UpdateValidationException,
     ResolveValidationException,
-    UnlinkValidationException
+    UnlinkValidationException,
 )
 
 
@@ -180,7 +180,7 @@ def construct_success_sync_unlink_response(
         request: Request,
         single_unlink_responses: list[SingleUnlinkResponse],
     ) -> SyncResponse:
-        unlinkRequest:  UnlinkRequest = UnlinkRequest.model_validate(request.message)
+        unlinkRequest: UnlinkRequest = UnlinkRequest.model_validate(request.message)
         unlinkResponse: UnlinkResponse = UnlinkResponse(
             transaction_id=unlinkRequest.transaction_id,
             correlation_id=None,