f3-data-models 0.1.10__tar.gz → 0.1.12__tar.gz

{f3_data_models-0.1.10 → f3_data_models-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: f3-data-models
-Version: 0.1.10
+Version: 0.1.12
 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.10 → f3_data_models-0.1.12}/f3_data_models/models.py

@@ -279,6 +279,13 @@ 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.
+
+        locations (Optional[List[Location]]): The locations associated with the organization. Probably only relevant for regions.
+        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.
+        event_tags_x_org (Optional[List[EventTag_x_Org]]): The association between event tags and organizations.
     """
 
     __tablename__ = "orgs"
@@ -301,6 +308,9 @@ class Org(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
+    locations: Mapped[Optional[List["Location"]]] = relationship(
+        "Location", cascade="expunge"
+    )
     event_types: Mapped[Optional[List["EventType"]]] = relationship(
         "EventType", secondary="event_types_x_org", cascade="expunge"
     )
@@ -313,6 +323,9 @@ class Org(Base):
     parent_org: Mapped[Optional["Org"]] = relationship(
         "Org", remote_side=[id], cascade="expunge"
     )
+    event_tags_x_org: Mapped[Optional[List["EventTag_x_Org"]]] = relationship(
+        "EventTag_x_Org", cascade="expunge"
+    )
 
 
 class EventType(Base):
@@ -347,6 +360,8 @@ class EventType_x_Event(Base):
     Attributes:
         event_id (int): The ID of the associated event.
         event_type_id (int): The ID of the associated event type.
+
+        event (Event): The associated event.
     """
 
     __tablename__ = "events_x_event_types"
@@ -356,6 +371,8 @@ class EventType_x_Event(Base):
         ForeignKey("event_types.id"), primary_key=True
     )
 
+    event: Mapped["Event"] = relationship(back_populates="event_x_event_types")
+
 
 class EventType_x_Org(Base):
     """
@@ -406,6 +423,8 @@ class EventTag_x_Event(Base):
     Attributes:
         event_id (int): The ID of the associated event.
         event_tag_id (int): The ID of the associated event tag.
+
+        event (Event): The associated event.
     """
 
     __tablename__ = "event_tags_x_events"
@@ -415,6 +434,8 @@ class EventTag_x_Event(Base):
         ForeignKey("event_tags.id"), primary_key=True
     )
 
+    event: Mapped["Event"] = relationship(back_populates="event_x_event_tags")
+
 
 class EventTag_x_Org(Base):
     """
@@ -526,6 +547,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"
@@ -559,13 +587,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="events_x_event_types", innerjoin=True, cascade="expunge"
+        secondary="events_x_event_types",
+        innerjoin=True,
+        cascade="expunge",
+        viewonly=True,
     )
     event_tags: Mapped[Optional[List[EventTag]]] = relationship(
-        secondary="event_tags_x_events", 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"
     )
 
 
@@ -587,13 +626,15 @@ class AttendanceType(Base):
     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"
@@ -605,6 +646,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):
     """
@@ -701,6 +746,12 @@ class Attendance(Base):
         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"
@@ -714,10 +765,21 @@ class Attendance(Base):
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
-    event: Mapped[Event] = relationship(innerjoin=True, cascade="expunge")
+    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"
+        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,
     )
 
 

{f3_data_models-0.1.10 → f3_data_models-0.1.12}/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
 
@@ -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.10 → f3_data_models-0.1.12}/pyproject.toml

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