Dev to Main January 4 2026

ENV.md

@@ -80,6 +80,7 @@ Note that some tasks/subtasks are themselves enabled by other tasks.
 | `DS_APP_SYNC_META_URL_ADD_TASK_FLAG`       | Adds new meta URLs to the Data Sources App|
 | `DS_APP_SYNC_META_URL_UPDATE_TASK_FLAG`    | Updates existing meta URLs in the Data Sources App|
 | `DS_APP_SYNC_META_URL_DELETE_TASK_FLAG`    | Deletes meta URLs in the Data Sources App|
+| `DS_APP_SYNC_USER_FOLLOWS_GET_TASK_FLAG`   | Gets user follows from the Data Sources App|
 | `INTEGRITY_MONITOR_TASK_FLAG`              | Runs integrity checks. |
 
 ### URL Task Flags

alembic/versions/2025_12_05_1721-dfb64594049f_create_anonymous_annotation_name.py

@@ -0,0 +1,47 @@
+"""Create anonymous_annotation_name
+
+Revision ID: dfb64594049f
+Revises: 1d3398f9cd8a
+Create Date: 2025-12-05 17:21:35.134935
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import UUID
+
+from src.util.alembic_helpers import created_at_column
+
+# revision identifiers, used by Alembic.
+revision: str = 'dfb64594049f'
+down_revision: Union[str, None] = '1d3398f9cd8a'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "link__anonymous_sessions__name_suggestions",
+        sa.Column(
+            "session_id",
+            UUID,
+            sa.ForeignKey("anonymous_sessions.id"),
+            nullable=False
+        ),
+        sa.Column(
+            "suggestion_id",
+            sa.Integer(),
+            sa.ForeignKey("url_name_suggestions.id"),
+            nullable=False,
+        ),
+        created_at_column(),
+        sa.PrimaryKeyConstraint(
+            "session_id",
+            "suggestion_id"
+        )
+    )
+
+
+def downgrade() -> None:
+    pass

alembic/versions/2025_12_18_0951-9292faed37fd_rename_suggestion_tables_to_consistent_.py

@@ -0,0 +1,53 @@
+"""Rename suggestion tables to consistent nomenclature
+
+Revision ID: 9292faed37fd
+Revises: dfb64594049f
+Create Date: 2025-12-18 09:51:20.074946
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '9292faed37fd'
+down_revision: Union[str, None] = 'dfb64594049f'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+OLD_NEW_TABLE_MAPPING = {
+    # Anonymous Suggestions
+    "anonymous_annotation_agency": "annotation__agency__anon",
+    "anonymous_annotation_location": "annotation__location__anon",
+    "anonymous_annotation_record_type": "annotation__record_type__anon",
+    "anonymous_annotation_url_type": "annotation__url_type__anon",
+    # User Suggestions
+    "user_url_agency_suggestions": "annotation__agency__user",
+    "user_location_suggestions": "annotation__location__user",
+    "user_record_type_suggestions": "annotation__record_type__user",
+    "user_url_type_suggestions": "annotation__url_type__user",
+    # Auto suggestions
+    "auto_location_id_subtasks": "annotation__location__auto__subtasks",
+    "location_id_subtask_suggestions": "annotation__location__auto__suggestions",
+    "url_auto_agency_id_subtasks": "annotation__agency__auto__subtasks",
+    "agency_id_subtask_suggestions": "annotation__agency__auto__suggestions",
+    "auto_record_type_suggestions": "annotation__record_type__auto",
+    "auto_relevant_suggestions": "annotation__url_type__auto",
+    # Name suggestions
+    "url_name_suggestions": "annotation__name__suggestions",
+    "link__anonymous_sessions__name_suggestions": "annotation__name__anon__endorsements",
+    "link_user_name_suggestions": "annotation__name__user__endorsements",
+}
+
+def upgrade() -> None:
+    for old_table_name, new_table_name in OLD_NEW_TABLE_MAPPING.items():
+        op.rename_table(
+            old_table_name=old_table_name,
+            new_table_name=new_table_name
+        )
+
+
+def downgrade() -> None:
+    pass

alembic/versions/2025_12_21_1957-30ee666f15d1_add_pending_agencies_tables.py

@@ -0,0 +1,112 @@
+"""Add pending agencies tables
+
+Revision ID: 30ee666f15d1
+Revises: 9292faed37fd
+Create Date: 2025-12-21 19:57:58.199838
+
+Design notes:
+
+After debating it internally, I elected to have a separate pending agencies table,
+rather than adding an `approval status` column to the agencies table.
+
+This is for a few reasons:
+ 1. Many existing queries and models rely on the current agency setup,
+    and would need to be retrofitted in order to filter
+    approved and unapproved agencies.
+ 2. Some existing links, such as between agencies and batches, between agencies and URLs,
+    or agency annotations for URLs, would not make sense for pending agencies,
+    and would be difficult to prevent in the database.
+
+This setup does, however, make it more difficult to check for duplicates between
+existing agencies and pending agencies. However, I concluded it was better for
+pending agencies to be negatively affected by these design choices than
+for existing agencies to be affected by the above design choices.
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+from src.util.alembic_helpers import id_column, created_at_column, enum_column, agency_id_column
+
+# revision identifiers, used by Alembic.
+revision: str = '30ee666f15d1'
+down_revision: Union[str, None] = '9292faed37fd'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+
+
+def upgrade() -> None:
+    _create_proposed_agency_table()
+    _create_proposed_agency_location_table()
+    _create_proposed_agency_decision_info_table()
+
+def _create_proposed_agency_decision_info_table():
+    op.create_table(
+        "proposal__agencies__decision_info",
+        sa.Column("proposal_agency_id", sa.Integer(), sa.ForeignKey("proposal__agencies.id"), nullable=False),
+        sa.Column("deciding_user_id", sa.Integer),
+        sa.Column("rejection_reason", sa.String(), nullable=True),
+        created_at_column(),
+        sa.PrimaryKeyConstraint("proposal_agency_id")
+    )
+
+
+def _create_proposed_agency_table():
+    op.execute("CREATE TYPE proposal_status_enum AS ENUM ('pending', 'approved', 'rejected');")
+
+    op.create_table(
+        "proposal__agencies",
+        id_column(),
+        sa.Column("name", sa.String(), nullable=False),
+        enum_column(
+            column_name="agency_type",
+            enum_name="agency_type_enum",
+        ),
+        enum_column(
+            column_name="jurisdiction_type",
+            enum_name="jurisdiction_type_enum"
+        ),
+        sa.Column("proposing_user_id", sa.Integer(), nullable=True),
+        sa.Column(
+            "promoted_agency_id",
+            sa.Integer(),
+            sa.ForeignKey(
+                "agencies.id"
+            )
+        ),
+        enum_column(
+            column_name="proposal_status",
+            enum_name="proposal_status_enum",
+        ),
+        created_at_column(),
+        sa.CheckConstraint(
+            "promoted_agency_id IS NULL OR proposal_status = 'pending'",
+            name="ck_agency_id_or_proposal_status"
+        )
+    )
+
+def _create_proposed_agency_location_table():
+    op.create_table(
+        "proposal__link__agencies__locations",
+        sa.Column(
+            "proposal_agency_id",
+            sa.Integer(),
+            sa.ForeignKey("proposal__agencies.id"),
+            nullable=False,
+        ),
+        sa.Column(
+            "location_id",
+            sa.Integer(),
+            sa.ForeignKey("locations.id"),
+            nullable=False
+        ),
+        created_at_column(),
+        sa.PrimaryKeyConstraint("proposal_agency_id", "location_id")
+    )
+
+def downgrade() -> None:
+    pass

alembic/versions/2025_12_24_1854-e88e4e962dc7_add_link__locations__user_follows_table.py

@@ -0,0 +1,42 @@
+"""Add link__locations__user_follows table
+
+Revision ID: e88e4e962dc7
+Revises: 30ee666f15d1
+Create Date: 2025-12-24 18:54:38.897466
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+from src.util.alembic_helpers import add_enum_value, location_id_column, user_id_column, created_at_column
+
+# revision identifiers, used by Alembic.
+revision: str = 'e88e4e962dc7'
+down_revision: Union[str, None] = '30ee666f15d1'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+def upgrade() -> None:
+    _add_link_locations_user_follows_table()
+    _add_follows_sync_task()
+
+def _add_link_locations_user_follows_table():
+    op.create_table(
+        "link__locations__user_follows",
+        location_id_column(),
+        user_id_column(),
+        created_at_column(),
+        sa.PrimaryKeyConstraint("location_id", "user_id"),
+    )
+
+
+def _add_follows_sync_task():
+    add_enum_value(
+        enum_name="task_type",
+        enum_value="Sync User Follows Get"
+    )
+
+def downgrade() -> None:
+    pass