1.0

.github/workflows/api-tag.yml

@@ -43,11 +43,11 @@ jobs:
           python-version: "3.10"
       - name: Install app
         run: |
-          python -m pip install git+https://github.com/openg2p/openg2p-fastapi-common@develop\#subdirectory=openg2p-fastapi-common
-          python -m pip install git+https://github.com/openg2p/openg2p-fastapi-common@develop\#subdirectory=openg2p-fastapi-auth
-          python -m pip install git+https://github.com/openg2p/openg2p-g2pconnect-common@develop\#subdirectory=openg2p-g2pconnect-common-lib
-          python -m pip install git+https://github.com/openg2p/openg2p-g2p-bridge@develop\#subdirectory=openg2p-g2p-bridge-models
-          python -m pip install openg2p-g2p-bridge-api==develop
+          python -m pip install git+https://github.com/openg2p/openg2p-fastapi-common@v1.1.1\#subdirectory=openg2p-fastapi-common
+          python -m pip install git+https://github.com/openg2p/openg2p-fastapi-common@v1.1.1\#subdirectory=openg2p-fastapi-auth
+          python -m pip install git+https://github.com/openg2p/openg2p-g2pconnect-common@1.0.0\#subdirectory=openg2p-g2pconnect-common-lib
+          python -m pip install git+https://github.com/openg2p/openg2p-g2p-bridge@v1.0.2\#subdirectory=openg2p-g2p-bridge-models
+          python -m pip install openg2p-g2p-bridge-api==1.0.2
       - name: Generate openapi json
         run: |
           mkdir -p openg2p-g2p-bridge-api/api-docs/generated
@@ -78,7 +78,7 @@ jobs:
 
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=TAG_NAME
+          VERSION=$TAG_NAME
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
           echo IMAGE_ID=$IMAGE_ID >> $GITHUB_ENV

.github/workflows/beat-producers-tag.yml

@@ -45,7 +45,7 @@ jobs:
 
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=TAG_NAME
+          VERSION=$TAG_NAME
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
           echo IMAGE_ID=$IMAGE_ID >> $GITHUB_ENV

.github/workflows/workers-tag.yml

@@ -46,7 +46,7 @@ jobs:
 
           # Change all uppercase to lowercase
           IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          VERSION=TAG_NAME
+          VERSION=$TAG_NAME
           echo IMAGE_ID=$IMAGE_ID
           echo VERSION=$VERSION
           echo IMAGE_ID=$IMAGE_ID >> $GITHUB_ENV

openg2p-g2p-bridge-api/Dockerfile-git

@@ -24,10 +24,10 @@ ADD --chown=${container_user}:${container_user_group} main.py /app
 RUN python3 -m venv venv \
   && . ./venv/bin/activate
 RUN python3 -m pip install  \
-    git+https://github.com/openg2p/openg2p-fastapi-common@develop\#subdirectory=openg2p-fastapi-common \
-    git+https://github.com/openg2p/openg2p-fastapi-common@develop\#subdirectory=openg2p-fastapi-auth \
-    git+https://github.com/openg2p/openg2p-g2pconnect-common@develop\#subdirectory=openg2p-g2pconnect-common-lib \
-    git+https://github.com/openg2p/openg2p-g2p-bridge@develop\#subdirectory=openg2p-g2p-bridge-models \
+    git+https://github.com/openg2p/openg2p-fastapi-common@v1.1.1\#subdirectory=openg2p-fastapi-common \
+    git+https://github.com/openg2p/openg2p-fastapi-common@v1.1.1\#subdirectory=openg2p-fastapi-auth \
+    git+https://github.com/openg2p/openg2p-g2pconnect-common@1.0.0\#subdirectory=openg2p-g2pconnect-common-lib \
+    git+https://github.com/openg2p/openg2p-g2p-bridge@1.0\#subdirectory=openg2p-g2p-bridge-models \
     ./src
 
 USER ${container_user}

openg2p-g2p-bridge-api/Dockerfile-pypi

@@ -22,11 +22,11 @@ ADD --chown=${container_user}:${container_user_group} main.py /app
 RUN python3 -m venv venv \
   && . ./venv/bin/activate
 RUN python3 -m pip install  \
-    openg2p-fastapi-common==develop \
-    openg2p-fastapi-auth==develop \
-    openg2p-g2pconnect-common-lib==develop \
-    openg2p-g2p-bridge-models==develop \
-    openg2p-g2p-bridge-api==develop
+    openg2p-fastapi-common==1.1.1 \
+    openg2p-fastapi-auth==1.1.1 \
+    openg2p-g2pconnect-common-lib==1.0.0 \
+    openg2p-g2p-bridge-models==1.0.2 \
+    openg2p-g2p-bridge-api==1.0.2
 
 USER ${container_user}
 

openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/__init__.py

@@ -1 +1 @@
-__version__ = "1.0.0"
+__version__ = "1.0.2"

openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/controllers/disbursement_envelope.py

@@ -34,6 +34,12 @@ def __init__(self, **kwargs):
             responses={200: {"model": DisbursementEnvelopeResponse}},
             methods=["POST"],
         )
+        self.router.add_api_route(
+            "/amend_disbursement_envelope",
+            self.amend_disbursement_envelope,
+            responses={200: {"model": DisbursementEnvelopeResponse}},
+            methods=["POST"],
+        )
 
     async def create_disbursement_envelope(
         self, disbursement_envelope_request: DisbursementEnvelopeRequest
@@ -80,3 +86,26 @@ async def cancel_disbursement_envelope(
         )
         _logger.info("Disbursement envelope cancelled successfully")
         return disbursement_envelope_response
+
+    async def amend_disbursement_envelope(
+        self, disbursement_envelope_request: DisbursementEnvelopeRequest
+    ) -> DisbursementEnvelopeResponse:
+        _logger.info("Amending disbursement envelope")
+        try:
+            disbursement_envelope_payload: DisbursementEnvelopePayload = (
+                await self.disbursement_envelope_service.amend_disbursement_envelope(
+                    disbursement_envelope_request
+                )
+            )
+        except DisbursementEnvelopeException as e:
+            _logger.error("Error amending disbursement envelope")
+            error_response: DisbursementEnvelopeResponse = await self.disbursement_envelope_service.construct_disbursement_envelope_error_response(
+                disbursement_envelope_request, e.code
+            )
+            return error_response
+
+        disbursement_envelope_response: DisbursementEnvelopeResponse = await self.disbursement_envelope_service.construct_disbursement_envelope_success_response(
+            disbursement_envelope_request, disbursement_envelope_payload
+        )
+        _logger.info("Disbursement envelope amended successfully")
+        return disbursement_envelope_response

openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement.py

@@ -197,7 +197,10 @@ async def validate_disbursement_request(
                 disbursement_payload.response_error_codes.append(
                     G2PBridgeErrorCodes.INVALID_DISBURSEMENT_AMOUNT
                 )
-            if disbursement_payload.beneficiary_id is None:
+            if (
+                disbursement_payload.beneficiary_id is None
+                or disbursement_payload.beneficiary_id == ""
+            ):
                 disbursement_payload.response_error_codes.append(
                     G2PBridgeErrorCodes.INVALID_BENEFICIARY_ID
                 )
@@ -561,17 +564,17 @@ async def validate_envelope_for_disbursement_cancellation(
         )
 
         no_of_disbursements_after_this_request = (
-            len(disbursement_payloads)
-            - disbursement_envelope_batch_status.number_of_disbursements_received
+            disbursement_envelope_batch_status.number_of_disbursements_received
+            - len(disbursement_payloads)
         )
         total_disbursement_amount_after_this_request = (
-            sum(
+            disbursement_envelope_batch_status.total_disbursement_amount_received
+            - sum(
                 [
                     disbursement.disbursement_amount
                     for disbursement in disbursements_in_db
                 ]
             )
-            - disbursement_envelope_batch_status.total_disbursement_amount_received
         )
 
         if no_of_disbursements_after_this_request < 0:

openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_envelope.py

@@ -303,3 +303,153 @@ async def construct_disbursement_envelope_batch_status(
         )
         _logger.info("Disbursement envelope batch status constructed successfully")
         return disbursement_envelope_batch_status
+
+    async def validate_envelope_amend_request(
+        self, disbursement_envelope_request: DisbursementEnvelopeRequest
+    ) -> bool:
+        _logger.info("Validating disbursement envelope amend request")
+        disbursement_envelope_payload: DisbursementEnvelopePayload = (
+            disbursement_envelope_request.message
+        )
+        if (
+            disbursement_envelope_payload.disbursement_envelope_id is None
+            or disbursement_envelope_payload.disbursement_envelope_id == ""
+        ):
+            _logger.error("Invalid disbursement envelope ID")
+            raise DisbursementEnvelopeException(
+                G2PBridgeErrorCodes.INVALID_DISBURSEMENT_ENVELOPE_ID
+            )
+        if (
+            disbursement_envelope_payload.number_of_beneficiaries is None
+            or disbursement_envelope_payload.number_of_beneficiaries < 1
+        ):
+            _logger.error("Invalid number of beneficiaries")
+            raise DisbursementEnvelopeException(
+                G2PBridgeErrorCodes.INVALID_NO_OF_BENEFICIARIES
+            )
+        if (
+            disbursement_envelope_payload.number_of_disbursements is None
+            or disbursement_envelope_payload.number_of_disbursements < 1
+        ):
+            _logger.error("Invalid number of disbursements")
+            raise DisbursementEnvelopeException(
+                G2PBridgeErrorCodes.INVALID_NO_OF_DISBURSEMENTS
+            )
+        if (
+            disbursement_envelope_payload.total_disbursement_amount is None
+            or disbursement_envelope_payload.total_disbursement_amount < 0
+        ):
+            _logger.error("Invalid total disbursement amount")
+            raise DisbursementEnvelopeException(
+                G2PBridgeErrorCodes.INVALID_TOTAL_DISBURSEMENT_AMOUNT
+            )
+        if (
+            disbursement_envelope_payload.disbursement_schedule_date is None
+            or disbursement_envelope_payload.disbursement_schedule_date
+            < datetime.date(datetime.utcnow())
+        ):
+            _logger.error("Invalid disbursement schedule date")
+            raise DisbursementEnvelopeException(
+                G2PBridgeErrorCodes.INVALID_DISBURSEMENT_SCHEDULE_DATE
+            )
+        return True
+
+    async def update_disbursement_envelope(
+        self, disbursement_envelope_payload: DisbursementEnvelopePayload, session
+    ) -> DisbursementEnvelopePayload:
+        _logger.info("Updating disbursement envelope")
+        disbursement_envelope: DisbursementEnvelope = (
+            await session.execute(
+                select(DisbursementEnvelope).where(
+                    DisbursementEnvelope.id == disbursement_envelope_payload.id
+                )
+            )
+        ).scalar()
+
+        disbursement_envelope.number_of_beneficiaries = (
+            disbursement_envelope_payload.number_of_beneficiaries
+        )
+        disbursement_envelope.number_of_disbursements = (
+            disbursement_envelope_payload.number_of_disbursements
+        )
+        disbursement_envelope.total_disbursement_amount = (
+            disbursement_envelope_payload.total_disbursement_amount
+        )
+        disbursement_envelope.disbursement_schedule_date = (
+            disbursement_envelope_payload.disbursement_schedule_date
+        )
+
+        await session.commit()
+        _logger.info("Disbursement envelope updated successfully")
+        return disbursement_envelope_payload
+
+    async def amend_disbursement_envelope(
+        self, disbursement_envelope_request: DisbursementEnvelopeRequest
+    ) -> DisbursementEnvelopePayload:
+        _logger.info("Amending disbursement envelope")
+        session_maker = async_sessionmaker(dbengine.get(), expire_on_commit=False)
+        async with session_maker() as session:
+            try:
+                await self.validate_envelope_amend_request(
+                    disbursement_envelope_request
+                )
+            except DisbursementEnvelopeException as e:
+                raise e
+
+            disbursement_envelope_payload: DisbursementEnvelopePayload = (
+                disbursement_envelope_request.message
+            )
+            disbursement_envelope_id: str = (
+                disbursement_envelope_payload.disbursement_envelope_id
+            )
+
+            disbursement_envelope: DisbursementEnvelope = (
+                await session.execute(
+                    select(DisbursementEnvelope).where(
+                        DisbursementEnvelope.disbursement_envelope_id
+                        == disbursement_envelope_id
+                    )
+                )
+            ).scalar()
+
+            if disbursement_envelope is None:
+                _logger.error(
+                    f"Disbursement envelope with ID {disbursement_envelope_id} not found"
+                )
+                raise DisbursementEnvelopeException(
+                    G2PBridgeErrorCodes.DISBURSEMENT_ENVELOPE_NOT_FOUND
+                )
+
+            if (
+                disbursement_envelope.cancellation_status
+                == CancellationStatus.Cancelled.value
+            ):
+                _logger.error(
+                    f"Disbursement envelope with ID {disbursement_envelope_id} already cancelled"
+                )
+                raise DisbursementEnvelopeException(
+                    G2PBridgeErrorCodes.DISBURSEMENT_ENVELOPE_ALREADY_CANCELED
+                )
+
+            if disbursement_envelope.disbursement_schedule_date <= datetime.date(
+                datetime.utcnow()
+            ):
+                _logger.error(
+                    f"Disbursement envelope with ID {disbursement_envelope_id} date is already passed"
+                )
+                raise DisbursementEnvelopeException(
+                    G2PBridgeErrorCodes.DISBURSEMENT_ENVELOPE_DATE_PASSED
+                )
+
+            disbursement_envelope_payload.disbursement_envelope_id = (
+                disbursement_envelope_id
+            )
+            disbursement_envelope_payload.id = disbursement_envelope.id
+
+            disbursement_envelope_payload = await self.update_disbursement_envelope(
+                disbursement_envelope_payload, session
+            )
+
+            await session.commit()
+            _logger.info("Disbursement envelope amended successfully")
+            return disbursement_envelope_payload

openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_envelope_status.py

@@ -91,7 +91,7 @@ async def construct_disbursement_envelope_status_error_response(
                 status=StatusEnum.rjct,
                 status_reason_message=code,
             ),
-            message={},
+            message=None,
         )
 
         return response

openg2p-g2p-bridge-api/src/openg2p_g2p_bridge_api/services/disbursement_status.py

@@ -10,7 +10,6 @@
     DisbursementRecon,
 )
 from openg2p_g2p_bridge_models.schemas import (
-    DisbursementEnvelopeStatusResponse,
     DisbursementErrorReconPayload,
     DisbursementReconPayload,
     DisbursementReconRecords,
@@ -139,7 +138,7 @@ async def construct_disbursement_status_error_response(
         disbursement_status_request: DisbursementStatusRequest,
         code: str,
     ) -> DisbursementStatusResponse:
-        response = DisbursementEnvelopeStatusResponse(
+        response = DisbursementStatusResponse(
             header=SyncResponseHeader(
                 message_id=disbursement_status_request.header.message_id,
                 message_ts=datetime.now().isoformat(),