f3-data-models 0.4.0__tar.gz → 0.4.2__tar.gz

{f3_data_models-0.4.0 → f3_data_models-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: f3-data-models
-Version: 0.4.0
+Version: 0.4.2
 Summary: The data schema and models for F3 Nation applications.
 License: MIT
 Author: Evan Petzoldt

{f3_data_models-0.4.0 → f3_data_models-0.4.2}/f3_data_models/models.py

@@ -11,6 +11,7 @@ from sqlalchemy import (
     DateTime,
     Float,
     ForeignKey,
+    Index,
     Integer,
     func,
     UniqueConstraint,
@@ -100,6 +101,13 @@ class Event_Category(enum.Enum):
     third_f = 3
 
 
+class Request_Type(enum.Enum):
+    create_location = 1
+    create_event = 2
+    edit = 3
+    delete_event = 4
+
+
 class Base(DeclarativeBase):
     """
     Base class for all models, providing common methods.
@@ -349,6 +357,12 @@ class Org(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
+    __table_args__ = (
+        Index("idx_orgs_parent_id", "parent_id"),
+        Index("idx_orgs_org_type", "org_type"),
+        Index("idx_orgs_is_active", "is_active"),
+    )
+
     locations: Mapped[Optional[List["Location"]]] = relationship(
         "Location", cascade="expunge"
     )
@@ -421,6 +435,10 @@ class EventType_x_Event(Base):
     event_type_id: Mapped[int] = mapped_column(
         ForeignKey("event_types.id"), primary_key=True
     )
+    __table_args__ = (
+        Index("idx_events_x_event_types_event_id", "event_id"),
+        Index("idx_events_x_event_types_event_type_id", "event_type_id"),
+    )
 
     event: Mapped["Event"] = relationship(back_populates="event_x_event_types")
 
@@ -573,6 +591,12 @@ class Location(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
+    __table_args__ = (
+        Index("idx_locations_org_id", "org_id"),
+        Index("idx_locations_name", "name"),
+        Index("idx_locations_is_active", "is_active"),
+    )
+
 
 class Event(Base):
     """
@@ -649,6 +673,12 @@ class Event(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
+    __table_args__ = (
+        Index("idx_events_org_id", "org_id"),
+        Index("idx_events_location_id", "location_id"),
+        Index("idx_events_is_active", "is_active"),
+    )
+
     org: Mapped[Org] = relationship(innerjoin=True, cascade="expunge", viewonly=True)
     location: Mapped[Location] = relationship(
         innerjoin=True, cascade="expunge", viewonly=True
@@ -1113,6 +1143,7 @@ class UpdateRequest(Base):
         location_lng (Optional[float]): The longitude of the location.
         location_id (Optional[int]): The ID of the location.
         location_contact_email (Optional[str]): The contact email of the location.
+        ao_name (Optional[text]): The name of the AO.
         ao_logo (Optional[text]): The URL of the AO logo.
         submitted_by (str): The user who submitted the request.
         submitter_validated (Optional[bool]): Whether the submitter has validated the request. Default is False.
@@ -1120,13 +1151,16 @@ class UpdateRequest(Base):
         reviewed_at (Optional[datetime]): The timestamp when the request was reviewed.
         status (Update_Request_Status): The status of the request. Default is 'pending'.
         meta (Optional[Dict[str, Any]]): Additional metadata for the request.
+        request_type (Request_Type): The type of the request.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
     """
 
     __tablename__ = "update_requests"
 
-    id: Mapped[Uuid] = mapped_column(UUID(as_uuid=True), primary_key=True)
+    id: Mapped[Uuid] = mapped_column(
+        UUID(as_uuid=True), primary_key=True, server_default=func.gen_random_uuid()
+    )
     token: Mapped[Uuid] = mapped_column(
         UUID(as_uuid=True), server_default=func.gen_random_uuid()
     )
@@ -1168,6 +1202,7 @@ class UpdateRequest(Base):
     location_id: Mapped[Optional[int]] = mapped_column(ForeignKey("locations.id"))
     location_contact_email: Mapped[Optional[str]]
 
+    ao_name: Mapped[Optional[text]]
     ao_logo: Mapped[Optional[text]]
 
     submitted_by: Mapped[text]
@@ -1178,6 +1213,6 @@ class UpdateRequest(Base):
         Enum(Update_Request_Status), default=Update_Request_Status.pending
     )
     meta: Mapped[Optional[Dict[str, Any]]]
-
+    request_type: Mapped[Request_Type]
     created: Mapped[dt_create]
     updated: Mapped[dt_update]

{f3_data_models-0.4.0 → f3_data_models-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "f3-data-models"
-version = "0.4.0"
+version = "0.4.2"
 description = "The data schema and models for F3 Nation applications."
 authors = ["Evan Petzoldt <evan.petzoldt@protonmail.com>"]
 readme = "README.md"