checkpoint: before debugging

Author: clstaudt

app/core/database_storage_impl.py

@@ -1,9 +1,13 @@
+from typing import Callable
+
 import re
 from pathlib import Path
-from loguru import logger
-from typing import Callable
-import demo
+
 import sqlmodel
+from loguru import logger
+
+from tuttle import demo
+
 from .abstractions import DatabaseStorage
 
 

app/invoicing/intent.py

@@ -45,6 +45,10 @@ def __init__(self, client_storage: ClientStorage):
         self._user_data_source = UserDataSource()
         self._auth_intent = AuthIntent()
 
+    def get_user(self) -> IntentResult[User]:
+        user = self._user_data_source.get_user()
+        return IntentResult(was_intent_successful=True, data=user)
+
     def get_active_projects_as_map(self) -> Mapping[int, Project]:
         return self._projects_intent.get_active_projects_as_map()
 
@@ -115,6 +119,7 @@ def create_invoice(
             if render:
                 # render timesheet
                 try:
+                    logger.info(f"⚙️ Rendering timesheet for {project.title}...")
                     rendering.render_timesheet(
                         user=user,
                         timesheet=timesheet,
@@ -129,6 +134,7 @@ def create_invoice(
                     logger.exception(ex)
                 # render invoice
                 try:
+                    logger.info(f"⚙️ Rendering invoice for {project.title}...")
                     rendering.render_invoice(
                         user=user,
                         invoice=invoice,

tuttle/demo.py

@@ -54,11 +54,22 @@ def create_fake_contact(
     split_address_lines = fake.address().splitlines()
     street_line = split_address_lines[0]
     city_line = split_address_lines[1]
+    try:
+        # TODO: This has a German bias
+        street = street_line.split(" ", 1)[0]
+        number = street_line.split(" ", 1)[1]
+        city = city_line.split(" ")[1]
+        postal_code = city_line.split(" ")[0]
+    except IndexError:
+        street = street_line
+        number = ""
+        city = city_line
+        postal_code = ""
     a = Address(
-        street=street_line,
-        number=city_line,
-        city=city_line.split(" ")[1],
-        postal_code=city_line.split(" ")[0],
+        street=street,
+        number=number,
+        city=city,
+        postal_code=postal_code,
         country=fake.country(),
     )
     first_name, last_name = fake.name().split(" ", 1)
@@ -212,6 +223,9 @@ def create_fake_invoice(
     if project is None:
         project = create_fake_project(fake)
 
+    if user is None:
+        user = create_fake_user(fake)
+
     invoice_number = next(invoice_number_counter)
     invoice = Invoice(
         number=str(invoice_number),
@@ -243,7 +257,11 @@ def create_fake_invoice(
             invoice=invoice,
         )
 
+        # an invoice is created together with a timesheet. For the sake of simplicity, timesheet and invoice items are not linked.
+        timesheeet = create_fake_timesheet(fake, project)
+
         if render:
+            # render invoice
             try:
                 rendering.render_invoice(
                     user=user,
@@ -255,6 +273,18 @@ def create_fake_invoice(
             except Exception as ex:
                 logger.error(f"❌ Error rendering invoice for {project.title}: {ex}")
                 logger.exception(ex)
+            # render timesheet
+            try:
+                rendering.render_timesheet(
+                    user=user,
+                    timesheet=timesheeet,
+                    out_dir=Path.home() / ".tuttle" / "Timesheets",
+                    only_final=True,
+                )
+                logger.info(f"✅ rendered timesheet for {project.title}")
+            except Exception as ex:
+                logger.error(f"❌ Error rendering timesheet for {project.title}: {ex}")
+                logger.exception(ex)
 
     return invoice
 
@@ -281,11 +311,15 @@ def create_fake_data(
     fake = faker.Faker(locale=locales)
 
     contacts = [create_fake_contact(fake) for _ in range(n)]
-    clients = [create_fake_client(contact, fake) for contact in contacts]
-    contracts = [create_fake_contract(client, fake) for client in clients]
-    projects = [create_fake_project(contract, fake) for contract in contracts]
+    clients = [
+        create_fake_client(fake, invoicing_contact=contact) for contact in contacts
+    ]
+    contracts = [create_fake_contract(fake, client=client) for client in clients]
+    projects = [create_fake_project(fake, contract=contract) for contract in contracts]
 
-    invoices = [create_fake_invoice(project, user, fake) for project in projects]
+    invoices = [
+        create_fake_invoice(fake, project=project, user=user) for project in projects
+    ]
 
     return projects, invoices
 

tuttle/invoicing.py

@@ -37,6 +37,8 @@ def generate_invoice(
             VAT_rate=contract.VAT_rate,
             description=timesheet.title,
         )
+        # attach timesheet to invoice
+        timesheet.invoice = invoice
     # TODO: replace with auto-incrementing numbers
     invoice.generate_number(counter=counter)
     return invoice

tuttle/model.py

@@ -499,12 +499,12 @@ class Timesheet(SQLModel, table=True):
         description="Whether the Timesheet has been rendered as a PDF.",
     )
 
-    # Timesheet 1:1 Invoice
-    # FIXME: Could not determine join condition between parent/child tables
-    # invoice_id: Optional[int] = Field(default=None, foreign_key="invoice.id")
-    # invoice: Optional["Invoice"] = OneToOneRelationship(
-    #     back_populates="timesheet",
-    # )
+    # Timesheet n:1 Invoice
+    invoice_id: Optional[int] = Field(default=None, foreign_key="invoice.id")
+    invoice: Optional["Invoice"] = Relationship(
+        back_populates="timesheets",
+        sa_relationship_kwargs={"lazy": "subquery"},
+    )
 
     # class Config:
     #     arbitrary_types_allowed = True
@@ -535,12 +535,8 @@ class Invoice(SQLModel, table=True):
         description="The date of the invoice",
     )
 
-    # TODO: sent_date: datetime.datetime = Field(description="The date the invoice was sent.")
-    # Invoice 1:1 Timesheet
-    # timesheet_id: Optional[int] = Field(default=None, foreign_key="timesheet.id")
-    # timesheet: Timesheet = OneToOneRelationship(
-    #     back_populates="invoice",
-    # )
+    # RELATIONSHIPTS
+
     # Invoice n:1 Contract ?
     contract_id: Optional[int] = Field(default=None, foreign_key="contract.id")
     contract: Contract = Relationship(
@@ -553,6 +549,12 @@ class Invoice(SQLModel, table=True):
         back_populates="invoices",
         sa_relationship_kwargs={"lazy": "subquery"},
     )
+    # Invoice 1:n Timesheet
+    timesheets: List[Timesheet] = Relationship(
+        back_populates="invoice",
+        sa_relationship_kwargs={"lazy": "subquery"},
+    )
+
     # status -- corresponds to InvoiceStatus enum above
     sent: Optional[bool] = Field(default=False)
     paid: Optional[bool] = Field(default=False)