f3-data-models 0.1.8__tar.gz → 0.1.11__tar.gz

{f3_data_models-0.1.8 → f3_data_models-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: f3-data-models
-Version: 0.1.8
+Version: 0.1.11
 Summary: The data schema and models for F3 Nation applications.
 Home-page: https://github.com/F3-Nation/f3-data-models
 License: MIT

{f3_data_models-0.1.8 → f3_data_models-0.1.11}/f3_data_models/models.py

@@ -6,11 +6,9 @@ from sqlalchemy import (
     TIME,
     VARCHAR,
     Boolean,
-    Column,
     DateTime,
     ForeignKey,
     Integer,
-    Table,
     func,
     UniqueConstraint,
 )
@@ -259,30 +257,6 @@ class Role_x_User_x_Org(Base):
     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
 
 
-event_type_x_org_table = Table(
-    "event_types_x_org",
-    Base.metadata,
-    Column("event_type_id", Integer, ForeignKey("event_types.id"), primary_key=True),
-    Column("org_id", Integer, ForeignKey("orgs.id"), primary_key=True),
-    Column("is_default", Boolean, default=False, nullable=False),
-)
-
-event_tag_x_org_table = Table(
-    "event_tags_x_org",
-    Base.metadata,
-    Column("event_tag_id", Integer, ForeignKey("event_tags.id"), primary_key=True),
-    Column("org_id", Integer, ForeignKey("orgs.id"), primary_key=True),
-    Column("color_override", VARCHAR),
-)
-
-achievement_x_org_table = Table(
-    "achievements_x_org",
-    Base.metadata,
-    Column("achievement_id", Integer, ForeignKey("achievements.id"), primary_key=True),
-    Column("org_id", Integer, ForeignKey("orgs.id"), primary_key=True),
-)
-
-
 class Org(Base):
     """
     Model representing an organization. The same model is used for all levels of organization (AOs, Regions, etc.).
@@ -305,6 +279,11 @@ class Org(Base):
         meta (Optional[Dict[str, Any]]): Additional metadata for the organization.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
+
+        event_types (Optional[List[EventType]]): The event types associated with the organization. Used to control which event types are available for selection at the region level.
+        event_tags (Optional[List[EventTag]]): The event tags associated with the organization. Used to control which event tags are available for selection at the region level.
+        achievements (Optional[List[Achievement]]): The achievements available within the organization.
+        parent_org (Optional[Org]): The parent organization.
     """
 
     __tablename__ = "orgs"
@@ -328,13 +307,13 @@ class Org(Base):
     updated: Mapped[dt_update]
 
     event_types: Mapped[Optional[List["EventType"]]] = relationship(
-        "EventType", secondary=event_type_x_org_table, cascade="expunge"
+        "EventType", secondary="event_types_x_org", cascade="expunge"
     )
     event_tags: Mapped[Optional[List["EventTag"]]] = relationship(
-        "EventTag", secondary=event_tag_x_org_table, cascade="expunge"
+        "EventTag", secondary="event_tags_x_org", cascade="expunge"
     )
     achievements: Mapped[Optional[List["Achievement"]]] = relationship(
-        "Achievement", secondary=achievement_x_org_table, cascade="expunge"
+        "Achievement", secondary="achievements_x_org", cascade="expunge"
     )
     parent_org: Mapped[Optional["Org"]] = relationship(
         "Org", remote_side=[id], cascade="expunge"
@@ -366,40 +345,44 @@ class EventType(Base):
     updated: Mapped[dt_update]
 
 
-# class EventType_x_Event(Base):
-#     """
-#     Model representing the association between events and event types. The intention is that a single event can be associated with multiple event types.
+class EventType_x_Event(Base):
+    """
+    Model representing the association between events and event types. The intention is that a single event can be associated with multiple event types.
 
-#     Attributes:
-#         event_id (int): The ID of the associated event.
-#         event_type_id (int): The ID of the associated event type.
-#     """
+    Attributes:
+        event_id (int): The ID of the associated event.
+        event_type_id (int): The ID of the associated event type.
 
-#     __tablename__ = "events_x_event_types"
+        event (Event): The associated event.
+    """
 
-#     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
-#     )
+    __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
+    )
 
-# 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.
+    event: Mapped["Event"] = relationship(back_populates="event_x_event_types")
 
-#     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"
+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.
 
-#     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)
+    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):
@@ -425,40 +408,44 @@ class EventTag(Base):
     updated: Mapped[dt_update]
 
 
-# class EventTag_x_Event(Base):
-#     """
-#     Model representing the association between event tags and events. The intention is that a single event can be associated with multiple event tags.
+class EventTag_x_Event(Base):
+    """
+    Model representing the association between event tags and events. The intention is that a single event can be associated with multiple event tags.
 
-#     Attributes:
-#         event_id (int): The ID of the associated event.
-#         event_tag_id (int): The ID of the associated event tag.
-#     """
+    Attributes:
+        event_id (int): The ID of the associated event.
+        event_tag_id (int): The ID of the associated event tag.
 
-#     __tablename__ = "event_tags_x_events"
+        event (Event): The associated event.
+    """
 
-#     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
-#     )
+    __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
+    )
 
-# 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.
+    event: Mapped["Event"] = relationship(back_populates="event_x_event_tags")
 
-#     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"
+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.
 
-#     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]]
+    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):
@@ -519,21 +506,6 @@ class Location(Base):
     updated: Mapped[dt_update]
 
 
-event_x_event_type_table = Table(
-    "events_x_event_types",
-    Base.metadata,
-    Column("event_id", Integer, ForeignKey("events.id"), primary_key=True),
-    Column("event_type_id", Integer, ForeignKey("event_types.id"), primary_key=True),
-)
-
-event_x_event_tag_table = Table(
-    "event_tags_x_events",
-    Base.metadata,
-    Column("event_id", Integer, ForeignKey("events.id"), primary_key=True),
-    Column("event_tag_id", Integer, ForeignKey("event_tags.id"), primary_key=True),
-)
-
-
 class Event(Base):
     """
     Model representing an event or series; the same model is used for both with a self-referential relationship for series.
@@ -567,6 +539,13 @@ class Event(Base):
         meta (Optional[Dict[str, Any]]): Additional metadata for the event.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
+
+        org (Org): The associated organization.
+        location (Location): The associated location.
+        event_types (List[EventType]): The associated event types.
+        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.
     """
 
     __tablename__ = "events"
@@ -600,13 +579,24 @@ class Event(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
-    org: Mapped[Org] = relationship(innerjoin=True, cascade="expunge")
-    location: Mapped[Location] = relationship(innerjoin=True, cascade="expunge")
+    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=event_x_event_type_table, innerjoin=True, cascade="expunge"
+        secondary="events_x_event_types",
+        innerjoin=True,
+        cascade="expunge",
+        viewonly=True,
     )
     event_tags: Mapped[Optional[List[EventTag]]] = relationship(
-        secondary=event_x_event_tag_table, cascade="expunge"
+        secondary="event_tags_x_events", cascade="expunge", viewonly=True
+    )
+    event_x_event_types: Mapped[List[EventType_x_Event]] = relationship(
+        back_populates="event"
+    )
+    event_x_event_tags: Mapped[Optional[List[EventTag_x_Event]]] = relationship(
+        back_populates="event"
     )
 
 
@@ -628,39 +618,15 @@ class AttendanceType(Base):
     updated: Mapped[dt_update]
 
 
-class Attendance(Base):
-    """
-    Model representing an attendance record.
-
-    Attributes:
-        id (int): Primary Key of the model.
-        event_id (int): The ID of the associated event.
-        user_id (Optional[int]): The ID of the associated user.
-        is_planned (bool): Whether this is planned attendance (True) vs actual attendance (False).
-        meta (Optional[Dict[str, Any]]): Additional metadata for the attendance.
-        created (datetime): The timestamp when the record was created.
-        updated (datetime): The timestamp when the record was last updated.
-    """
-
-    __tablename__ = "attendance"
-    __table_args__ = (UniqueConstraint("event_id", "user_id", "is_planned"),)
-
-    id: Mapped[intpk]
-    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"))
-    user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
-    is_planned: Mapped[bool]
-    meta: Mapped[Optional[Dict[str, Any]]]
-    created: Mapped[dt_create]
-    updated: Mapped[dt_update]
-
-
-class Attendance_x_AttenanceType(Base):
+class Attendance_x_AttendanceType(Base):
     """
     Model representing the association between attendance and attendance types.
 
     Attributes:
         attendance_id (int): The ID of the associated attendance.
         attendance_type_id (int): The ID of the associated attendance type.
+
+        attendance (Attendance): The associated attendance.
     """
 
     __tablename__ = "attendance_x_attendance_types"
@@ -672,6 +638,10 @@ class Attendance_x_AttenanceType(Base):
         ForeignKey("attendance_types.id"), primary_key=True
     )
 
+    attendance: Mapped["Attendance"] = relationship(
+        back_populates="attendance_x_attendance_types"
+    )
+
 
 class User(Base):
     """
@@ -756,6 +726,55 @@ class SlackUser(Base):
     updated: Mapped[dt_update]
 
 
+class Attendance(Base):
+    """
+    Model representing an attendance record.
+
+    Attributes:
+        id (int): Primary Key of the model.
+        event_id (int): The ID of the associated event.
+        user_id (Optional[int]): The ID of the associated user.
+        is_planned (bool): Whether this is planned attendance (True) vs actual attendance (False).
+        meta (Optional[Dict[str, Any]]): Additional metadata for the attendance.
+        created (datetime): The timestamp when the record was created.
+        updated (datetime): The timestamp when the record was last updated.
+
+        event (Event): The associated event.
+        user (User): The associated user.
+        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.
+    """
+
+    __tablename__ = "attendance"
+    __table_args__ = (UniqueConstraint("event_id", "user_id", "is_planned"),)
+
+    id: Mapped[intpk]
+    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"))
+    user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
+    is_planned: Mapped[bool]
+    meta: Mapped[Optional[Dict[str, Any]]]
+    created: Mapped[dt_create]
+    updated: Mapped[dt_update]
+
+    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")
+    )
+    attendance_types: Mapped[List[AttendanceType]] = relationship(
+        secondary="attendance_x_attendance_types",
+        innerjoin=True,
+        cascade="expunge",
+        viewonly=True,
+    )
+
+
 class Achievement(Base):
     """
     Model representing an achievement.
@@ -802,21 +821,21 @@ class Achievement_x_User(Base):
     )
 
 
-# class Achievement_x_Org(Base):
-#     """
-#     Model representing the association between achievements and organizations.
+class Achievement_x_Org(Base):
+    """
+    Model representing the association between achievements and organizations.
 
-#     Attributes:
-#         achievement_id (int): The ID of the associated achievement.
-#         org_id (int): The ID of the associated organization.
-#     """
+    Attributes:
+        achievement_id (int): The ID of the associated achievement.
+        org_id (int): The ID of the associated organization.
+    """
 
-#     __tablename__ = "achievements_x_org"
+    __tablename__ = "achievements_x_org"
 
-#     achievement_id: Mapped[int] = mapped_column(
-#         ForeignKey("achievements.id"), primary_key=True
-#     )
-#     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
+    achievement_id: Mapped[int] = mapped_column(
+        ForeignKey("achievements.id"), primary_key=True
+    )
+    org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
 
 
 class Position(Base):

{f3_data_models-0.1.8 → f3_data_models-0.1.11}/f3_data_models/utils.py

@@ -56,7 +56,7 @@ def get_engine(echo=False) -> Engine:
     return engine
 
 
-def get_session(echo=False):
+def get_session(echo=True):
     if GLOBAL_SESSION:
         return GLOBAL_SESSION
 
@@ -99,7 +99,7 @@ class DbManager:
     def find_records(
         cls: T, filters: Optional[List], joinedloads: List | str = []
     ) -> List[T]:
-        session = get_session(echo=True)
+        session = get_session()
         try:
             query = select(cls)
             query = _joinedloads(cls, query, joinedloads)
@@ -254,10 +254,16 @@ class DbManager:
             session.commit()
             close_session(session)
 
-    def delete_records(cls: T, filters):
+    def delete_records(cls: T, filters, joinedloads: List | str = []):
         session = get_session()
         try:
-            session.query(cls).filter(and_(*filters)).delete()
+            query = select(cls)
+            query = _joinedloads(cls, query, joinedloads)
+            query = query.filter(*filters)
+            records = session.scalars(query).unique().all()
+            for r in records:
+                session.delete(r)
+            # session.query(cls).filter(and_(*filters)).delete()
             session.flush()
         finally:
             session.commit()

{f3_data_models-0.1.8 → f3_data_models-0.1.11}/pyproject.toml

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