G2P-2185 G2P-2404 Restrict submission from beneficiary portal api

src/openg2p_portal_api/services/form_service.py

@@ -3,6 +3,7 @@
 
 from openg2p_fastapi_common.context import dbengine
 from openg2p_fastapi_common.service import BaseService
+from sqlalchemy import select
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import async_sessionmaker
 
@@ -95,9 +96,26 @@ async def submit_application_form(
     ):
         async_session_maker = async_sessionmaker(dbengine.get())
         async with async_session_maker() as session:
-            program_membership_id = await self.membership_service.check_and_create_mem(
-                program_id, registrant_id
+            existing_application = await session.execute(
+                select(ProgramRegistrantInfoORM).filter(
+                    ProgramRegistrantInfoORM.program_id == program_id,
+                    ProgramRegistrantInfoORM.registrant_id == registrant_id,
+                    ProgramRegistrantInfoORM.state.in_(
+                        ["active", "inprogress", "applied"]
+                    ),
+                )
             )
+            if existing_application.scalars().first():
+                return "Error: There is already an active or in-progress application for this program."
+
+            try:
+                program_membership_id = (
+                    await self.membership_service.check_and_create_mem(
+                        program_id, registrant_id
+                    )
+                )
+            except ValueError as e:
+                return str(e)
             get_draft_reg_info = (
                 await ProgramRegistrantInfoDraftORM.get_draft_reg_info_by_id(
                     program_id, registrant_id

src/openg2p_portal_api/services/membership_service.py

@@ -10,7 +10,7 @@ class MembershipService(BaseService):
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
 
-    async def check_and_create_mem(self, programid: int, partnerid: int):
+    async def check_and_create_mem(self, programid: int, partnerid: int) -> int:
         async_session_maker = async_sessionmaker(dbengine.get())
         async with async_session_maker() as session:
             membership = await ProgramMembershipORM.get_membership_by_id(
@@ -25,6 +25,7 @@ async def check_and_create_mem(self, programid: int, partnerid: int):
                 try:
                     session.add(membership)
                     await session.commit()
+                    await session.refresh(membership)
                 except IntegrityError:
                     return "Could not add to registrant to program!!"