f3-data-models 0.1.5__tar.gz → 0.1.7__tar.gz

{f3_data_models-0.1.5 → f3_data_models-0.1.7}/PKG-INFO

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

@@ -10,6 +10,7 @@ from sqlalchemy import (
     ForeignKey,
     Integer,
     func,
+    UniqueConstraint,
 )
 from typing_extensions import Annotated
 from sqlalchemy.orm import (
@@ -308,7 +309,7 @@ class EventType(Base):
         id (int): Primary Key of the model.
         name (str): The name of the event type.
         description (Optional[text]): A description of the event type.
-        acronyms (Optional[str]): Acronyms associated with the event type.
+        acronym (Optional[str]): Acronyms associated with the event type.
         category_id (int): The ID of the associated event category.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
@@ -319,7 +320,7 @@ class EventType(Base):
     id: Mapped[intpk]
     name: Mapped[str]
     description: Mapped[Optional[text]]
-    acronyms: Mapped[Optional[str]]
+    acronym: Mapped[Optional[str]]
     category_id: Mapped[int] = mapped_column(ForeignKey("event_categories.id"))
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
@@ -420,7 +421,7 @@ class EventTag_x_Org(Base):
     color_override: Mapped[Optional[str]]
 
 
-class Org_x_Slack(Base):
+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.
 
@@ -429,10 +430,10 @@ class Org_x_Slack(Base):
         slack_space_id (str): The ID of the associated Slack workspace.
     """
 
-    __tablename__ = "org_x_slack"
+    __tablename__ = "orgs_x_slack_spaces"
 
     org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"), primary_key=True)
-    slack_space_id: Mapped[str] = mapped_column(
+    slack_space_id: Mapped[int] = mapped_column(
         ForeignKey("slack_spaces.id"), primary_key=True
     )
 
@@ -568,9 +569,9 @@ 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.
-        attendance_type_id (int): The ID of the associated attendance type.
         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.
@@ -578,16 +579,34 @@ class Attendance(Base):
     """
 
     __tablename__ = "attendance"
+    __table_args__ = (UniqueConstraint("event_id", "user_id", "is_planned"),)
 
-    event_id: Mapped[int] = mapped_column(ForeignKey("events.id"), primary_key=True)
-    user_id: Mapped[Optional[int]] = mapped_column(
-        ForeignKey("users.id"), primary_key=True
-    )  # NOTE: Should this be optional?
+    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):
+    """
+    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.
+    """
+
+    __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
     )
-    is_planned: Mapped[bool] = mapped_column(Boolean, primary_key=True)
-    meta: Mapped[Optional[Dict[str, Any]]]
 
 
 class User(Base):
@@ -616,6 +635,9 @@ class User(Base):
     last_name: Mapped[Optional[str]]
     email: Mapped[str] = mapped_column(VARCHAR, unique=True)
     phone: Mapped[Optional[str]]
+    emergency_contact: Mapped[Optional[str]]
+    emergency_phone: Mapped[Optional[str]]
+    emergency_notes: Mapped[Optional[str]]
     home_region_id: Mapped[Optional[int]] = mapped_column(ForeignKey("orgs.id"))
     avatar_url: Mapped[Optional[str]]
     meta: Mapped[Optional[Dict[str, Any]]]
@@ -826,65 +848,6 @@ class Expansion_x_User(Base):
     notes: Mapped[Optional[text]]
 
 
-# def upgrade() -> None:
-#     # ### commands auto generated by Alembic - please adjust! ###
-#     op.create_table(
-#         "magiclinkauthrecord",
-#         sa.Column("id", sa.Integer(), nullable=False),
-#         sa.Column("email", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-#         sa.Column("otp_hash", sa.LargeBinary(), nullable=False),
-#         sa.Column(
-#             "created",
-#             sa.DateTime(timezone=True),
-#             server_default=sa.text("(CURRENT_TIMESTAMP)"),
-#             nullable=False,
-#         ),
-#         sa.Column(
-#             "expiration",
-#             sa.DateTime(timezone=True),
-#             server_default=sa.text("(CURRENT_TIMESTAMP)"),
-#             nullable=False,
-#         ),
-#         sa.Column("client_ip", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-#         sa.Column("recent_attempts", sa.Integer(), nullable=False),
-#         sa.PrimaryKeyConstraint("id"),
-#     )
-#     op.create_table(
-#         "magiclinkauthsession",
-#         sa.Column("id", sa.Integer(), nullable=False),
-#         sa.Column("email", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-#         sa.Column("persistent_id", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-#         sa.Column("session_token", sqlmodel.sql.sqltypes.AutoString(), nullable=False),
-#         sa.Column(
-#             "created",
-#             sa.DateTime(timezone=True),
-#             server_default=sa.text("(CURRENT_TIMESTAMP)"),
-#             nullable=False,
-#         ),
-#         sa.Column(
-#             "expiration",
-#             sa.DateTime(timezone=True),
-#             server_default=sa.text("(CURRENT_TIMESTAMP)"),
-#             nullable=False,
-#         ),
-#         sa.PrimaryKeyConstraint("id"),
-#     )
-#     with op.batch_alter_table("magiclinkauthsession", schema=None) as batch_op:
-#         batch_op.create_index(
-#             batch_op.f("ix_magiclinkauthsession_email"), ["email"], unique=False
-#         )
-#         batch_op.create_index(
-#             batch_op.f("ix_magiclinkauthsession_persistent_id"),
-#             ["persistent_id"],
-#             unique=False,
-#         )
-#         batch_op.create_index(
-#             batch_op.f("ix_magiclinkauthsession_session_token"),
-#             ["session_token"],
-#             unique=True,
-#         )
-
-
 class MagicLinkAuthRecord(Base):
     """
     Model representing a Magic Link Auth Record.

{f3_data_models-0.1.5 → f3_data_models-0.1.7}/pyproject.toml

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