update rfp and proposal apis

src/controllers/__init__.py

@@ -8,9 +8,9 @@ from ._evaluation_controller import EvaluationController
 
 api_router = APIRouter()
 
-api_router.include_router(RFPController().router, prefix="/rfps", tags=["RFPs"])
+api_router.include_router(RFPController().router)
 api_router.include_router(
-    ProposalController().router, prefix="/proposals", tags=["Proposals"]
+    ProposalController().router
 )
 api_router.include_router(
     ProposalAIController().router,

src/controllers/_proposal_controller.py

@@ -1,4 +1,4 @@
-from fastapi import APIRouter, HTTPException, Query
+from fastapi import APIRouter, HTTPException, Query, Path
 from pydantic import BaseModel
 from typing import List, Optional
 from uuid import UUID
@@ -29,7 +29,6 @@ class ProposalRequest(BaseModel):
 
 
 class ProposalUpdateRequest(BaseModel):
-    id: UUID
     rfp_id: Optional[UUID] = None
     name: Optional[str] = None
     tep: Optional[str] = None
@@ -51,41 +50,124 @@ class ProposalController:
         self.__proposal_service = ProposalService
         self.router = APIRouter()
         self.router.add_api_route(
-            "/proposal",
+            "/proposals",
             self.get_proposals,
             methods=["GET"],
             response_model=ResponseProposal,
+            tags=["Proposals"],
+        )
+        self.router.add_api_route(
+            "/proposals/{proposal_id}",
+            self.get_proposals_by_id,
+            methods=["GET"],
+            response_model=ResponseProposal,
+            tags=["Proposals by ID"],
+        )
+        self.router.add_api_route(
+            "/rfps/{rfp_id}/proposals",
+            self.get_proposals_by_rfp_id,
+            methods=["GET"],
+            response_model=ResponseProposal,
+            tags=["Proposals by RFP ID"],
+        )
+        self.router.add_api_route(
+            "/rfps/{rfp_id}/proposals/{proposal_id}",
+            self.get_proposals_by_proposal_and_rfp_id,
+            methods=["GET"],
+            response_model=ResponseProposal,
+            tags=["Proposals by Proposal and RFP ID"],
         )
         self.router.add_api_route(
-            "/proposal",
+            "/proposals",
             self.create_proposal,
             methods=["POST"],
             response_model=ResponseProposal,
+            tags=["Proposals"],
         )
         self.router.add_api_route(
-            "/proposal",
+            "/proposals/{proposal_id}",
             self.update_proposal,
             methods=["PUT"],
             response_model=ResponseProposal,
+            tags=["Proposals by ID"],
         )
         self.router.add_api_route(
-            "/proposal",
+            "/proposals/{proposal_id}",
             self.delete_proposal,
             methods=["DELETE"],
             response_model=ProposalDeleteResponse,
+            tags=["Proposals by ID"],
+        )
+        self.router.add_api_route(
+            "/rfps/{rfp_id}/proposals",
+            self.delete_proposals_by_rfp_id,
+            methods=["DeLETE"],
+            response_model=ProposalDeleteResponse,
+            tags=["Proposals by RFP ID"],
+        )
+        self.router.add_api_route(
+            "/rfps/{rfp_id}/proposals/{proposal_id}",
+            self.delete_proposals_by_proposal_and_rfp_id,
+            methods=["DeLETE"],
+            response_model=ProposalDeleteResponse,
+            tags=["Proposals by Proposal and RFP ID"],
         )
 
     async def get_proposals(
+        self
+    ):
+        async with self.__proposal_service() as service:
+            try:
+                proposals = await service.get_proposals()
+                return ResponseProposal(
+                    status="success", data=[Proposal(**p) for p in proposals]
+                )
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to retrieve proposals."
+                )
+            
+    async def get_proposals_by_id(
+        self,
+        proposal_id: str = Path(...),
+    ):
+        async with self.__proposal_service() as service:
+            try:
+                proposals = await service.get_proposals(proposal_id=proposal_id)
+                return ResponseProposal(
+                    status="success", data=[Proposal(**p) for p in proposals]
+                )
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to retrieve proposals."
+                )
+            
+    async def get_proposals_by_rfp_id(
         self,
-        proposal_id: str = Query(None),
-        rfp_id: str = Query(None),
-        status: ProposalStatus = Query(None),
+        rfp_id: str = Path(...),
     ):
         async with self.__proposal_service() as service:
             try:
-                proposals = await service.get_proposals(
-                    proposal_id=proposal_id, rfp_id=rfp_id, status=status
+                proposals = await service.get_proposals(rfp_id=rfp_id)
+                return ResponseProposal(
+                    status="success", data=[Proposal(**p) for p in proposals]
+                )
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to retrieve proposals."
                 )
+            
+    async def get_proposals_by_proposal_and_rfp_id(
+        self,
+        rfp_id: str = Path(...),
+        proposal_id: str = Path(...),
+    ):
+        async with self.__proposal_service() as service:
+            try:
+                proposals = await service.get_proposals(rfp_id=rfp_id, proposal_id=proposal_id)
                 return ResponseProposal(
                     status="success", data=[Proposal(**p) for p in proposals]
                 )
@@ -110,11 +192,12 @@ class ProposalController:
                     status_code=500, detail="Failed to create proposal."
                 )
 
-    async def update_proposal(self, proposal: ProposalUpdateRequest):
+    async def update_proposal(self, proposal: ProposalUpdateRequest, proposal_id: str = Path(...)):
         async with self.__proposal_service() as service:
             try:
                 updated_proposal = await service.update_proposal(
-                    proposal.model_dump(exclude_unset=True)
+                    proposal_id=proposal_id,
+                    proposal=proposal.model_dump(exclude_unset=True)
                 )
                 return ResponseProposal(
                     status="success", data=[Proposal(**updated_proposal)]
@@ -126,16 +209,12 @@ class ProposalController:
                 )
 
     async def delete_proposal(
-        self, proposal_id: str = Query(None), rfp_id: str = Query(None)
+        self, proposal_id: str = Path(...)
     ):
         async with self.__proposal_service() as service:
             try:
-                if not proposal_id and not rfp_id:
-                    raise HTTPException(
-                        status_code=400, detail="Proposal ID or RFP ID is required."
-                    )
                 status = await service.delete_proposal(
-                    proposal_id=proposal_id, rfp_id=rfp_id
+                    proposal_id=proposal_id
                 )
                 if not status:
                     raise HTTPException(status_code=404, detail="Proposal not found.")
@@ -145,3 +224,37 @@ class ProposalController:
                 raise HTTPException(
                     status_code=500, detail="Failed to delete proposal."
                 )
+            
+    async def delete_proposals_by_rfp_id(
+        self, rfp_id: str = Path(...)
+    ):
+        async with self.__proposal_service() as service:
+            try:
+                status = await service.delete_proposal(
+                    rfp_id=rfp_id
+                )
+                if not status:
+                    raise HTTPException(status_code=404, detail="Proposal not found.")
+                return ProposalDeleteResponse(status="success")
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete proposal."
+                )
+            
+    async def delete_proposals_by_proposal_and_rfp_id(
+        self, rfp_id: str = Path(...), proposal_id: str = Path(...)
+    ):
+        async with self.__proposal_service() as service:
+            try:
+                status = await service.delete_proposal(
+                    rfp_id=rfp_id, proposal_id=proposal_id
+                )
+                if not status:
+                    raise HTTPException(status_code=404, detail="Proposal not found.")
+                return ProposalDeleteResponse(status="success")
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(
+                    status_code=500, detail="Failed to delete proposal."
+                )

src/controllers/_rfp_controller.py

@@ -1,3 +1,4 @@
+from fastapi import Path
 from fastapi import APIRouter, HTTPException, Query
 from pydantic import BaseModel, Field
 from typing import List, Optional
@@ -33,7 +34,6 @@ class RFPRequest(BaseModel):
 
 
 class RFPUpdateRequest(BaseModel):
-    id: str
     rfp_number: Optional[str] = None
     name: Optional[str] = None
     received_proposals: Optional[int] = None
@@ -50,22 +50,38 @@ class RFPController:
         self.__rfp_service = RFPService
         self.router = APIRouter()
         self.router.add_api_route(
-            "/rfp", self.get_rfps, methods=["GET"], response_model=ResponseRFP
+            "/rfps", self.get_rfps, methods=["GET"], response_model=ResponseRFP, tags=["RFPs"]
         )
         self.router.add_api_route(
-            "/rfp", self.create_rfp, methods=["POST"], response_model=ResponseRFP
+            "/rfps/{rfp_id}", self.get_rfps_by_id, methods=["GET"], response_model=ResponseRFP, tags=["RFPs by ID"]
         )
         self.router.add_api_route(
-            "/rfp", self.update_rfp, methods=["PUT"], response_model=ResponseRFP
+            "/rfps", self.create_rfp, methods=["POST"], response_model=ResponseRFP, tags=["RFPs"]
         )
         self.router.add_api_route(
-            "/rfp",
+            "/rfps/{rfp_id}", self.update_rfp, methods=["PUT"], response_model=ResponseRFP, tags=["RFPs by ID"]
+        )
+        self.router.add_api_route(
+            "/rfps/{rfp_id}",
             self.delete_rfp,
             methods=["DELETE"],
             response_model=RFPDeleteResponse,
+            tags=["RFPs by ID"],
         )
 
-    async def get_rfps(self, rfp_id: str = Query(None)):
+    async def get_rfps(self):
+        async with self.__rfp_service() as service:
+            try:
+                rfps = await service.get_rfps()
+                return ResponseRFP(status="success", data=[RFP(**rfp) for rfp in rfps])
+            except HTTPException as e:
+                logger.warning(e)
+                raise e
+            except Exception as e:
+                logger.exception(e)
+                raise HTTPException(status_code=500, detail="Failed to retrieve RFPs.")
+            
+    async def get_rfps_by_id(self, rfp_id: str = Path(...)):
         async with self.__rfp_service() as service:
             try:
                 rfps = await service.get_rfps(rfp_id=rfp_id)
@@ -89,10 +105,10 @@ class RFPController:
                 logger.exception(e)
                 raise HTTPException(status_code=500, detail="Failed to create RFP.")
 
-    async def update_rfp(self, rfp: RFPUpdateRequest):
+    async def update_rfp(self, rfp: RFPUpdateRequest, rfp_id: str = Path(...)):
         async with self.__rfp_service() as service:
             try:
-                rfp = await service.update_rfp(rfp.model_dump(exclude_unset=True))
+                rfp = await service.update_rfp(rfp_id=rfp_id, rfp=rfp.model_dump(exclude_unset=True))
                 return ResponseRFP(status="success", data=[RFP(**rfp)])
             except HTTPException as e:
                 logger.warning(e)
@@ -101,7 +117,7 @@ class RFPController:
                 logger.exception(e)
                 raise HTTPException(status_code=500, detail="Failed to update RFP.")
 
-    async def delete_rfp(self, rfp_id: str = Query(...)):
+    async def delete_rfp(self, rfp_id: str = Path(...)):
         async with self.__rfp_service() as service:
             try:
                 status = await service.delete_rfp(rfp_id)

src/repositories/_proposal_repository.py

@@ -46,9 +46,9 @@ class ProposalRepository(BaseRepository):
             await session.refresh(instance)
             return {k: v for k, v in instance.__dict__.items() if not k.startswith("_")}
 
-    async def update_proposal(self, proposal: dict):
+    async def update_proposal(self, proposal_id: str, proposal: dict):
         async with self.get_session() as session:
-            instance = await session.get(Proposal, proposal["id"])
+            instance = await session.get(Proposal, proposal_id)
             if not instance:
                 return None
             for key, value in proposal.items():

src/repositories/_rfp_repository.py

@@ -45,9 +45,9 @@ class RFPRepository(BaseRepository):
             }
             return rsult_dict
 
-    async def update_rfp(self, rfp: dict):
+    async def update_rfp(self, rfp_id: str, rfp: dict):
         async with self.get_session() as session:
-            instance = await session.get(RFP, rfp["id"])
+            instance = await session.get(RFP, rfp_id)
             for key, value in rfp.items():
                 setattr(instance, key, value)
             await session.commit()

src/services/_proposal_service.py

@@ -28,9 +28,9 @@ class ProposalService:
         async with self.proposal_repository() as repository:
             return await repository.create_proposal(proposal)
 
-    async def update_proposal(self, proposal: dict):
+    async def update_proposal(self, proposal_id: str, proposal: dict):
         async with self.proposal_repository() as repository:
-            return await repository.update_proposal(proposal)
+            return await repository.update_proposal(proposal_id=proposal_id, proposal=proposal)
 
     async def delete_proposal(self, proposal_id: str = None, rfp_id: str = None):
         async with self.proposal_repository() as repository:

src/services/_rfp_service.py

@@ -20,9 +20,9 @@ class RFPService:
         async with self.rfp_repository() as repository:
             return await repository.create_rfp(rfp)
 
-    async def update_rfp(self, rfp: dict):
+    async def update_rfp(self, rfp_id: str, rfp: dict):
         async with self.rfp_repository() as repository:
-            return await repository.update_rfp(rfp)
+            return await repository.update_rfp(rfp_id=rfp_id, rfp=rfp)
 
     async def delete_rfp(self, rfp_id: str):
         async with self.rfp_repository() as repository: