f3-data-models 0.5.14__py3-none-any.whl → 0.5.16__py3-none-any.whl

f3_data_models/models.py

@@ -136,6 +136,38 @@ class Event_Cadence(enum.Enum):
     monthly = 2
 
 
+class Achievement_Cadence(enum.Enum):
+    """
+    Enum representing the cadence of an achievement.
+
+    Attributes:
+        weekly
+        monthly
+        quarterly
+        yearly
+        lifetime
+    """
+
+    weekly = 1
+    monthly = 2
+    quarterly = 3
+    yearly = 4
+    lifetime = 5
+
+
+class Achievement_Threshold_Type(enum.Enum):
+    """
+    Enum representing the type of threshold for an achievement.
+
+    Attributes:
+        posts
+        unique_aos
+    """
+
+    posts = 1
+    unique_aos = 2
+
+
 class Org_Type(enum.Enum):
     """
     Enum representing the type of organization.
@@ -957,7 +989,7 @@ class SlackUser(Base):
         strava_expires_at (Optional[datetime]): The expiration time of the Strava token.
         strava_athlete_id (Optional[int]): The Strava athlete ID of the user.
         meta (Optional[Dict[str, Any]]): Additional metadata for the Slack user.
-        slack_updated (Optional[datetime]): The last update time of the Slack user.
+        slack_updated (Optional[int]): The last update time of the Slack user.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
     """  # noqa: E501
@@ -979,7 +1011,7 @@ class SlackUser(Base):
     strava_expires_at: Mapped[Optional[datetime]]
     strava_athlete_id: Mapped[Optional[int]]
     meta: Mapped[Optional[Dict[str, Any]]]
-    slack_updated: Mapped[Optional[datetime]]
+    slack_updated: Mapped[Optional[int]]
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 
@@ -1044,9 +1076,14 @@ class Achievement(Base):
         id (int): Primary Key of the model.
         name (str): The name of the achievement.
         description (Optional[str]): A description of the achievement.
-        verb (str): The verb associated with the achievement.
         image_url (Optional[str]): The URL of the achievement's image.
         specific_org_id (Optional[int]): The ID of the specific region if a custom achievement. If null, the achievement is available to all regions.
+        is_active (bool): Whether the achievement is active. Default is True.
+        auto_award (bool): Whether the achievement is automatically awarded or needs to be manually tagged. Default is False.
+        auto_cadence (Optional[Achievement_Cadence]): The cadence for automatic awarding of the achievement.
+        auto_threshold (Optional[int]): The threshold for automatic awarding of the achievement.
+        auto_threshold_type (Optional[Achievement_Threshold_Type]): The type of threshold for automatic awarding of the achievement ('posts', 'unique_aos', etc.).
+        auto_filters (Optional[Dict[str, Any]]): Event filters for automatic awarding of the achievement. Should be a format like {'include': [{'event_type_id': [1, 2]}, {'event_tag_id': [3]}], 'exclude': [{'event_category': ['third_f']}]}.
         created (datetime): The timestamp when the record was created.
         updated (datetime): The timestamp when the record was last updated.
     """  # noqa: E501
@@ -1056,9 +1093,15 @@ class Achievement(Base):
     id: Mapped[intpk]
     name: Mapped[str]
     description: Mapped[Optional[str]]
-    verb: Mapped[str]
     image_url: Mapped[Optional[str]]
     specific_org_id: Mapped[Optional[int]] = mapped_column(ForeignKey("orgs.id"))
+    is_active: Mapped[bool] = mapped_column(Boolean, server_default="true", nullable=False)
+    auto_award: Mapped[bool] = mapped_column(Boolean, server_default="false", nullable=False)
+    auto_cadence: Mapped[Optional[Achievement_Cadence]]
+    auto_threshold_type: Mapped[Optional[Achievement_Threshold_Type]]
+    auto_threshold: Mapped[Optional[int]]
+    auto_filters: Mapped[Optional[Dict[str, Any]]] = mapped_column(JSON, default=dict)
+    meta: Mapped[Optional[Dict[str, Any]]] = mapped_column(JSON, default=dict)
     created: Mapped[dt_create]
     updated: Mapped[dt_update]
 

f3_data_models/utils.py

@@ -194,13 +194,13 @@ class DbManager:
             for obj in objects:
                 # Update simple fields
                 for attr, value in fields.items():
-                    key = attr.key
+                    key = attr if isinstance(attr, str) else attr.key
                     if key in valid_attributes and not isinstance(value, InstrumentedList):
                         setattr(obj, key, value)
 
                 # Update relationships separately
                 for attr, value in fields.items():
-                    key = attr.key
+                    key = attr if isinstance(attr, str) else attr.key
                     if key in valid_relationships:
                         # Handle relationships separately
                         relationship = inspect(cls).mapper.relationships[key]

{f3_data_models-0.5.14.dist-info → f3_data_models-0.5.16.dist-info}/METADATA

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

f3_data_models-0.5.16.dist-info/RECORD

@@ -0,0 +1,7 @@
+f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+f3_data_models/models.py,sha256=CjGVbV6Y8XlO8ZqvsQcvKlWoWqzB8VT6vg0IqmXqklo,54659
+f3_data_models/testing.py,sha256=uHHgrfMOpUvu6-yOyuMsGadyeN-zuAFRYuGQNpXX4Lk,598
+f3_data_models/utils.py,sha256=5ijpywxWMZZ5TZr7L7rLjs3QVsAHFvTQLtsrzIcnm04,12153
+f3_data_models-0.5.16.dist-info/METADATA,sha256=qT3g2ypSghP5ihJVzN7V_0kwPwLpRs3mpGatyoEMjWI,3675
+f3_data_models-0.5.16.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+f3_data_models-0.5.16.dist-info/RECORD,,

f3_data_models-0.5.14.dist-info/RECORD

@@ -1,7 +0,0 @@
-f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-f3_data_models/models.py,sha256=b_hKsW-5aFbFXsUohdiaVa5rN8xfb0EQ6NvXfTNSoAo,52919
-f3_data_models/testing.py,sha256=uHHgrfMOpUvu6-yOyuMsGadyeN-zuAFRYuGQNpXX4Lk,598
-f3_data_models/utils.py,sha256=LBNy7BXwRY0tqNKGUBoYi6-1Ch9dSLjGysLoes1Jfys,12083
-f3_data_models-0.5.14.dist-info/METADATA,sha256=idfSh-vccUa3BVQbtN-Du6RSSIUAULLz32wh4qzXJy8,3675
-f3_data_models-0.5.14.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-f3_data_models-0.5.14.dist-info/RECORD,,