f3-data-models 0.2.1__tar.gz → 0.2.3__tar.gz

{f3_data_models-0.2.1 → f3_data_models-0.2.3}/PKG-INFO

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

{f3_data_models-0.2.1 → f3_data_models-0.2.3}/f3_data_models/models.py

@@ -487,6 +487,7 @@ class Location(Base):
         name (str): The name of the location.
         description (Optional[text]): A description of the location.
         is_active (bool): Whether the location is active.
+        email (Optional[str]): A contact email address associated with the location.
         lat (Optional[float]): The latitude of the location.
         lon (Optional[float]): The longitude of the location.
         address_street (Optional[str]): The street address of the location.
@@ -506,9 +507,11 @@ class Location(Base):
     name: Mapped[str]
     description: Mapped[Optional[text]]
     is_active: Mapped[bool]
-    lat: Mapped[Optional[float]]
-    lon: Mapped[Optional[float]]
+    email: Mapped[Optional[str]]
+    latitude: Mapped[Optional[float]]
+    longitude: Mapped[Optional[float]]
     address_street: Mapped[Optional[str]]
+    address_street2: Mapped[Optional[str]]
     address_city: Mapped[Optional[str]]
     address_state: Mapped[Optional[str]]
     address_zip: Mapped[Optional[str]]
@@ -537,6 +540,7 @@ class Event(Base):
         day_of_week (Optional[int]): The day of the week of the event. (0=Monday, 6=Sunday)
         name (str): The name of the event.
         description (Optional[text]): A description of the event.
+        email (Optional[str]): A contact email address associated with the event.
         recurrence_pattern (Optional[str]): The recurrence pattern of the event. Current options are 'weekly' or 'monthly'.
         recurrence_interval (Optional[int]): The recurrence interval of the event (e.g. every 2 weeks).
         index_within_interval (Optional[int]): The index within the recurrence interval. (e.g. 2nd Tuesday of the month).
@@ -576,6 +580,7 @@ class Event(Base):
     day_of_week: Mapped[Optional[int]]
     name: Mapped[str]
     description: Mapped[Optional[text]]
+    email: Mapped[Optional[str]]
     recurrence_pattern: Mapped[Optional[str]]
     recurrence_interval: Mapped[Optional[int]]
     index_within_interval: Mapped[Optional[int]]
@@ -943,54 +948,6 @@ class Expansion_x_User(Base):
     notes: Mapped[Optional[text]]
 
 
-class MagicLinkAuthRecord(Base):
-    """
-    Model representing a Magic Link Auth Record.
-
-    Attributes:
-        id (int): Primary Key of the model.
-        email (str): The email of the user.
-        otp_hash (bytes): The hash of the OTP.
-        created (datetime): The timestamp when the record was created.
-        expiration (datetime): The timestamp when the record expires.
-        client_ip (str): The client IP address.
-        recent_attempts (int): The number of recent attempts.
-    """
-
-    __tablename__ = "magiclinkauthrecord"
-
-    id: Mapped[intpk]
-    email: Mapped[str]
-    otp_hash: Mapped[bytes]
-    created: Mapped[dt_create]
-    expiration: Mapped[dt_create]
-    client_ip: Mapped[str]
-    recent_attempts: Mapped[int]
-
-
-class MagicLinkAuthSession(Base):
-    """
-    Model representing a Magic Link Auth Session.
-
-    Attributes:
-        id (int): Primary Key of the model.
-        email (str): The email of the user.
-        persistent_id (str): The persistent ID.
-        session_token (str): The session token.
-        created (datetime): The timestamp when the record was created.
-        expiration (datetime): The timestamp when the record expires.
-    """
-
-    __tablename__ = "magiclinkauthsession"
-
-    id: Mapped[intpk]
-    email: Mapped[str]
-    persistent_id: Mapped[str]
-    session_token: Mapped[str]
-    created: Mapped[dt_create]
-    expiration: Mapped[dt_create]
-
-
 # class Org_x_SlackChannel(Base):
 #     """
 #     Model representing the association between organizations (specifically AOs) and Slack channels.
@@ -1006,3 +963,23 @@ class MagicLinkAuthSession(Base):
 #     slack_channel_id: Mapped[str] = mapped_column(
 #         primary_key=True
 #     )  # Do we need a slack channel table?
+
+# class SlackSpaceLog(Base):
+#     """
+#     Model representing a log of Slack space events.
+
+#     Attributes:
+#         id (int): Primary Key of the model.
+#         slack_space_id (int): The ID of the associated Slack space.
+#         event (str): The event that occurred.
+#         data (Optional[Dict[str, Any]]): Additional data for the log.
+#         created (datetime): The timestamp when the record was created.
+#     """
+
+#     __tablename__ = "slack_space_logs"
+
+#     id: Mapped[intpk]
+#     slack_space_id: Mapped[int] = mapped_column(ForeignKey("slack_spaces.id"))
+#     event: Mapped[str]
+#     data: Mapped[Optional[Dict[str, Any]]]
+#     created: Mapped[dt_create]

{f3_data_models-0.2.1 → f3_data_models-0.2.3}/pyproject.toml

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