Merge branch 'main' of https://github.com/HHS/simpler-grants-gov

api/src/db/models/extract_models.py

@@ -1,14 +1,21 @@
-from sqlalchemy import BigInteger, Column, DateTime, String, func
+from sqlalchemy import BigInteger, ForeignKey
+from sqlalchemy.orm import Mapped, mapped_column
 
-from db.models.lookup_models import LkExtractType
+from src.adapters.db.type_decorators.postgres_type_decorators import LookupColumn
+from src.constants.lookup_constants import ExtractType
 from src.db.models.base import ApiSchemaTable, TimestampMixin
+from src.db.models.lookup_models import LkExtractType
 
 
 class ExtractMetadata(ApiSchemaTable, TimestampMixin):
     __tablename__ = "extract_metadata"
 
-    extract_metadata_id = Column(BigInteger, primary_key=True, autoincrement=True)
-    extract_type = Column(LkExtractType, nullable=False)
-    file_name = Column(String, nullable=False)
-    file_path = Column(String, nullable=False)
-    file_size_bytes = Column(BigInteger, nullable=False)
+    extract_metadata_id = mapped_column(BigInteger, primary_key=True)
+    extract_type: Mapped[ExtractType] = mapped_column(
+        "extract_type_id",
+        LookupColumn(LkExtractType),
+        ForeignKey(LkExtractType.extract_type_id),
+    )
+    file_name: Mapped[str]
+    file_path: Mapped[str]
+    file_size_bytes: Mapped[int] = mapped_column(BigInteger)

api/src/db/models/lookup_models.py

@@ -4,6 +4,7 @@
     AgencyDownloadFileType,
     AgencySubmissionNotificationSetting,
     ApplicantType,
+    ExternalUserType,
     ExtractType,
     FundingCategory,
     FundingInstrument,