Merge pull request #497 from Police-Data-Accessibility-Project/mc_489_update_root_url_and_redirect_url_logic

Update root URL and redirect URL logic

Author: maxachis

alembic/versions/2025_10_17_1826-7fc6502f1fa3_add_trailing_slash_column.py

@@ -0,0 +1,147 @@
+"""Add trailing slash column
+
+Revision ID: 7fc6502f1fa3
+Revises: ff4e8b2f6348
+Create Date: 2025-10-17 18:26:56.756915
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '7fc6502f1fa3'
+down_revision: Union[str, None] = 'ff4e8b2f6348'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    _remove_duplicates()
+    _add_trailing_slash_column()
+    _migrate_trailing_slash_to_column()
+    _remove_trailing_slash_from_url_column()
+    _add_check_constraint_forbidding_trailing_slash_in_url()
+
+def _remove_duplicates():
+    op.execute(
+        """
+        DELETE FROM urls
+        WHERE id IN (
+            23504,
+            29401,
+            21032,
+            23687,
+            15760,
+            17574,
+            17669,
+            21382,
+            11697,
+            18076,
+            27764,
+            11395,
+            17702,
+            26857,
+            30843,
+            21850,
+            29471,
+            26789,
+            19428,
+            18452,
+            30547,
+            24004,
+            27857,
+            30260,
+            26968,
+            27065,
+            29073,
+            21827,
+            25615,
+            28644,
+            24417,
+            29801,
+            27625,
+            15708,
+            23517,
+            26415,
+            26081,
+            7478,
+            20368,
+            19494,
+            26624,
+            3817,
+            3597,
+            3568,
+            16113,
+            24125,
+            30625,
+            29965,
+            23134,
+            19207,
+            12158,
+            3835,
+            24730,
+            17113,
+            29987,
+            21452,
+            24605,
+            5043,
+            17237,
+            25522,
+            11065,
+            12387,
+            12210,
+            11185,
+            11961,
+            4935,
+            24200,
+            29028,
+            24371,
+            28355,
+            17620,
+            19546,
+            3598
+        )
+        """
+    )
+
+def _add_trailing_slash_column():
+    op.add_column(
+        'urls',
+        sa.Column(
+            'trailing_slash',
+            sa.Boolean(),
+            nullable=False,
+            server_default=sa.text('false')
+        )
+    )
+
+def _migrate_trailing_slash_to_column():
+    op.execute(
+        """
+        UPDATE urls
+        SET trailing_slash = url ~ '/$'
+        """
+    )
+
+def _remove_trailing_slash_from_url_column():
+    op.execute(
+        """
+        UPDATE urls
+        SET url = rtrim(url, '/')
+        WHERE url like '%/';
+        """
+    )
+
+def _add_check_constraint_forbidding_trailing_slash_in_url():
+    op.execute(
+        """
+        ALTER TABLE urls
+        ADD CONSTRAINT no_trailing_slash CHECK (url !~ '/$')
+        """
+    )
+
+def downgrade() -> None:
+    pass

src/api/endpoints/annotate/_shared/extract.py

@@ -15,7 +15,7 @@
 from src.api.endpoints.annotate.all.get.queries.location_.core import GetLocationSuggestionsQueryBuilder
 from src.api.endpoints.annotate.all.get.queries.name.core import GetNameSuggestionsQueryBuilder
 from src.db.dto_converter import DTOConverter
-from src.db.dtos.url.mapping import URLMapping
+from src.db.dtos.url.mapping_.simple import SimpleURLMapping
 from src.db.models.impl.url.core.sqlalchemy import URL
 from src.db.models.impl.url.suggestion.agency.user import UserUrlAgencySuggestion
 
@@ -44,7 +44,7 @@ async def extract_and_format_get_annotation_result(
         await GetNameSuggestionsQueryBuilder(url_id=url.id).run(session)
     return GetNextURLForAllAnnotationResponse(
         next_annotation=GetNextURLForAllAnnotationInnerResponse(
-            url_info=URLMapping(
+            url_info=SimpleURLMapping(
                 url_id=url.id,
                 url=url.full_url
             ),

src/api/endpoints/annotate/dtos/shared/base/response.py

@@ -1,14 +1,12 @@
-from typing import Optional
-
 from pydantic import BaseModel, Field
 
 from src.api.endpoints.annotate.dtos.shared.batch import AnnotationBatchInfo
 from src.core.tasks.url.operators.html.scraper.parser.dtos.response_html import ResponseHTMLInfo
-from src.db.dtos.url.mapping import URLMapping
+from src.db.dtos.url.mapping_.simple import SimpleURLMapping
 
 
 class AnnotationInnerResponseInfoBase(BaseModel):
-    url_info: URLMapping = Field(
+    url_info: SimpleURLMapping = Field(
         title="Information about the URL"
     )
     html_info: ResponseHTMLInfo = Field(

src/api/endpoints/collector/manual/query.py

@@ -48,13 +48,14 @@ async def run(self, session: AsyncSession) -> ManualBatchResponseDTO:
             url_and_scheme: URLAndScheme = get_url_and_scheme(entry.url)
 
             url = URL(
-                url=url_and_scheme.url,
+                url=url_and_scheme.url.rstrip('/'),
                 scheme=url_and_scheme.scheme,
                 name=entry.name,
                 description=entry.description,
                 collector_metadata=entry.collector_metadata,
                 status=URLStatus.OK.value,
-                source=URLSource.MANUAL
+                source=URLSource.MANUAL,
+                trailing_slash=url_and_scheme.url.endswith('/'),
             )
 
 

src/api/endpoints/submit/url/queries/core.py

@@ -63,6 +63,7 @@ async def run(self, session: AsyncSession) -> URLSubmissionResponse:
             scheme=url_and_scheme.scheme,
             source=URLSource.MANUAL,
             status=URLStatus.OK,
+            trailing_slash=url_and_scheme.url.endswith('/'),
         )
         session.add(url_insert)
         await session.flush()

src/collectors/queries/insert/url.py

@@ -19,11 +19,12 @@ async def run(self, session: AsyncSession) -> int:
         """Insert a new URL into the database."""
         url_and_scheme: URLAndScheme = get_url_and_scheme(self.url_info.url)
         url_entry = URL(
-            url=url_and_scheme.url,
+            url=url_and_scheme.url.rstrip('/'),
             scheme=url_and_scheme.scheme,
             collector_metadata=self.url_info.collector_metadata,
             status=self.url_info.status.value,
-            source=self.url_info.source
+            source=self.url_info.source,
+            trailing_slash=url_and_scheme.url.endswith('/'),
         )
         if self.url_info.created_at is not None:
             url_entry.created_at = self.url_info.created_at

src/collectors/queries/insert/urls/query.py

@@ -4,7 +4,7 @@
 from src.collectors.queries.insert.urls.request_manager import InsertURLsRequestManager
 from src.util.url import clean_url
 from src.db.dtos.url.insert import InsertURLsInfo
-from src.db.dtos.url.mapping import URLMapping
+from src.db.dtos.url.mapping_.simple import SimpleURLMapping
 from src.db.models.impl.duplicate.pydantic.insert import DuplicateInsertInfo
 from src.db.models.impl.url.core.pydantic.info import URLInfo
 from src.db.queries.base.builder import QueryBuilderBase
@@ -32,7 +32,7 @@ async def run(self, session: AsyncSession) -> InsertURLsInfo:
                 async with session.begin_nested() as sp:
                     url_id = await rm.insert_url(url_info)
                     url_mappings.append(
-                        URLMapping(
+                        SimpleURLMapping(
                             url_id=url_id,
                             url=url_info.url
                         )

src/core/tasks/scheduled/impl/internet_archives/probe/convert.py

@@ -1,10 +1,10 @@
 from src.db.models.impl.url.internet_archives.probe.pydantic import URLInternetArchiveMetadataPydantic
 from src.external.internet_archives.models.ia_url_mapping import InternetArchivesURLMapping
-from src.util.url_mapper import URLMapper
+from src.util.url_mapper_.simple import SimpleURLMapper
 
 
 def convert_ia_url_mapping_to_ia_metadata(
-    url_mapper: URLMapper,
+    url_mapper: SimpleURLMapper,
     ia_mapping: InternetArchivesURLMapping
 ) -> URLInternetArchiveMetadataPydantic:
     iam = ia_mapping.ia_metadata

src/core/tasks/scheduled/impl/internet_archives/probe/operator.py

@@ -12,15 +12,15 @@
     CheckURLInternetArchivesTaskPrerequisitesQueryBuilder
 from src.core.tasks.scheduled.templates.operator import ScheduledTaskOperatorBase
 from src.db.client.async_ import AsyncDatabaseClient
-from src.db.dtos.url.mapping import URLMapping
+from src.db.dtos.url.mapping_.simple import SimpleURLMapping
 from src.db.enums import TaskType
 from src.db.models.impl.flag.checked_for_ia.pydantic import FlagURLCheckedForInternetArchivesPydantic
 from src.db.models.impl.url.internet_archives.probe.pydantic import URLInternetArchiveMetadataPydantic
 from src.db.models.impl.url.task_error.pydantic_.small import URLTaskErrorSmall
 from src.external.internet_archives.client import InternetArchivesClient
 from src.external.internet_archives.models.ia_url_mapping import InternetArchivesURLMapping
 from src.util.progress_bar import get_progress_bar_disabled
-from src.util.url_mapper import URLMapper
+from src.util.url_mapper_.simple import SimpleURLMapper
 
 
 class InternetArchivesProbeTaskOperator(
@@ -51,10 +51,10 @@ async def inner_task_logic(self) -> None:
             DeleteOldUnsuccessfulIACheckedFlagsQueryBuilder()
         )
 
-        url_mappings: list[URLMapping] = await self._get_url_mappings()
+        url_mappings: list[SimpleURLMapping] = await self._get_url_mappings()
         if len(url_mappings) == 0:
             return
-        mapper = URLMapper(url_mappings)
+        mapper = SimpleURLMapper(url_mappings)
 
         await self.link_urls_to_task(mapper.get_all_ids())
 
@@ -65,7 +65,7 @@ async def inner_task_logic(self) -> None:
         await self._add_errors_to_db(mapper, ia_mappings=subsets.error)
         await self._add_ia_metadata_to_db(mapper, ia_mappings=subsets.has_metadata)
 
-    async def _add_errors_to_db(self, mapper: URLMapper, ia_mappings: list[InternetArchivesURLMapping]) -> None:
+    async def _add_errors_to_db(self, mapper: SimpleURLMapper, ia_mappings: list[InternetArchivesURLMapping]) -> None:
         url_error_info_list: list[URLTaskErrorSmall] = []
         for ia_mapping in ia_mappings:
             url_id = mapper.get_id(ia_mapping.url)
@@ -76,7 +76,7 @@ async def _add_errors_to_db(self, mapper: URLMapper, ia_mappings: list[InternetA
             url_error_info_list.append(url_error_info)
         await self.add_task_errors(url_error_info_list)
 
-    async def _get_url_mappings(self) -> list[URLMapping]:
+    async def _get_url_mappings(self) -> list[SimpleURLMapping]:
         return await self.adb_client.run_query_builder(
             GetURLsForInternetArchivesTaskQueryBuilder()
         )
@@ -93,7 +93,7 @@ async def _search_for_internet_archive_links(self, urls: list[str]) -> list[Inte
 
     async def _add_ia_metadata_to_db(
         self,
-        url_mapper: URLMapper,
+        url_mapper: SimpleURLMapper,
         ia_mappings: list[InternetArchivesURLMapping],
     ) -> None:
         insert_objects: list[URLInternetArchiveMetadataPydantic] = [
@@ -106,7 +106,7 @@ async def _add_ia_metadata_to_db(
         await self.adb_client.bulk_insert(insert_objects)
 
     async def _add_ia_flags_to_db(
-        self, mapper: URLMapper, ia_mappings: list[InternetArchivesURLMapping]) -> None:
+        self, mapper: SimpleURLMapper, ia_mappings: list[InternetArchivesURLMapping]) -> None:
         flags: list[FlagURLCheckedForInternetArchivesPydantic] = []
         for ia_mapping in ia_mappings:
             url_id = mapper.get_id(ia_mapping.url)

src/core/tasks/scheduled/impl/internet_archives/probe/queries/get.py

@@ -1,18 +1,15 @@
-from sqlalchemy import select, or_, exists, text, func
+from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from src.core.tasks.scheduled.impl.internet_archives.probe.queries.cte import CheckURLInternetArchivesCTEContainer
-from src.db.dtos.url.mapping import URLMapping
-from src.db.helpers.query import not_exists_url
-from src.db.models.impl.flag.checked_for_ia.sqlalchemy import FlagURLCheckedForInternetArchives
-from src.db.models.impl.url.core.sqlalchemy import URL
+from src.db.dtos.url.mapping_.simple import SimpleURLMapping
 from src.db.queries.base.builder import QueryBuilderBase
 
 from src.db.helpers.session import session_helper as sh
 
 class GetURLsForInternetArchivesTaskQueryBuilder(QueryBuilderBase):
 
-    async def run(self, session: AsyncSession) -> list[URLMapping]:
+    async def run(self, session: AsyncSession) -> list[SimpleURLMapping]:
         cte = CheckURLInternetArchivesCTEContainer()
         query = (
             select(
@@ -24,7 +21,7 @@ async def run(self, session: AsyncSession) -> list[URLMapping]:
 
         db_mappings = await sh.mappings(session, query=query)
         return [
-            URLMapping(
+            SimpleURLMapping(
                 url_id=mapping["url_id"],
                 url=mapping["url"]
             ) for mapping in db_mappings