Merge pull request #66 from PSNAppz/1.2.0

Fixed issues in Mapper APIs

Author: venky-ganapathy

openg2p-spar-bene-portal-api/src/openg2p_spar_bene_portal_api/controllers/mapper_controller.py

@@ -15,6 +15,7 @@
 from openg2p_spar_mapper_core.helpers import ResponseHelper, StrategyHelper
 from openg2p_spar_mapper_core.services import MapperService, RequestValidation
 from openg2p_spar_models.schemas import (
+    STRATEGY_ID_KEY,
     LinkRequest,
     LinkResponse,
     ResolveRequest,
@@ -24,7 +25,6 @@
     UpdateRequest,
     UpdateResponse,
 )
-from openg2p_spar_models.schemas.strategy import STRATEGY_ID_KEY
 
 from ..config import Settings
 
@@ -95,6 +95,9 @@ async def link(
                     strategy_id = single_link_request.fa.strategy_id
 
                     # Construct FA using StrategyHelper (converts FA object to string)
+                    _logger.info(
+                        f"Constructing FA string from FA object... {single_link_request.fa}"
+                    )
                     constructed_fa_string = (
                         await StrategyHelper()
                         .get_component()
@@ -133,6 +136,9 @@ async def link(
                 link_request, e, "rjct.request.validation", str(e)
             )
         except LinkValidationException as e:
+            _logger.info(
+                f"Link validation error: {e.validation_error_type} - {e.message}"
+            )
             return ResponseHelper.get_component().construct_link_error_response(
                 link_request, e, e.validation_error_type, e.message
             )

openg2p-spar-mapper-api/src/openg2p_spar_mapper_api/app.py

@@ -9,11 +9,11 @@
 from openg2p_fastapi_common.app import Initializer as BaseInitializer
 from openg2p_fastapi_common.utils.crypto import KeymanagerCryptoHelper
 from openg2p_fastapi_partner_auth.jwt_validation_helper import JWTValidationHelper
+from openg2p_spar_mapper_core.helpers import ResponseHelper, StrategyHelper
 from openg2p_spar_mapper_core.services import (
     IdFaMappingValidations,
     MapperService,
     RequestValidation,
-    ResponseHelper,
 )
 from openg2p_spar_models.models import (
     IdFaMapping,
@@ -30,6 +30,7 @@ def initialize(self, **kwargs):
 
         IdFaMappingValidations()
         RequestValidation()
+        StrategyHelper()
         MapperService()
         ResponseHelper()
         JWTValidationHelper()

openg2p-spar-mapper-api/src/openg2p_spar_mapper_api/controllers/mapper_controller.py

@@ -11,12 +11,13 @@
     UnlinkValidationException,
     UpdateValidationException,
 )
+from openg2p_spar_mapper_core.helpers import ResponseHelper, StrategyHelper
 from openg2p_spar_mapper_core.services import (
     MapperService,
     RequestValidation,
-    ResponseHelper,
 )
 from openg2p_spar_models.schemas import (
+    STRATEGY_ID_KEY,
     LinkRequest,
     LinkResponse,
     ResolveRequest,
@@ -80,6 +81,36 @@ async def link(
             # Validate request structure
             RequestValidation.get_component().validate_request(link_request)
 
+            for (
+                single_link_request
+            ) in link_request.request_body.request_payload.link_request:
+                # Construct FA from the request FA object
+                if single_link_request.fa:
+                    # Store strategy_id before constructing FA
+                    strategy_id = single_link_request.fa.strategy_id
+
+                    # Construct FA using StrategyHelper (converts FA object to string)
+                    constructed_fa_string = (
+                        await StrategyHelper()
+                        .get_component()
+                        .construct_fa(single_link_request.fa)
+                    )
+                    # Replace FA object with constructed FA string for storage
+                    single_link_request.fa = constructed_fa_string
+
+                    # Ensure additional_info contains strategy_id
+                    if not single_link_request.additional_info:
+                        single_link_request.additional_info = []
+
+                    if (
+                        not single_link_request.additional_info
+                        or STRATEGY_ID_KEY not in single_link_request.additional_info[0]
+                    ):
+                        if not single_link_request.additional_info:
+                            single_link_request.additional_info = [{}]
+                        single_link_request.additional_info[0][
+                            STRATEGY_ID_KEY
+                        ] = strategy_id
             # Process link request
             single_link_responses = await self.service.link(link_request)
             _logger.debug(f"Single Link Responses: {single_link_responses}")
@@ -92,16 +123,16 @@ async def link(
             return link_response
 
         except RequestValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_link_error_response(
                 link_request, e, "rjct.request.validation", str(e)
             )
         except LinkValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_link_error_response(
                 link_request, e, e.validation_error_type, e.message
             )
         except Exception as e:
             _logger.error(f"Internal server error during link operation: {str(e)}")
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_link_error_response(
                 link_request, e, "rjct.internal.error", "Internal server error"
             )
 
@@ -124,23 +155,23 @@ async def resolve(
 
             # Construct response
             resolve_response: ResolveResponse = (
-                ResponseHelper.get_component().construct_resolve_response(
+                await ResponseHelper.get_component().construct_resolve_response(
                     resolve_request, single_resolve_responses
                 )
             )
             return resolve_response
 
         except RequestValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_resolve_error_response(
                 resolve_request, e, "rjct.request.validation", str(e)
             )
         except ResolveValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_resolve_error_response(
                 resolve_request, e, e.validation_error_type, e.message
             )
         except Exception as e:
             _logger.error(f"Internal server error during resolve operation: {str(e)}")
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_resolve_error_response(
                 resolve_request, e, "rjct.internal.error", "Internal server error"
             )
 
@@ -170,16 +201,16 @@ async def unlink(
             return unlink_response
 
         except RequestValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_unlink_error_response(
                 unlink_request, e, "rjct.request.validation", str(e)
             )
         except UnlinkValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_unlink_error_response(
                 unlink_request, e, e.validation_error_type, e.message
             )
         except Exception as e:
             _logger.error(f"Internal server error during unlink operation: {str(e)}")
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_unlink_error_response(
                 unlink_request, e, "rjct.internal.error", "Internal server error"
             )
 
@@ -197,6 +228,38 @@ async def update(
             # Validate request structure
             RequestValidation.get_component().validate_request(update_request)
 
+            for (
+                single_update_request
+            ) in update_request.request_body.request_payload.update_request:
+                # Construct FA from the request FA object
+                if single_update_request.fa:
+                    # Store strategy_id before constructing FA
+                    strategy_id = single_update_request.fa.strategy_id
+
+                    # Construct FA using StrategyHelper (converts FA object to string)
+                    constructed_fa_string = (
+                        await StrategyHelper()
+                        .get_component()
+                        .construct_fa(single_update_request.fa)
+                    )
+                    # Replace FA object with constructed FA string for storage
+                    single_update_request.fa = constructed_fa_string
+
+                    # Ensure additional_info contains strategy_id
+                    if not single_update_request.additional_info:
+                        single_update_request.additional_info = []
+
+                    if (
+                        not single_update_request.additional_info
+                        or STRATEGY_ID_KEY
+                        not in single_update_request.additional_info[0]
+                    ):
+                        if not single_update_request.additional_info:
+                            single_update_request.additional_info = [{}]
+                        single_update_request.additional_info[0][
+                            STRATEGY_ID_KEY
+                        ] = strategy_id
+
             # Process update request
             single_update_responses = await self.service.update(update_request)
 
@@ -209,15 +272,15 @@ async def update(
             return update_response
 
         except RequestValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_update_error_response(
                 update_request, e, "rjct.request.validation", str(e)
             )
         except UpdateValidationException as e:
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_update_error_response(
                 update_request, e, e.validation_error_type, e.message
             )
         except Exception as e:
             _logger.error(f"Internal server error during update operation: {str(e)}")
-            return ResponseHelper.get_component().construct_error_response(
+            return ResponseHelper.get_component().construct_update_error_response(
                 update_request, e, "rjct.internal.error", "Internal server error"
             )

openg2p-spar-mapper-core/src/openg2p_spar_mapper_core/helpers/response_helper.py

@@ -97,15 +97,12 @@ async def construct_resolve_response(
         deconstructed_responses = []
         for response in single_resolve_responses:
             deconstructed_fa = None
-            print("additional_info, fa")
-            print(response.additional_info, response.fa)
             if response.fa and response.additional_info:
                 deconstructed_fa = (
                     await StrategyHelper()
                     .get_component()
                     .deconstruct_fa(response.fa, response.additional_info)
                 )
-
             # Create a new response with deconstructed FA
             deconstructed_response = SingleResolveResponse(
                 reference_id=response.reference_id,