f3-data-models 0.3.4__tar.gz → 0.3.6__tar.gz

{f3_data_models-0.3.4 → f3_data_models-0.3.6}/PKG-INFO

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

{f3_data_models-0.3.4 → f3_data_models-0.3.6}/f3_data_models/models.py

@@ -566,8 +566,8 @@ class Event(Base):
         highlight (bool): Whether the event is highlighted. Default is False.
         start_date (date): The start date of the event.
         end_date (Optional[date]): The end date of the event.
-        start_time (Optional[time_with_tz]): The start time of the event.
-        end_time (Optional[time_with_tz]): The end time of the event.
+        start_time (Optional[str]): The start time of the event. Format is 'HHMM', 24-hour time, timezone naive.
+        end_time (Optional[str]): The end time of the event. Format is 'HHMM', 24-hour time, timezone naive.
         day_of_week (Optional[Day_Of_Week]): The day of the week of the event.
         name (str): The name of the event.
         description (Optional[text]): A description of the event.
@@ -606,8 +606,8 @@ class Event(Base):
     highlight: Mapped[bool] = mapped_column(Boolean, default=False)
     start_date: Mapped[date]
     end_date: Mapped[Optional[date]]
-    start_time: Mapped[Optional[time_notz]]
-    end_time: Mapped[Optional[time_notz]]
+    start_time: Mapped[Optional[str]]
+    end_time: Mapped[Optional[str]]
     day_of_week: Mapped[Optional[Day_Of_Week]]
     name: Mapped[str]
     description: Mapped[Optional[text]]
@@ -1066,8 +1066,8 @@ class UpdateRequest(Base):
         event_highlight (Optional[bool]): Whether the event is highlighted.
         event_start_date (Optional[date]): The start date of the event.
         event_end_date (Optional[date]): The end date of the event.
-        event_start_time (Optional[time_notz]): The start time of the event.
-        event_end_time (Optional[time_notz]): The end time of the event.
+        event_start_time (Optional[str]): The start time of the event. Format is 'HHMM', 24-hour time, timezone naive.
+        event_end_time (Optional[str]): The end time of the event. Format is 'HHMM', 24-hour time, timezone naive.
         event_day_of_week (Optional[Day_Of_Week]): The day of the week of the event.
         event_name (str): The name of the event.
         event_description (Optional[text]): A description of the event.
@@ -1113,8 +1113,8 @@ class UpdateRequest(Base):
     event_highlight: Mapped[Optional[bool]]
     event_start_date: Mapped[Optional[date]]
     event_end_date: Mapped[Optional[date]]
-    event_start_time: Mapped[Optional[time_notz]]
-    event_end_time: Mapped[Optional[time_notz]]
+    event_start_time: Mapped[Optional[str]]
+    event_end_time: Mapped[Optional[str]]
     event_day_of_week: Mapped[Optional[Day_Of_Week]]
     event_name: Mapped[str]
     event_description: Mapped[Optional[text]]

{f3_data_models-0.3.4 → f3_data_models-0.3.6}/f3_data_models/utils.py

@@ -3,11 +3,13 @@ from dataclasses import dataclass
 from typing import List, Optional, Tuple, TypeVar
 
 import sqlalchemy
-from sqlalchemy import Select, and_, select
+from sqlalchemy import Select, and_, select, inspect
 
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.engine import Engine
 from sqlalchemy.orm import sessionmaker, joinedload
+from sqlalchemy.orm.collections import InstrumentedList
+from sqlalchemy.orm.attributes import flag_modified
 
 from f3_data_models.models import Base
 
@@ -166,21 +168,61 @@ class DbManager:
 
     def update_record(cls: T, id, fields):
         session = get_session()
-        try:
-            session.query(cls).filter(cls.id == id).update(
-                fields, synchronize_session="fetch"
-            )
-            session.flush()
-        finally:
-            session.commit()
-            close_session(session)
-
-    def update_records(cls: T, filters, fields):
+        # Fetch the object to be updated
+        obj = session.query(cls).get(id)
+        if not obj:
+            raise ValueError(f"Object with id {id} not found")
+
+        # Get the list of valid attributes for the class
+        valid_attributes = {attr.key for attr in inspect(cls).mapper.column_attrs}
+        valid_relationships = {rel.key for rel in inspect(cls).mapper.relationships}
+
+        # Update simple fields
+        for key, value in fields.items():
+            if key in valid_attributes and not isinstance(value, InstrumentedList):
+                setattr(obj, key, value)
+
+        # Update relationships
+        for key, value in fields.items():
+            if key in valid_relationships and isinstance(value, InstrumentedList):
+                related_objects = getattr(obj, key)
+                related_objects.clear()
+                related_objects.extend(value)
+
+        # Flag the object as modified to ensure changes are detected
+        flag_modified(obj, key)
+
+        # Commit the changes
+        session.commit()
+
+    def update_records(cls, filters, fields):
         session = get_session()
         try:
-            session.query(cls).filter(and_(*filters)).update(
-                fields, synchronize_session="fetch"
-            )
+            # Fetch the objects to be updated
+            objects = session.query(cls).filter(and_(*filters)).all()
+
+            # Get the list of valid attributes for the class
+            valid_attributes = {attr.key for attr in inspect(cls).mapper.column_attrs}
+            valid_relationships = {rel.key for rel in inspect(cls).mapper.relationships}
+
+            for obj in objects:
+                # Update simple fields
+                for key, value in fields.items():
+                    if key in valid_attributes and not isinstance(
+                        value, InstrumentedList
+                    ):
+                        setattr(obj, key, value)
+
+                # Update relationships
+                for key, value in fields.items():
+                    if key in valid_relationships and isinstance(
+                        value, InstrumentedList
+                    ):
+                        related_objects = getattr(obj, key)
+                        related_objects.clear()
+                        related_objects.extend(value)
+                        flag_modified(obj, key)
+
             session.flush()
         finally:
             session.commit()

{f3_data_models-0.3.4 → f3_data_models-0.3.6}/pyproject.toml

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