WIP: tuttle.app.App

Author: clstaudt

tuttle/app.py

@@ -20,9 +20,13 @@ def __init__(self, debug_mode=False):
         self.db_path = self.home / "tuttle.db"
         self.db_engine = sqlmodel.create_engine(f"sqlite:///{self.db_path}", echo=True)
         sqlmodel.SQLModel.metadata.create_all(self.db_engine)
+        self.db_session = self.get_session()
 
     def get_session(self):
-        return sqlmodel.Session(self.db_engine)
+        return sqlmodel.Session(
+            self.db_engine,
+            expire_on_commit=False,
+        )
 
     def clear_database(self):
         """
@@ -32,11 +36,6 @@ def clear_database(self):
         self.db_engine = sqlmodel.create_engine(f"sqlite:///{self.db_path}", echo=True)
         sqlmodel.SQLModel.metadata.create_all(self.db_engine)
 
-    def get_user(self):
-        with self.get_session() as session:
-            user = session.exec(sqlmodel.select(model.User)).one()
-        return user
-
     def store_all(self, entities):
         """Store a collection of entities in the database."""
         with self.get_session() as session:
@@ -53,11 +52,19 @@ def retrieve_all(self, entity_type):
 
     @property
     def contracts(self):
-        with self.get_session() as session:
-            contracts = session.exec(
-                sqlmodel.select(model.Contract),
-            ).all()
-            return contracts
+        contracts = self.db_session.exec(
+            sqlmodel.select(model.Contract),
+        ).all()
+        return contracts
 
+    @property
+    def projects(self):
+        contracts = self.db_session.exec(
+            sqlmodel.select(model.Project),
+        ).all()
+        return contracts
 
-the_app = App()
+    @property
+    def user(self):
+        user = self.db_session.exec(sqlmodel.select(model.User)).one()
+        return user

tuttle/model.py

@@ -204,6 +204,10 @@ class Contract(SQLModel, table=True):
     invoices: List["Invoice"] = Relationship(back_populates="contract")
     # TODO: model contractual promises like "at least 2 days per week"
 
+    @property
+    def volume_as_time(self):
+        return self.volume * self.unit.to_timedelta()
+
 
 class Project(SQLModel, table=True):
     """A project is a group of contract work for a client."""

tuttle/time.py

@@ -1,4 +1,5 @@
 import enum
+import datetime
 
 
 class Cycle(enum.Enum):
@@ -14,3 +15,11 @@ class TimeUnit(enum.Enum):
     minute = 0
     hour = 1
     day = 2
+
+    def to_timedelta(self):
+        if self == TimeUnit.minute:
+            return datetime.timedelta(minutes=1)
+        elif self == TimeUnit.hour:
+            return datetime.timedelta(hours=1)
+        elif self == TimeUnit.day:
+            return datetime.timedelta(days=1)