f3-data-models 0.5.7__py3-none-any.whl → 0.5.10__py3-none-any.whl

f3_data_models/models.py

@@ -500,7 +500,7 @@ class EventType_x_Event(Base):
 
     __tablename__ = "events_x_event_types"
 
-    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True)
+    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True, onupdate="CASCADE")
     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"),
@@ -523,7 +523,9 @@ class EventType_x_EventInstance(Base):
 
     __tablename__ = "event_instances_x_event_types"
 
-    event_instance_id: Mapped[int] = mapped_column(ForeignKey("event_instances.id"), primary_key=True)
+    event_instance_id: Mapped[int] = mapped_column(
+        ForeignKey("event_instances.id"), primary_key=True, onupdate="CASCADE"
+    )
     event_type_id: Mapped[int] = mapped_column(ForeignKey("event_types.id"), primary_key=True)
 
     event_instance: Mapped["EventInstance"] = relationship(back_populates="event_instances_x_event_types")
@@ -567,7 +569,7 @@ class EventTag_x_Event(Base):
 
     __tablename__ = "event_tags_x_events"
 
-    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True)
+    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True, onupdate="CASCADE")
     event_tag_id: Mapped[int] = mapped_column(ForeignKey("event_tags.id"), primary_key=True)
 
     event: Mapped["Event"] = relationship(back_populates="event_x_event_tags")
@@ -586,7 +588,9 @@ class EventTag_x_EventInstance(Base):
 
     __tablename__ = "event_tags_x_event_instances"
 
-    event_instance_id: Mapped[int] = mapped_column(ForeignKey("event_instances.id"), primary_key=True)
+    event_instance_id: Mapped[int] = mapped_column(
+        ForeignKey("event_instances.id"), primary_key=True, onupdate="CASCADE"
+    )
     event_tag_id: Mapped[int] = mapped_column(ForeignKey("event_tags.id"), primary_key=True)
 
     event_instance: Mapped["EventInstance"] = relationship(back_populates="event_instances_x_event_tags")
@@ -735,10 +739,12 @@ class Event(Base):
         secondary="event_tags_x_events", cascade="expunge", viewonly=True
     )
     event_x_event_types: Mapped[List[EventType_x_Event]] = relationship(
-        back_populates="event", cascade="save-update, merge, delete"
+        back_populates="event",
+        passive_deletes=True,
     )
     event_x_event_tags: Mapped[Optional[List[EventTag_x_Event]]] = relationship(
-        back_populates="event", cascade="save-update, merge, delete"
+        back_populates="event",
+        passive_deletes=True,
     )
 
 
@@ -781,11 +787,16 @@ class EventInstance(Base):
     """  # noqa: E501
 
     __tablename__ = "event_instances"
+    __table_args__ = (
+        Index("idx_event_instances_org_id", "org_id"),
+        Index("idx_event_instances_location_id", "location_id"),
+        Index("idx_event_instances_is_active", "is_active"),
+    )
 
     id: Mapped[intpk]
     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"))
     location_id: Mapped[Optional[int]] = mapped_column(ForeignKey("locations.id"))
-    series_id: Mapped[Optional[int]] = mapped_column(ForeignKey("events.id"))
+    series_id: Mapped[Optional[int]] = mapped_column(ForeignKey("events.id"), onupdate="CASCADE")
     is_active: Mapped[bool] = mapped_column(Boolean, default=True)
     highlight: Mapped[bool] = mapped_column(Boolean, default=False)
     start_date: Mapped[date]
@@ -825,12 +836,14 @@ class EventInstance(Base):
         secondary="event_tags_x_event_instances", cascade="expunge", viewonly=True
     )
     event_instances_x_event_types: Mapped[List[EventType_x_EventInstance]] = relationship(
-        back_populates="event_instance", cascade="save-update, merge, delete"
+        back_populates="event_instance",
+        passive_deletes=True,
     )
     event_instances_x_event_tags: Mapped[Optional[List[EventTag_x_EventInstance]]] = relationship(
-        back_populates="event_instance", cascade="save-update, merge, delete"
+        back_populates="event_instance",
+        passive_deletes=True,
     )
-    attendance: Mapped[List["Attendance"]] = relationship(back_populates="event_instance", cascade="expunge, delete")
+    attendance: Mapped[List["Attendance"]] = relationship(back_populates="event_instance", passive_deletes=True)
 
 
 class AttendanceType(Base):
@@ -864,7 +877,7 @@ class Attendance_x_AttendanceType(Base):
 
     __tablename__ = "attendance_x_attendance_types"
 
-    attendance_id: Mapped[int] = mapped_column(ForeignKey("attendance.id"), primary_key=True)
+    attendance_id: Mapped[int] = mapped_column(ForeignKey("attendance.id"), primary_key=True, onupdate="CASCADE")
     attendance_type_id: Mapped[int] = mapped_column(ForeignKey("attendance_types.id"), primary_key=True)
 
     attendance: Mapped["Attendance"] = relationship(back_populates="attendance_x_attendance_types")
@@ -980,10 +993,15 @@ class Attendance(Base):
     """  # noqa: E501
 
     __tablename__ = "attendance"
-    __table_args__ = (UniqueConstraint("event_instance_id", "user_id", "is_planned"),)
+    __table_args__ = (
+        UniqueConstraint("event_instance_id", "user_id", "is_planned"),
+        Index("idx_attendance_event_instance_id", "event_instance_id"),
+        Index("idx_attendance_user_id", "user_id"),
+        Index("idx_attendance_is_planned", "is_planned"),
+    )
 
     id: Mapped[intpk]
-    event_instance_id: Mapped[int] = mapped_column(ForeignKey("event_instances.id"))
+    event_instance_id: Mapped[int] = mapped_column(ForeignKey("event_instances.id"), onupdate="CASCADE")
     user_id: Mapped[int] = mapped_column(ForeignKey("users.id"))
     is_planned: Mapped[bool]
     meta: Mapped[Optional[Dict[str, Any]]]
@@ -996,7 +1014,7 @@ class Attendance(Base):
         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"
+        back_populates="attendance", passive_deletes=True
     )
     attendance_types: Mapped[List[AttendanceType]] = relationship(
         secondary="attendance_x_attendance_types",
@@ -1258,6 +1276,7 @@ class UpdateRequest(Base):
         ao_id (Optional[int]): The ID of the associated AO.
         ao_name (Optional[text]): The name of the AO.
         ao_logo (Optional[text]): The URL of the AO logo.
+        ao_website (Optional[text]): The website of the AO.
         submitted_by (str): The user who submitted the request.
         submitter_validated (Optional[bool]): Whether the submitter has validated the request. Default is False.
         reviewed_by (Optional[str]): The user who reviewed the request.
@@ -1310,6 +1329,7 @@ class UpdateRequest(Base):
     ao_id: Mapped[Optional[int]] = mapped_column(ForeignKey("orgs.id"))
     ao_name: Mapped[Optional[text]]
     ao_logo: Mapped[Optional[text]]
+    ao_website: Mapped[Optional[text]]
 
     submitted_by: Mapped[text]
     submitter_validated: Mapped[Optional[bool]] = mapped_column(Boolean, default=False)

f3_data_models/testing.py

@@ -1,12 +1,24 @@
-from f3_data_models.models import User
+from datetime import date
+
+from sqlalchemy import or_
+
+from f3_data_models.models import Event, Org
 from f3_data_models.utils import DbManager
 
 
-def test_update_event():
-    records = DbManager.find_records(User, [User.id == 1], joinedloads=[User.home_region_org])
-    print(records)
-    print(records[0].home_region_org)
+def test():
+    org_id = 25272
+    event_records = DbManager.find_records(
+        Event,
+        filters=[
+            Event.is_active,
+            or_(Event.org_id == org_id, Event.org.has(Org.parent_id == org_id)),
+            or_(Event.end_date >= date.today(), Event.end_date.is_(None)),
+        ],
+        joinedloads="all",
+    )
+    print(f"Found {len(event_records)} active events for org_id {org_id}.")
 
 
 if __name__ == "__main__":
-    test_update_event()
+    test()

{f3_data_models-0.5.7.dist-info → f3_data_models-0.5.10.dist-info}/METADATA

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

f3_data_models-0.5.10.dist-info/RECORD

@@ -0,0 +1,7 @@
+f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+f3_data_models/models.py,sha256=1XEgYQd64FJAU-scqSI7MpXiSTCUR_8dRVVX3G5rwIU,52240
+f3_data_models/testing.py,sha256=uHHgrfMOpUvu6-yOyuMsGadyeN-zuAFRYuGQNpXX4Lk,598
+f3_data_models/utils.py,sha256=LBNy7BXwRY0tqNKGUBoYi6-1Ch9dSLjGysLoes1Jfys,12083
+f3_data_models-0.5.10.dist-info/METADATA,sha256=uuQRjzE1kQpibkUvE-uZD10xdqRc3UBbxzFODFWSMT4,2767
+f3_data_models-0.5.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+f3_data_models-0.5.10.dist-info/RECORD,,

{f3_data_models-0.5.7.dist-info → f3_data_models-0.5.10.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.2
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any

f3_data_models-0.5.7.dist-info/RECORD

@@ -1,7 +0,0 @@
-f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-f3_data_models/models.py,sha256=Nd57_jd5lkVbTfj2CZ_Eg4AfVVa7QjK86Ko7qYlrT1I,51616
-f3_data_models/testing.py,sha256=xDTZdEo5BXx8zzXCBsadxtN2wNnK9tj0w_HYL3pFl3A,314
-f3_data_models/utils.py,sha256=LBNy7BXwRY0tqNKGUBoYi6-1Ch9dSLjGysLoes1Jfys,12083
-f3_data_models-0.5.7.dist-info/METADATA,sha256=9K6BEPYZ0OIEl41sX7IBZcyjOuUNRPyCVVYJo4CjUvM,2766
-f3_data_models-0.5.7.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-f3_data_models-0.5.7.dist-info/RECORD,,