f3-data-models 0.4.1__tar.gz → 0.4.3__tar.gz

{f3_data_models-0.4.1 → f3_data_models-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: f3-data-models
-Version: 0.4.1
+Version: 0.4.3
 Summary: The data schema and models for F3 Nation applications.
 License: MIT
 Author: Evan Petzoldt
@@ -21,6 +21,7 @@ Requires-Dist: sphinx-autodoc-typehints (>=2.5.0,<3.0.0)
 Requires-Dist: sphinx-multiversion (>=0.2.4,<0.3.0)
 Requires-Dist: sphinx-rtd-theme (>=3.0.2,<4.0.0)
 Requires-Dist: sqlalchemy (>=2.0.36,<3.0.0)
+Requires-Dist: sqlalchemy-citext (>=1.8.0,<2.0.0)
 Requires-Dist: sqlalchemy-schemadisplay (>=2.0,<3.0)
 Requires-Dist: sqlmodel (>=0.0.22,<0.0.23)
 Project-URL: Documentation, https://github.io/F3-Nation/f3-data-models

{f3_data_models-0.4.1 → f3_data_models-0.4.3}/f3_data_models/models.py

@@ -1,5 +1,8 @@
-from datetime import datetime, date, time
+import enum
+from datetime import date, datetime, time
 from typing import Any, Dict, List, Optional
+
+from citext import CIText
 from sqlalchemy import (
     ARRAY,
     JSON,
@@ -9,24 +12,24 @@ from sqlalchemy import (
     VARCHAR,
     Boolean,
     DateTime,
+    Enum,
     Float,
     ForeignKey,
+    Index,
     Integer,
-    func,
     UniqueConstraint,
-    Enum,
     Uuid,
+    func,
     inspect,
 )
-from typing_extensions import Annotated
 from sqlalchemy.orm import (
     DeclarativeBase,
-    mapped_column,
     Mapped,
+    mapped_column,
     relationship,
 )
 from sqlalchemy.orm.attributes import InstrumentedAttribute
-import enum
+from typing_extensions import Annotated
 
 # Custom Annotations
 time_notz = Annotated[time, TIME(timezone=False)]
@@ -34,9 +37,7 @@ time_with_tz = Annotated[time, TIME(timezone=True)]
 ts_notz = Annotated[datetime, DateTime(timezone=False)]
 text = Annotated[str, TEXT]
 intpk = Annotated[int, mapped_column(Integer, primary_key=True, autoincrement=True)]
-dt_create = Annotated[
-    datetime, mapped_column(DateTime, server_default=func.timezone("utc", func.now()))
-]
+dt_create = Annotated[datetime, mapped_column(DateTime, server_default=func.timezone("utc", func.now()))]
 dt_update = Annotated[
     datetime,
     mapped_column(
@@ -48,30 +49,70 @@ dt_update = Annotated[
 
 
 class User_Status(enum.Enum):
+    """
+    Enum representing the status of a user.
+
+    Attributes:
+        active
+        inactive
+        deleted
+    """
+
     active = 1
     inactive = 2
     deleted = 3
 
 
 class Region_Role(enum.Enum):
+    """
+    Enum representing the roles within a region.
+
+    Attributes:
+        user
+        editor
+        admin
+    """
+
     user = 1
     editor = 2
     admin = 3
 
 
 class User_Role(enum.Enum):
+    """
+    Enum representing the roles of a user.
+
+    Attributes:
+        user
+        editor
+        admin
+    """
+
     user = 1
     editor = 2
     admin = 3
 
 
 class Update_Request_Status(enum.Enum):
+    """
+    Enum representing the status of an update request.
+
+    Attributes:
+        pending
+        approved
+        rejected
+    """
+
     pending = 1
     approved = 2
     rejected = 3
 
 
 class Day_Of_Week(enum.Enum):
+    """
+    Enum representing the days of the week.
+    """
+
     monday = 0
     tuesday = 1
     wednesday = 2
@@ -82,11 +123,30 @@ class Day_Of_Week(enum.Enum):
 
 
 class Event_Cadence(enum.Enum):
+    """
+    Enum representing the cadence of an event.
+
+    Attributes:
+        weekly
+        monthly
+    """
+
     weekly = 1
     monthly = 2
 
 
 class Org_Type(enum.Enum):
+    """
+    Enum representing the type of organization.
+
+    Attributes:
+        ao
+        region
+        area
+        sector
+        nation
+    """
+
     ao = 1
     region = 2
     area = 3
@@ -95,12 +155,31 @@ class Org_Type(enum.Enum):
 
 
 class Event_Category(enum.Enum):
+    """
+    Enum representing the category of an event.
+
+    Attributes:
+        first_f
+        second_f
+        third_f
+    """
+
     first_f = 1
     second_f = 2
     third_f = 3
 
 
 class Request_Type(enum.Enum):
+    """
+    Enum representing the type of request.
+
+    Attributes:
+        create_location
+        create_event
+        edit
+        delete_event
+    """
+
     create_location = 1
     create_event = 2
     edit = 3
@@ -153,11 +232,7 @@ class Base(DeclarativeBase):
         Returns:
             dict: A dictionary representation of the model instance.
         """
-        return {
-            c.key: self.get(c.key)
-            for c in self.__table__.columns
-            if c.key not in ["created", "updated"]
-        }
+        return {c.key: self.get(c.key) for c in self.__table__.columns if c.key not in ["created", "updated"]}
 
     def to_update_dict(self) -> Dict[InstrumentedAttribute, Any]:
         update_dict = {}
@@ -173,7 +248,7 @@ class Base(DeclarativeBase):
             related_value = getattr(self, rel.key)
             if related_value is not None:
                 if rel.uselist:
-                    update_dict[rel] = [item for item in related_value]
+                    update_dict[rel] = list(related_value)
                     print(rel, update_dict[rel])
                 else:
                     update_dict[rel] = related_value
@@ -283,9 +358,7 @@ class Role_x_Permission(Base):
     __tablename__ = "roles_x_permissions"
 
     role_id: Mapped[int] = mapped_column(ForeignKey("roles.id"), primary_key=True)
-    permission_id: Mapped[int] = mapped_column(
-        ForeignKey("permissions.id"), primary_key=True
-    )
+    permission_id: Mapped[int] = mapped_column(ForeignKey("permissions.id"), primary_key=True)
 
 
 class Role_x_User_x_Org(Base):
@@ -334,7 +407,7 @@ class Org(Base):
         achievements (Optional[List[Achievement]]): The achievements available within the organization.
         parent_org (Optional[Org]): The parent organization.
         slack_space (Optional[SlackSpace]): The associated Slack workspace.
-    """
+    """  # noqa: E501
 
     __tablename__ = "orgs"
 
@@ -356,9 +429,13 @@ class Org(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
-    locations: Mapped[Optional[List["Location"]]] = relationship(
-        "Location", cascade="expunge"
+    __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")
     event_types: Mapped[Optional[List["EventType"]]] = relationship(
         "EventType",
         primaryjoin="or_(EventType.specific_org_id == Org.id, EventType.specific_org_id.is_(None))",
@@ -376,9 +453,7 @@ class Org(Base):
         cascade="expunge",
         primaryjoin="or_(Achievement.specific_org_id == Org.id, Achievement.specific_org_id.is_(None))",
     )
-    parent_org: Mapped[Optional["Org"]] = relationship(
-        "Org", remote_side=[id], cascade="expunge"
-    )
+    parent_org: Mapped[Optional["Org"]] = relationship("Org", remote_side=[id], cascade="expunge")
     slack_space: Mapped[Optional["SlackSpace"]] = relationship(
         "SlackSpace", secondary="orgs_x_slack_spaces", cascade="expunge"
     )
@@ -397,7 +472,7 @@ class EventType(Base):
         specific_org_id (Optional[int]): The ID of the specific organization.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "event_types"
 
@@ -420,37 +495,20 @@ class EventType_x_Event(Base):
         event_type_id (int): The ID of the associated event type.
 
         event (Event): The associated event.
-    """
+    """  # noqa: E501
 
     __tablename__ = "events_x_event_types"
 
     event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True)
-    event_type_id: Mapped[int] = mapped_column(
-        ForeignKey("event_types.id"), primary_key=True
+    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")
 
 
-# class EventType_x_Org(Base):
-#     """
-#     Model representing the association between event types and organizations. This controls which event types are available for selection at the region level, as well as default types for each AO.
-
-#     Attributes:
-#         event_type_id (int): The ID of the associated event type.
-#         org_id (int): The ID of the associated organization.
-#         is_default (bool): Whether this is the default event type for the organization. Default is False.
-#     """
-
-#     __tablename__ = "event_types_x_org"
-
-#     event_type_id: Mapped[int] = mapped_column(
-#         ForeignKey("event_types.id"), primary_key=True
-#     )
-#     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
-#     is_default: Mapped[bool] = mapped_column(Boolean, default=False)
-
-
 class EventTag(Base):
     """
     Model representing an event tag. These are used to mark special events, such as anniversaries or special workouts.
@@ -485,37 +543,16 @@ class EventTag_x_Event(Base):
         event_tag_id (int): The ID of the associated event tag.
 
         event (Event): The associated event.
-    """
+    """  # noqa: E501
 
     __tablename__ = "event_tags_x_events"
 
     event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True)
-    event_tag_id: Mapped[int] = mapped_column(
-        ForeignKey("event_tags.id"), primary_key=True
-    )
+    event_tag_id: Mapped[int] = mapped_column(ForeignKey("event_tags.id"), primary_key=True)
 
     event: Mapped["Event"] = relationship(back_populates="event_x_event_tags")
 
 
-# class EventTag_x_Org(Base):
-#     """
-#     Model representing the association between event tags and organizations. Controls which event tags are available for selection at the region level.
-
-#     Attributes:
-#         event_tag_id (int): The ID of the associated event tag.
-#         org_id (int): The ID of the associated organization.
-#         color_override (Optional[str]): The calendar color override for the event tag (if the region wants to use something other than the default).
-#     """
-
-#     __tablename__ = "event_tags_x_org"
-
-#     event_tag_id: Mapped[int] = mapped_column(
-#         ForeignKey("event_tags.id"), primary_key=True
-#     )
-#     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
-#     color_override: Mapped[Optional[str]]
-
-
 class Org_x_SlackSpace(Base):
     """
     Model representing the association between organizations and Slack workspaces. This is currently meant to be one to one, but theoretically could support multiple workspaces per organization.
@@ -523,14 +560,12 @@ class Org_x_SlackSpace(Base):
     Attributes:
         org_id (int): The ID of the associated organization.
         slack_space_id (str): The ID of the associated Slack workspace.
-    """
+    """  # noqa: E501
 
     __tablename__ = "orgs_x_slack_spaces"
 
     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
-    slack_space_id: Mapped[int] = mapped_column(
-        ForeignKey("slack_spaces.id"), primary_key=True
-    )
+    slack_space_id: Mapped[int] = mapped_column(ForeignKey("slack_spaces.id"), primary_key=True)
 
 
 class Location(Base):
@@ -554,7 +589,7 @@ class Location(Base):
         meta (Optional[Dict[str, Any]]): Additional metadata for the location.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "locations"
 
@@ -564,12 +599,8 @@ class Location(Base):
     description: Mapped[Optional[text]]
     is_active: Mapped[bool]
     email: Mapped[Optional[str]]
-    latitude: Mapped[Optional[float]] = mapped_column(
-        Float(precision=8, decimal_return_scale=5)
-    )
-    longitude: Mapped[Optional[float]] = mapped_column(
-        Float(precision=8, decimal_return_scale=5)
-    )
+    latitude: Mapped[Optional[float]] = mapped_column(Float(precision=8, decimal_return_scale=5))
+    longitude: Mapped[Optional[float]] = mapped_column(Float(precision=8, decimal_return_scale=5))
     address_street: Mapped[Optional[str]]
     address_street2: Mapped[Optional[str]]
     address_city: Mapped[Optional[str]]
@@ -580,6 +611,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):
     """
@@ -622,7 +659,7 @@ class Event(Base):
         event_tags (Optional[List[EventTag]]): The associated event tags.
         event_x_event_types (List[EventType_x_Event]): The association between the event and event types.
         event_x_event_tags (Optional[List[EventTag_x_Event]]): The association between the event and event tags.
-    """
+    """  # noqa: E501
 
     __tablename__ = "events"
 
@@ -656,10 +693,14 @@ class Event(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
-    org: Mapped[Org] = relationship(innerjoin=True, cascade="expunge", viewonly=True)
-    location: Mapped[Location] = relationship(
-        innerjoin=True, cascade="expunge", viewonly=True
+    __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)
     event_types: Mapped[List[EventType]] = relationship(
         secondary="events_x_event_types",
         innerjoin=True,
@@ -675,9 +716,7 @@ class Event(Base):
     event_x_event_tags: Mapped[Optional[List[EventTag_x_Event]]] = relationship(
         back_populates="event", cascade="save-update, merge, delete"
     )
-    attendance: Mapped[List["Attendance"]] = relationship(
-        back_populates="event", cascade="expunge, delete"
-    )
+    attendance: Mapped[List["Attendance"]] = relationship(back_populates="event", cascade="expunge, delete")
 
 
 class AttendanceType(Base):
@@ -687,7 +726,7 @@ class AttendanceType(Base):
     Attributes:
         type (str): The type of attendance.
         description (Optional[str]): A description of the attendance type.
-    """
+    """  # noqa: E501
 
     __tablename__ = "attendance_types"
 
@@ -707,20 +746,14 @@ class Attendance_x_AttendanceType(Base):
         attendance_type_id (int): The ID of the associated attendance type.
 
         attendance (Attendance): The associated attendance.
-    """
+    """  # noqa: E501
 
     __tablename__ = "attendance_x_attendance_types"
 
-    attendance_id: Mapped[int] = mapped_column(
-        ForeignKey("attendance.id"), primary_key=True
-    )
-    attendance_type_id: Mapped[int] = mapped_column(
-        ForeignKey("attendance_types.id"), primary_key=True
-    )
+    attendance_id: Mapped[int] = mapped_column(ForeignKey("attendance.id"), primary_key=True)
+    attendance_type_id: Mapped[int] = mapped_column(ForeignKey("attendance_types.id"), primary_key=True)
 
-    attendance: Mapped["Attendance"] = relationship(
-        back_populates="attendance_x_attendance_types"
-    )
+    attendance: Mapped["Attendance"] = relationship(back_populates="attendance_x_attendance_types")
 
 
 class User(Base):
@@ -741,15 +774,16 @@ class User(Base):
         status (UserStatus): The status of the user. Default is 'active'.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "users"
+    __table_args__ = (Index("idx_users_email", func.lower("email"), unique=True),)
 
     id: Mapped[intpk]
     f3_name: Mapped[Optional[str]]
     first_name: Mapped[Optional[str]]
     last_name: Mapped[Optional[str]]
-    email: Mapped[str] = mapped_column(VARCHAR, unique=True)
+    email: Mapped[str] = mapped_column(CIText)
     phone: Mapped[Optional[str]]
     emergency_contact: Mapped[Optional[str]]
     emergency_phone: Mapped[Optional[str]]
@@ -758,9 +792,7 @@ class User(Base):
     avatar_url: Mapped[Optional[str]]
     meta: Mapped[Optional[Dict[str, Any]]]
     email_verified: Mapped[Optional[datetime]]
-    status: Mapped[User_Status] = mapped_column(
-        Enum(User_Status), default=User_Status.active
-    )
+    status: Mapped[User_Status] = mapped_column(Enum(User_Status), default=User_Status.active)
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
@@ -788,7 +820,7 @@ class SlackUser(Base):
         slack_updated (Optional[datetime]): The last update time of the Slack user.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "slack_users"
 
@@ -830,7 +862,7 @@ class Attendance(Base):
         slack_user (Optional[SlackUser]): The associated Slack user.
         attendance_x_attendance_types (List[Attendance_x_AttendanceType]): The association between the attendance and attendance types.
         attendance_types (List[AttendanceType]): The associated attendance types.
-    """
+    """  # noqa: E501
 
     __tablename__ = "attendance"
     __table_args__ = (UniqueConstraint("event_id", "user_id", "is_planned"),)
@@ -843,15 +875,13 @@ class Attendance(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
-    event: Mapped[Event] = relationship(
-        innerjoin=True, cascade="expunge", viewonly=True
-    )
+    event: Mapped[Event] = relationship(innerjoin=True, cascade="expunge", viewonly=True)
     user: Mapped[User] = relationship(innerjoin=True, cascade="expunge", viewonly=True)
     slack_user: Mapped[Optional[SlackUser]] = relationship(
         innerjoin=False, cascade="expunge", secondary="users", viewonly=True
     )
-    attendance_x_attendance_types: Mapped[List[Attendance_x_AttendanceType]] = (
-        relationship(back_populates="attendance", cascade="save-update, merge, delete")
+    attendance_x_attendance_types: Mapped[List[Attendance_x_AttendanceType]] = relationship(
+        back_populates="attendance", cascade="save-update, merge, delete"
     )
     attendance_types: Mapped[List[AttendanceType]] = relationship(
         secondary="attendance_x_attendance_types",
@@ -874,7 +904,7 @@ class Achievement(Base):
         specific_org_id (Optional[int]): The ID of the specific region if a custom achievement. If null, the achievement is available to all regions.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "achievements"
 
@@ -896,17 +926,13 @@ class Achievement_x_User(Base):
         achievement_id (int): The ID of the associated achievement.
         user_id (int): The ID of the associated user.
         date_awarded (date): The date the achievement was awarded. Default is the current date.
-    """
+    """  # noqa: E501
 
     __tablename__ = "achievements_x_users"
 
-    achievement_id: Mapped[int] = mapped_column(
-        ForeignKey("achievements.id"), primary_key=True
-    )
+    achievement_id: Mapped[int] = mapped_column(ForeignKey("achievements.id"), primary_key=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), primary_key=True)
-    date_awarded: Mapped[date] = mapped_column(
-        DateTime, server_default=func.timezone("utc", func.now())
-    )
+    date_awarded: Mapped[date] = mapped_column(DateTime, server_default=func.timezone("utc", func.now()))
 
 
 class Position(Base):
@@ -918,7 +944,7 @@ class Position(Base):
         description (Optional[str]): A description of the position.
         org_type (Optional[Org_Type]): The associated organization type. This is used to limit the positions available to certain types of organizations. If null, the position is available to all organization types.
         org_id (Optional[int]): The ID of the associated organization. This is used to limit the positions available to certain organizations. If null, the position is available to all organizations.
-    """
+    """  # noqa: E501
 
     __tablename__ = "positions"
 
@@ -939,13 +965,11 @@ class Position_x_Org_x_User(Base):
         position_id (int): The ID of the associated position.
         org_id (int): The ID of the associated organization.
         user_id (int): The ID of the associated user.
-    """
+    """  # noqa: E501
 
     __tablename__ = "positions_x_orgs_x_users"
 
-    position_id: Mapped[int] = mapped_column(
-        ForeignKey("positions.id"), primary_key=True
-    )
+    position_id: Mapped[int] = mapped_column(ForeignKey("positions.id"), primary_key=True)
     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), primary_key=True)
 
@@ -964,7 +988,7 @@ class Expansion(Base):
         interested_in_organizing (bool): Whether the user is interested in organizing.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "expansions"
 
@@ -988,17 +1012,13 @@ class Expansion_x_User(Base):
         user_id (int): The ID of the associated user.
         requst_date (date): The date of the request. Default is the current date.
         notes (Optional[text]): Additional notes for the association.
-    """
+    """  # noqa: E501
 
     __tablename__ = "expansions_x_users"
 
-    expansion_id: Mapped[int] = mapped_column(
-        ForeignKey("expansions.id"), primary_key=True
-    )
+    expansion_id: Mapped[int] = mapped_column(ForeignKey("expansions.id"), primary_key=True)
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"), primary_key=True)
-    request_date: Mapped[date] = mapped_column(
-        DateTime, server_default=func.timezone("utc", func.now())
-    )
+    request_date: Mapped[date] = mapped_column(DateTime, server_default=func.timezone("utc", func.now()))
     notes: Mapped[Optional[text]]
 
 
@@ -1020,7 +1040,7 @@ class NextAuthAccount(Base):
         session_state (Optional[text]): The session state.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "auth_accounts"
 
@@ -1049,7 +1069,7 @@ class NextAuthSession(Base):
         expires (ts_notz): The expiration time of the session.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "auth_sessions"
 
@@ -1070,7 +1090,7 @@ class NextAuthVerificationToken(Base):
         expires (ts_notz): The expiration time of the token.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
-    """
+    """  # noqa: E501
 
     __tablename__ = "auth_verification_tokens"
 
@@ -1120,6 +1140,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.
@@ -1130,16 +1151,12 @@ class UpdateRequest(Base):
         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.
-    """
+    """  # noqa: E501
 
     __tablename__ = "update_requests"
 
-    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()
-    )
+    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())
     region_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"))
     event_id: Mapped[Optional[int]] = mapped_column(ForeignKey("events.id"))
     event_type_ids: Mapped[Optional[List[int]]] = mapped_column(ARRAY(Integer))
@@ -1169,15 +1186,12 @@ class UpdateRequest(Base):
     location_state: Mapped[Optional[str]]
     location_zip: Mapped[Optional[str]]
     location_country: Mapped[Optional[str]]
-    location_lat: Mapped[Optional[float]] = mapped_column(
-        Float(precision=8, decimal_return_scale=5)
-    )
-    location_lng: Mapped[Optional[float]] = mapped_column(
-        Float(precision=8, decimal_return_scale=5)
-    )
+    location_lat: Mapped[Optional[float]] = mapped_column(Float(precision=8, decimal_return_scale=5))
+    location_lng: Mapped[Optional[float]] = mapped_column(Float(precision=8, decimal_return_scale=5))
     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]

{f3_data_models-0.4.1 → f3_data_models-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "f3-data-models"
-version = "0.4.1"
+version = "0.4.3"
 description = "The data schema and models for F3 Nation applications."
 authors = ["Evan Petzoldt <evan.petzoldt@protonmail.com>"]
 readme = "README.md"
@@ -10,6 +10,29 @@ license = "MIT"
 repository = "https://github.com/F3-Nation/f3-data-models"
 documentation = "https://github.io/F3-Nation/f3-data-models"
 
+[tool.ruff]
+line-length = 120
+
+select = [
+    "E",  # pycodestyle errors (settings from FastAPI, thanks, @tiangolo!)
+    "W",  # pycodestyle warnings
+    "F",  # pyflakes
+    "I",  # isort
+    "C",  # flake8-comprehensions
+    "B",  # flake8-bugbear
+]
+ignore = [
+    "C901",  # too complex
+]
+
+[tool.ruff.isort]
+order-by-type = true
+relative-imports-order = "closest-to-furthest"
+extra-standard-library = ["typing"]
+section-order = ["future", "standard-library", "third-party", "first-party", "local-folder"]
+known-first-party = []
+
+
 [tool.poetry.dependencies]
 python = "^3.12"
 sqlalchemy = "^2.0.36"
@@ -25,6 +48,7 @@ sphinx-multiversion = "^0.2.4"
 psycopg2-binary = "^2.9.10"
 sqlmodel = "^0.0.22"
 alembic-postgresql-enum = "^1.6.1"
+sqlalchemy-citext = "^1.8.0"
 
 
 [build-system]