Add agency proposal edit logic

src/api/endpoints/proposals/agencies/approve/query.py → src/api/endpoints/proposals/agencies/by_id/approve/query.py

@@ -3,7 +3,7 @@
 from sqlalchemy.exc import NoResultFound
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.api.endpoints.proposals.agencies.approve.response import ProposalAgencyApproveResponse
+from src.api.endpoints.proposals.agencies.by_id.approve.response import ProposalAgencyApproveResponse
 from src.db.models.impl.agency.enums import JurisdictionType, AgencyType
 from src.db.models.impl.agency.sqlalchemy import Agency
 from src.db.models.impl.link.agency_location.sqlalchemy import LinkAgencyLocation

src/api/endpoints/proposals/agencies/by_id/locations/delete/query.py

@@ -0,0 +1,30 @@
+from sqlalchemy import delete
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from src.db.models.impl.link.agency_location.sqlalchemy import LinkAgencyLocation
+from src.db.models.impl.proposals.agency_.link__location import ProposalLinkAgencyLocation
+from src.db.queries.base.builder import QueryBuilderBase
+
+
+class DeleteProposalAgencyLocationQueryBuilder(QueryBuilderBase):
+
+    def __init__(
+            self,
+            agency_id: int,
+            location_id: int,
+    ):
+        super().__init__()
+        self.agency_id = agency_id
+        self.location_id = location_id
+
+    async def run(self, session: AsyncSession) -> None:
+        statement = (
+            delete(ProposalLinkAgencyLocation)
+            .where(
+                (ProposalLinkAgencyLocation.proposal_agency_id == self.agency_id)
+                & (ProposalLinkAgencyLocation.location_id == self.location_id)
+            )
+        )
+
+        await session.execute(statement)
+

src/api/endpoints/proposals/agencies/by_id/locations/get/query.py

@@ -0,0 +1,41 @@
+from typing import Sequence
+
+from sqlalchemy import select, RowMapping
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from src.api.endpoints.agencies.by_id.locations.get.response import AgencyGetLocationsResponse
+from src.api.endpoints.proposals.agencies.by_id.locations.get.response import ProposalAgencyGetLocationsOuterResponse
+from src.db.models.impl.link.agency_location.sqlalchemy import LinkAgencyLocation
+from src.db.models.impl.proposals.agency_.link__location import ProposalLinkAgencyLocation
+from src.db.models.views.location_expanded import LocationExpandedView
+from src.db.queries.base.builder import QueryBuilderBase
+
+
+class GetProposalAgencyLocationsQueryBuilder(QueryBuilderBase):
+
+    def __init__(
+            self,
+            agency_id: int,
+    ):
+        super().__init__()
+        self.agency_id = agency_id
+
+    async def run(self, session: AsyncSession) -> ProposalAgencyGetLocationsOuterResponse:
+        query = (
+            select(
+                ProposalLinkAgencyLocation.location_id,
+                LocationExpandedView.full_display_name
+            )
+            .where(
+                ProposalLinkAgencyLocation.proposal_agency_id == self.agency_id
+            )
+            .join(
+                LocationExpandedView,
+                LocationExpandedView.id == ProposalLinkAgencyLocation.location_id
+            )
+        )
+
+        result: Sequence[RowMapping] = await self.sh.mappings(session, query=query)
+        return ProposalAgencyGetLocationsOuterResponse(
+            results=[AgencyGetLocationsResponse(**row) for row in result]
+        )

src/api/endpoints/proposals/agencies/by_id/locations/get/response.py

@@ -0,0 +1,7 @@
+from pydantic import BaseModel
+
+from src.api.endpoints.agencies.by_id.locations.get.response import AgencyGetLocationsResponse
+
+
+class ProposalAgencyGetLocationsOuterResponse(BaseModel):
+    results: list[AgencyGetLocationsResponse]

src/api/endpoints/proposals/agencies/by_id/locations/post/query.py

@@ -0,0 +1,23 @@
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from src.db.models.impl.proposals.agency_.link__location import ProposalLinkAgencyLocation
+from src.db.queries.base.builder import QueryBuilderBase
+
+
+class AddProposalAgencyLocationQueryBuilder(QueryBuilderBase):
+
+    def __init__(
+            self,
+            agency_id: int,
+            location_id: int
+    ):
+        super().__init__()
+        self.agency_id = agency_id
+        self.location_id = location_id
+
+    async def run(self, session: AsyncSession) -> None:
+        lal = ProposalLinkAgencyLocation(
+            proposal_agency_id=self.agency_id,
+            location_id=self.location_id,
+        )
+        session.add(lal)

src/api/endpoints/proposals/agencies/by_id/put/query.py

@@ -0,0 +1,45 @@
+from fastapi import HTTPException
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from src.api.endpoints.proposals.agencies.by_id.put.request import ProposalAgencyPutRequest
+from src.db.models.impl.proposals.agency_.core import ProposalAgency
+from src.db.queries.base.builder import QueryBuilderBase
+
+
+class UpdateProposalAgencyQueryBuilder(QueryBuilderBase):
+
+    def __init__(
+            self,
+            agency_id: int,
+            request: ProposalAgencyPutRequest,
+    ):
+        super().__init__()
+        self.agency_id = agency_id
+        self.request = request
+
+    async def run(self, session: AsyncSession) -> None:
+
+        query = (
+            select(
+                ProposalAgency
+            )
+            .where(
+                ProposalAgency.id == self.agency_id
+            )
+        )
+
+        agency: ProposalAgency | None = await self.sh.one_or_none(session, query=query)
+        if not agency:
+            raise HTTPException(status_code=400, detail="Proposed Agency not found")
+
+        if self.request.name is not None:
+            agency.name = self.request.name
+        if self.request.type is not None:
+            agency.agency_type = self.request.type
+        if self.request.jurisdiction_type is not None:
+            agency.jurisdiction_type = self.request.jurisdiction_type
+
+
+
+

src/api/endpoints/proposals/agencies/by_id/put/request.py

@@ -0,0 +1,10 @@
+from src.api.shared.models.request_base import RequestBase
+from src.db.models.impl.agency.enums import AgencyType, JurisdictionType
+
+
+class ProposalAgencyPutRequest(RequestBase):
+    name: str | None = None
+    type: AgencyType | None = None
+    jurisdiction_type: JurisdictionType | None = None
+
+

src/api/endpoints/proposals/agencies/reject/query.py → src/api/endpoints/proposals/agencies/by_id/reject/query.py

@@ -2,8 +2,8 @@
 from sqlalchemy import select, RowMapping, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from src.api.endpoints.proposals.agencies.reject.request import ProposalAgencyRejectRequestModel
-from src.api.endpoints.proposals.agencies.reject.response import ProposalAgencyRejectResponse
+from src.api.endpoints.proposals.agencies.by_id.reject.request import ProposalAgencyRejectRequestModel
+from src.api.endpoints.proposals.agencies.by_id.reject.response import ProposalAgencyRejectResponse
 from src.db.models.impl.proposals.agency_.core import ProposalAgency
 from src.db.models.impl.proposals.agency_.decision_info import ProposalAgencyDecisionInfo
 from src.db.models.impl.proposals.enums import ProposalStatus

src/api/endpoints/proposals/agencies/get/query.py → src/api/endpoints/proposals/agencies/root/get/query.py

@@ -5,7 +5,7 @@
 from sqlalchemy.orm import joinedload
 
 from src.api.endpoints.agencies.by_id.locations.get.response import AgencyGetLocationsResponse
-from src.api.endpoints.proposals.agencies.get.response import ProposalAgencyGetOuterResponse, ProposalAgencyGetResponse
+from src.api.endpoints.proposals.agencies.root.get.response import ProposalAgencyGetOuterResponse, ProposalAgencyGetResponse
 from src.db.models.impl.proposals.agency_.core import ProposalAgency
 from src.db.models.impl.proposals.enums import ProposalStatus
 from src.db.queries.base.builder import QueryBuilderBase

src/api/endpoints/proposals/routes.py

@@ -1,13 +1,21 @@
 from fastapi import APIRouter, Depends, Path
 
 from src.api.dependencies import get_async_core
-from src.api.endpoints.proposals.agencies.approve.query import ProposalAgencyApproveQueryBuilder
-from src.api.endpoints.proposals.agencies.approve.response import ProposalAgencyApproveResponse
-from src.api.endpoints.proposals.agencies.get.query import ProposalAgencyGetQueryBuilder
-from src.api.endpoints.proposals.agencies.get.response import ProposalAgencyGetOuterResponse
-from src.api.endpoints.proposals.agencies.reject.query import ProposalAgencyRejectQueryBuilder
-from src.api.endpoints.proposals.agencies.reject.request import ProposalAgencyRejectRequestModel
-from src.api.endpoints.proposals.agencies.reject.response import ProposalAgencyRejectResponse
+from src.api.endpoints.agencies.by_id.locations.get.response import AgencyGetLocationsResponse
+from src.api.endpoints.proposals.agencies.by_id.approve.query import ProposalAgencyApproveQueryBuilder
+from src.api.endpoints.proposals.agencies.by_id.approve.response import ProposalAgencyApproveResponse
+from src.api.endpoints.proposals.agencies.by_id.locations.delete.query import DeleteProposalAgencyLocationQueryBuilder
+from src.api.endpoints.proposals.agencies.by_id.locations.get.query import GetProposalAgencyLocationsQueryBuilder
+from src.api.endpoints.proposals.agencies.by_id.locations.get.response import ProposalAgencyGetLocationsOuterResponse
+from src.api.endpoints.proposals.agencies.by_id.locations.post.query import AddProposalAgencyLocationQueryBuilder
+from src.api.endpoints.proposals.agencies.by_id.put.query import UpdateProposalAgencyQueryBuilder
+from src.api.endpoints.proposals.agencies.by_id.put.request import ProposalAgencyPutRequest
+from src.api.endpoints.proposals.agencies.root.get.query import ProposalAgencyGetQueryBuilder
+from src.api.endpoints.proposals.agencies.root.get.response import ProposalAgencyGetOuterResponse
+from src.api.endpoints.proposals.agencies.by_id.reject.query import ProposalAgencyRejectQueryBuilder
+from src.api.endpoints.proposals.agencies.by_id.reject.request import ProposalAgencyRejectRequestModel
+from src.api.endpoints.proposals.agencies.by_id.reject.response import ProposalAgencyRejectResponse
+from src.api.shared.models.message_response import MessageResponse
 from src.core.core import AsyncCore
 from src.security.dtos.access_info import AccessInfo
 from src.security.manager import get_access_info
@@ -53,4 +61,58 @@
             deciding_user_id=access_info.user_id,
             request_model=request,
         )
-    )
+    )
+
+@proposal_router.get("/agencies/{proposed_agency_id}/locations")
+async def get_agency_locations(
+    proposed_agency_id: int = Path(
+        description="Agency ID to get locations for"
+    ),
+    async_core: AsyncCore = Depends(get_async_core),
+) -> ProposalAgencyGetLocationsOuterResponse:
+    return await async_core.adb_client.run_query_builder(
+        GetProposalAgencyLocationsQueryBuilder(agency_id=proposed_agency_id)
+    )
+
+@proposal_router.post("/agencies/{proposed_agency_id}/locations/{location_id}")
+async def add_location_to_agency(
+    proposed_agency_id: int = Path(
+        description="Agency ID to add location to"
+    ),
+    location_id: int = Path(
+        description="Location ID to add"
+    ),
+    async_core: AsyncCore = Depends(get_async_core),
+) -> MessageResponse:
+    await async_core.adb_client.run_query_builder(
+        AddProposalAgencyLocationQueryBuilder(agency_id=proposed_agency_id, location_id=location_id)
+    )
+    return MessageResponse(message="Location added to agency.")
+
+@proposal_router.delete("/agencies/{proposed_agency_id}/locations/{location_id}")
+async def remove_location_from_agency(
+    proposed_agency_id: int = Path(
+        description="Agency ID to remove location from"
+    ),
+    location_id: int = Path(
+        description="Location ID to remove"
+    ),
+    async_core: AsyncCore = Depends(get_async_core),
+) -> MessageResponse:
+    await async_core.adb_client.run_query_builder(
+        DeleteProposalAgencyLocationQueryBuilder(agency_id=proposed_agency_id, location_id=location_id)
+    )
+    return MessageResponse(message="Location removed from agency.")
+
+@proposal_router.put("/agencies/{proposed_agency_id}")
+async def update_agency(
+    request: ProposalAgencyPutRequest,
+    proposed_agency_id: int = Path(
+        description="Agency ID to update"
+    ),
+    async_core: AsyncCore = Depends(get_async_core),
+) -> MessageResponse:
+    await async_core.adb_client.run_query_builder(
+        UpdateProposalAgencyQueryBuilder(agency_id=proposed_agency_id, request=request)
+    )
+    return MessageResponse(message="Proposed agency updated.")