Remove attachment type from opportunity attachment schema

Author: mikehgrantsgov

api/src/api/opportunities_v1/opportunity_schemas.py

@@ -16,7 +16,6 @@
     ApplicantType,
     FundingCategory,
     FundingInstrument,
-    OpportunityAttachmentType,
     OpportunityCategory,
     OpportunityStatus,
 )

api/src/constants/lookup_constants.py

@@ -123,11 +123,6 @@ class ExtractType(StrEnum):
     OPPORTUNITIES_CSV = "opportunities_csv"
 
 
-class OpportunityAttachmentType(StrEnum):
-    NOTICE_OF_FUNDING_OPPORTUNITY = "notice_of_funding_opportunity"
-    OTHER = "other"
-
-
 class ExternalUserType(StrEnum):
     LOGIN_GOV = "login_gov"
 

api/src/data_migration/transformation/subtask/transform_opportunity_attachment.py

@@ -4,7 +4,6 @@
 import src.data_migration.transformation.transform_constants as transform_constants
 import src.data_migration.transformation.transform_util as transform_util
 from src.adapters.aws import S3Config
-from src.constants.lookup_constants import OpportunityAttachmentType
 from src.data_migration.transformation.subtask.abstract_transform_subtask import (
     AbstractTransformSubTask,
 )
@@ -187,8 +186,6 @@ def transform_opportunity_attachment(
     target_attachment = OpportunityAttachment(
         attachment_id=source_attachment.syn_att_id,
         opportunity_id=source_attachment.opportunity_id,
-        # TODO - we'll eventually remove attachment type, for now just arbitrarily set the value
-        opportunity_attachment_type=OpportunityAttachmentType.OTHER,
         # Note we calculate the file location here, but haven't yet done anything
         # with s3, the calling function, will handle writing the file to s3.
         file_location=file_location,

api/src/db/migrations/versions/2025_02_07_remove_opportunity_attachment_type.py

@@ -0,0 +1,88 @@
+"""Remove opportunity attachment type
+
+Revision ID: f99f1a5aee8b
+Revises: 43b179a7c92e
+Create Date: 2025-02-07 20:01:38.893554
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "f99f1a5aee8b"
+down_revision = "43b179a7c92e"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("lk_opportunity_attachment_type", schema="api")
+    op.drop_index(
+        "opportunity_attachment_opportunity_attachment_type_id_idx",
+        table_name="opportunity_attachment",
+        schema="api",
+    )
+    op.drop_constraint(
+        "opportunity_attachment_opportunity_attachment_type_id_l_e60d",
+        "opportunity_attachment",
+        schema="api",
+        type_="foreignkey",
+    )
+    op.drop_column("opportunity_attachment", "opportunity_attachment_type_id", schema="api")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "opportunity_attachment",
+        sa.Column(
+            "opportunity_attachment_type_id", sa.INTEGER(), autoincrement=False, nullable=False
+        ),
+        schema="api",
+    )
+    op.create_foreign_key(
+        "opportunity_attachment_opportunity_attachment_type_id_l_e60d",
+        "opportunity_attachment",
+        "lk_opportunity_attachment_type",
+        ["opportunity_attachment_type_id"],
+        ["opportunity_attachment_type_id"],
+        source_schema="api",
+        referent_schema="api",
+    )
+    op.create_index(
+        "opportunity_attachment_opportunity_attachment_type_id_idx",
+        "opportunity_attachment",
+        ["opportunity_attachment_type_id"],
+        unique=False,
+        schema="api",
+    )
+    op.create_table(
+        "lk_opportunity_attachment_type",
+        sa.Column(
+            "opportunity_attachment_type_id", sa.INTEGER(), autoincrement=True, nullable=False
+        ),
+        sa.Column("description", sa.TEXT(), autoincrement=False, nullable=False),
+        sa.Column(
+            "created_at",
+            postgresql.TIMESTAMP(timezone=True),
+            server_default=sa.text("now()"),
+            autoincrement=False,
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            postgresql.TIMESTAMP(timezone=True),
+            server_default=sa.text("now()"),
+            autoincrement=False,
+            nullable=False,
+        ),
+        sa.PrimaryKeyConstraint(
+            "opportunity_attachment_type_id", name="lk_opportunity_attachment_type_pkey"
+        ),
+        schema="api",
+    )
+    # ### end Alembic commands ###

api/src/db/models/lookup_models.py

@@ -9,7 +9,6 @@
     FundingCategory,
     FundingInstrument,
     JobStatus,
-    OpportunityAttachmentType,
     OpportunityCategory,
     OpportunityStatus,
 )
@@ -25,13 +24,6 @@
     ]
 )
 
-OPPORTUNITY_ATTACHMENT_TYPE_CONFIG = LookupConfig(
-    [
-        LookupStr(OpportunityAttachmentType.NOTICE_OF_FUNDING_OPPORTUNITY, 1),
-        LookupStr(OpportunityAttachmentType.OTHER, 2),
-    ]
-)
-
 OPPORTUNITY_CATEGORY_CONFIG = LookupConfig(
     [
         LookupStr(OpportunityCategory.DISCRETIONARY, 1),
@@ -234,21 +226,6 @@ def from_lookup(cls, lookup: Lookup) -> "LkAgencySubmissionNotificationSetting":
         )
 
 
-@LookupRegistry.register_lookup(OPPORTUNITY_ATTACHMENT_TYPE_CONFIG)
-class LkOpportunityAttachmentType(LookupTable, TimestampMixin):
-    __tablename__ = "lk_opportunity_attachment_type"
-
-    opportunity_attachment_type_id: Mapped[int] = mapped_column(primary_key=True)
-    description: Mapped[str]
-
-    @classmethod
-    def from_lookup(cls, lookup: Lookup) -> "LkOpportunityAttachmentType":
-        return LkOpportunityAttachmentType(
-            opportunity_attachment_type_id=lookup.lookup_val,
-            description=lookup.get_description(),
-        )
-
-
 @LookupRegistry.register_lookup(EXTERNAL_USER_TYPE_CONFIG)
 class LkExternalUserType(LookupTable, TimestampMixin):
     __tablename__ = "lk_external_user_type"

api/src/db/models/opportunity_models.py

@@ -10,7 +10,6 @@
     ApplicantType,
     FundingCategory,
     FundingInstrument,
-    OpportunityAttachmentType,
     OpportunityCategory,
     OpportunityStatus,
 )
@@ -20,7 +19,6 @@
     LkApplicantType,
     LkFundingCategory,
     LkFundingInstrument,
-    LkOpportunityAttachmentType,
     LkOpportunityCategory,
     LkOpportunityStatus,
 )
@@ -435,12 +433,6 @@ class OpportunityAttachment(ApiSchemaTable, TimestampMixin):
         BigInteger, ForeignKey(Opportunity.opportunity_id), index=True
     )
     opportunity: Mapped[Opportunity] = relationship(Opportunity)
-    opportunity_attachment_type: Mapped[OpportunityAttachmentType] = mapped_column(
-        "opportunity_attachment_type_id",
-        LookupColumn(LkOpportunityAttachmentType),
-        ForeignKey(LkOpportunityAttachmentType.opportunity_attachment_type_id),
-        index=True,
-    )
 
     file_location: Mapped[str]
     mime_type: Mapped[str]

api/tests/src/db/models/factories.py

@@ -34,7 +34,6 @@
     ExtractType,
     FundingCategory,
     FundingInstrument,
-    OpportunityAttachmentType,
     OpportunityCategory,
     OpportunityCategoryLegacy,
     OpportunityStatus,
@@ -773,7 +772,6 @@ class Meta:
     file_name = factory.Faker("file_name")
     file_description = factory.Faker("sentence")
     file_size_bytes = factory.Faker("random_int", min=1000, max=10000000)
-    opportunity_attachment_type = factory.fuzzy.FuzzyChoice(OpportunityAttachmentType)
 
     created_at = factory.Faker("date_time_between", start_date="-1y", end_date="now")
     updated_at = factory.LazyAttribute(