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

f3_data_models/models.py

@@ -798,16 +798,16 @@ class Position(Base):
     Attributes:
         name (str): The name of the position.
         description (Optional[str]): A description of the position.
-        org_type_id (int): The ID of the associated organization type.
-        org_id (int): The ID of the associated organization.
+        org_type_id (Optional[int]): The ID of the associated organization type. This is used to limit the positions available to certain types of organizations. If null, the position is available to all organization types.
+        org_id (Optional[int]): The ID of the associated organization. This is used to limit the positions available to certain organizations. If null, the position is available to all organizations.
     """
 
     __tablename__ = "positions"
 
     name: Mapped[str]
     description: Mapped[Optional[str]]
-    org_type_id: Mapped[int] = mapped_column(ForeignKey("org_types.id"))
-    org_id: Mapped[int] = mapped_column(ForeignKey("orgs.id"))
+    org_type_id: Mapped[Optional[int]] = mapped_column(ForeignKey("org_types.id"))
+    org_id: Mapped[Optional[int]] = mapped_column(ForeignKey("orgs.id"))
 
 
 class Position_x_Org_x_User(Base):

f3_data_models/utils.py

@@ -1,15 +1,15 @@
 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
 from sqlalchemy.orm import sessionmaker
 
-from .models import Base
+from f3_data_models.models import Base
 
 from pydot import Dot
 from sqlalchemy_schemadisplay import create_schema_graph
@@ -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:
@@ -247,12 +266,12 @@ def create_diagram():
     graph: Dot = create_schema_graph(
         engine=get_engine(),
         metadata=Base.metadata,
-        show_datatypes=False,
-        show_indexes=False,
+        show_datatypes=True,
+        show_indexes=True,
         rankdir="LR",
-        concentrate=False,
+        show_column_keys=True,
     )
-    graph.write_png("schema_diagram.png")
+    graph.write_png("docs/_static/schema_diagram.png")
 
 
 if __name__ == "__main__":

{f3_data_models-0.1.0.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.0
+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
@@ -10,6 +10,7 @@ Requires-Python: >=3.12,<4.0
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.14.0,<2.0.0)
 Requires-Dist: cloud-sql-python-connector (>=1.13.0,<2.0.0)
 Requires-Dist: graphviz (>=0.20.3,<0.21.0)

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.0.dist-info → f3_data_models-0.1.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

f3_data_models-0.1.0.dist-info/RECORD

@@ -1,6 +0,0 @@
-f3_data_models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-f3_data_models/models.py,sha256=TwNym-sXPrbq_2js-liom6Sof60oeJlqa4n09qqoC-E,34015
-f3_data_models/utils.py,sha256=9XcjAzt21l3IBoeC5E57QglXHxkIAAFbmgh1VJdQFY8,7338
-f3_data_models-0.1.0.dist-info/METADATA,sha256=51ozDOUHlGtubysMbMqOEuW7YkpGz9ibF8iZSvj5Zyg,2267
-f3_data_models-0.1.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-f3_data_models-0.1.0.dist-info/RECORD,,