mc_386_internet_archives_probe_reattempt

src/api/endpoints/annotate/all/get/queries/agency/core.py

@@ -16,15 +16,18 @@ class GetAgencySuggestionsQueryBuilder(QueryBuilderBase):
 
     def __init__(
         self,
-        url_id: int
+        url_id: int,
+        location_id: int | None = None
     ):
         super().__init__()
         self.url_id = url_id
+        self.location_id = location_id
 
     async def run(self, session: AsyncSession) -> AgencyAnnotationResponseOuterInfo:
         requester = GetAgencySuggestionsRequester(
             session,
-            url_id=self.url_id
+            url_id=self.url_id,
+            location_id=self.location_id
         )
 
         user_suggestions: list[AgencyAnnotationUserSuggestion] = \

src/api/endpoints/annotate/all/get/queries/agency/requester.py

@@ -9,16 +9,23 @@
     SuggestionsWithHighestConfidenceCTE
 from src.db.helpers.session import session_helper as sh
 from src.db.models.impl.agency.sqlalchemy import Agency
+from src.db.models.impl.link.agency_location.sqlalchemy import LinkAgencyLocation
 from src.db.models.impl.link.user_suggestion_not_found.agency.sqlalchemy import LinkUserSuggestionAgencyNotFound
 from src.db.models.impl.url.suggestion.agency.user import UserUrlAgencySuggestion
 from src.db.templates.requester import RequesterBase
 
 
 class GetAgencySuggestionsRequester(RequesterBase):
 
-    def __init__(self, session: AsyncSession, url_id: int):
+    def __init__(
+        self,
+        session: AsyncSession,
+        url_id: int,
+        location_id: int
+    ):
         super().__init__(session)
         self.url_id = url_id
+        self.location_id = location_id
 
     async def get_user_agency_suggestions(self) -> list[AgencyAnnotationUserSuggestion]:
         query = (
@@ -31,7 +38,22 @@
                 Agency,
                 Agency.agency_id == UserUrlAgencySuggestion.agency_id
             )
-            .where(
+
+        )
+
+        if self.location_id is not None:
+            query = (
+                query.join(
+                    LinkAgencyLocation,
+                    LinkAgencyLocation.agency_id == UserUrlAgencySuggestion.agency_id
+                )
+                .where(
+                    LinkAgencyLocation.location_id == self.location_id
+                )
+            )
+
+        query = (
+            query.where(
                 UserUrlAgencySuggestion.url_id == self.url_id
             )
             .group_by(
@@ -64,11 +86,25 @@
                 cte.confidence,
                 Agency.name.label("agency_name"),
             )
-            .outerjoin(
+            .join(
                 Agency,
                 Agency.agency_id == cte.agency_id
             )
-            .where(
+        )
+
+        if self.location_id is not None:
+            query = (
+                query.join(
+                    LinkAgencyLocation,
+                    LinkAgencyLocation.agency_id == cte.agency_id
+                )
+                .where(
+                    LinkAgencyLocation.location_id == self.location_id
+                )
+            )
+
+        query = (
+            query.where(
                 cte.url_id == self.url_id
             )
             .order_by(

src/api/endpoints/annotate/routes.py

@@ -1,7 +1,9 @@
 from fastapi import APIRouter, Depends, Query
 
 from src.api.dependencies import get_async_core
+from src.api.endpoints.annotate.all.get.models.agency import AgencyAnnotationResponseOuterInfo
 from src.api.endpoints.annotate.all.get.models.response import GetNextURLForAllAnnotationResponse
+from src.api.endpoints.annotate.all.get.queries.agency.core import GetAgencySuggestionsQueryBuilder
 from src.api.endpoints.annotate.all.post.models.request import AllAnnotationPostInfo
 from src.core.core import AsyncCore
 from src.security.dtos.access_info import AccessInfo
@@ -59,4 +61,18 @@
         batch_id=batch_id,
         user_id=access_info.user_id,
         url_id=anno_url_id
+    )
+
+@annotate_router.get("/suggestions/agencies/{url_id}")
+async def get_agency_suggestions(
+    url_id: int,
+    async_core: AsyncCore = Depends(get_async_core),
+    access_info: AccessInfo = Depends(get_access_info),
+    location_id: int | None = Query(default=None)
+) -> AgencyAnnotationResponseOuterInfo:
+    return await async_core.adb_client.run_query_builder(
+        GetAgencySuggestionsQueryBuilder(
+            url_id=url_id,
+            location_id=location_id
+        )
     )