f3-data-models 0.1.1__py3-none-any.whl → 0.1.2__py3-none-any.whl

f3_data_models/utils.py

@@ -1,9 +1,9 @@
 import os
 from dataclasses import dataclass
-from typing import List, Tuple, TypeVar
+from typing import List, Optional, Tuple, TypeVar
 
 import sqlalchemy
-from sqlalchemy import and_
+from sqlalchemy import and_, select
 
 from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.engine import Engine
@@ -88,10 +88,18 @@ class DbManager:
             session.rollback()
             close_session(session)
 
-    def find_records(cls: T, filters) -> List[T]:
+    def get(cls: T, id: int) -> T:
         session = get_session()
         try:
-            records = session.query(cls).filter(and_(*filters)).all()
+            return session.scalars(select(cls).filter(cls.id == id)).one()
+        finally:
+            session.rollback()
+            close_session(session)
+
+    def find_records(cls: T, filters: Optional[List]) -> List[T]:
+        session = get_session()
+        try:
+            records = session.scalars(select(cls).filter(*filters)).all()
             for r in records:
                 session.expunge(r)
             return records
@@ -99,6 +107,17 @@ class DbManager:
             session.rollback()
             close_session(session)
 
+    def find_first_record(cls: T, filters: Optional[List]) -> T:
+        session = get_session()
+        try:
+            record = session.scalars(select(cls).filter(*filters)).first()
+            if record:
+                session.expunge(record)
+            return record
+        finally:
+            session.rollback()
+            close_session(session)
+
     def find_join_records2(left_cls: T, right_cls: T, filters) -> List[Tuple[T]]:
         session = get_session()
         try:

{f3_data_models-0.1.1.dist-info → f3_data_models-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: f3-data-models
-Version: 0.1.1
+Version: 0.1.2
 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.2.dist-info/RECORD

@@ -0,0 +1,6 @@
+f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+f3_data_models/models.py,sha256=3NDD05kmj06Z-qEXXDB1exQon8xZbydqMbZsLfvdh7A,34327
+f3_data_models/utils.py,sha256=oCxwNORr0-5l0ZugxMYLmKIbmcec-4HEdTSC1pRMoew,8002
+f3_data_models-0.1.2.dist-info/METADATA,sha256=mpfJ0xDJjix1qfarr2QKEsvU8HoXqU7SOhNTYSsuv8U,2318
+f3_data_models-0.1.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+f3_data_models-0.1.2.dist-info/RECORD,,

f3_data_models-0.1.1.dist-info/RECORD

@@ -1,6 +0,0 @@
-f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-f3_data_models/models.py,sha256=3NDD05kmj06Z-qEXXDB1exQon8xZbydqMbZsLfvdh7A,34327
-f3_data_models/utils.py,sha256=rOEgTdtwNjmxAzhDHZZGXvpz1b-6R5uikJFgS_M-1mY,7367
-f3_data_models-0.1.1.dist-info/METADATA,sha256=87OpVJiEH_xg8M1y809I4rzUPS876Eho1TBAy-Hetp8,2318
-f3_data_models-0.1.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-f3_data_models-0.1.1.dist-info/RECORD,,