fix: generating invoice numbers

Author: clstaudt

app/invoicing/data_source.py

@@ -3,6 +3,7 @@
 import datetime
 
 from loguru import logger
+import sqlmodel
 
 from core.abstractions import SQLModelDataSourceMixin
 from core.intent_result import IntentResult
@@ -81,33 +82,6 @@ def save_timesheet(self, timesheet: Timesheet):
         """Creates or updates a timesheet"""
         self.store(timesheet)
 
-    def get_last_invoice(self) -> IntentResult[Invoice]:
-        """Get the last invoice.
-
-        Returns:
-            IntentResult:
-                was_intent_successful : bool
-                data : Invoice
-                log_message  : str  if an error or exception occurs
-                exception : Exception if an exception occurs
-        """
-        try:
-            # query the database to get the Invoice that was last added
-            with self.create_session() as session:
-                last_invoice = (
-                    session.query(Invoice).order_by(Invoice.id.desc()).first()
-                )
-            return IntentResult(
-                was_intent_successful=True,
-                data=last_invoice,
-            )
-        except Exception as e:
-            return IntentResult(
-                was_intent_successful=False,
-                log_message=f"Exception raised @InvoicingDataSource.get_last_invoice_number {e.__class__.__name__}",
-                exception=e,
-            )
-
     def get_timesheet_for_invoice(self, invoice: Invoice) -> Timesheet:
         """Get the timesheet associated with an invoice
 
@@ -127,3 +101,22 @@ def get_timesheet_for_invoice(self, invoice: Invoice) -> Timesheet:
             )
         timesheet = invoice.timesheets[0]
         return timesheet
+
+    def generate_invoice_number(self, date: datetime.date) -> str:
+        """Generate a new valid invoice number"""
+        # invoice number scheme: YYYY-MM-DD-XX
+        prefix = date.strftime("%Y-%m-%d")
+
+        # where XX is the number of invoices for the day
+        # if there are no invoices for the day, start at 1
+        # if there are invoices for the day, start at the last invoice number + 1
+        # count the number of invoices for the day
+        with self.create_session() as session:
+            invoices = session.exec(
+                sqlmodel.select(Invoice).where(Invoice.date == date)
+            ).all()
+            invoice_count = len(invoices)
+            if invoice_count == 0:
+                return f"{prefix}-01"
+            else:
+                return f"{prefix}-{invoice_count + 1}"

app/invoicing/intent.py

@@ -108,13 +108,18 @@ def create_invoice(
                 to_date,
             )
 
+            invoice_number = self._invoicing_data_source.generate_invoice_number(
+                invoice_date
+            )
+
             invoice: Invoice = invoicing.generate_invoice(
+                date=invoice_date,
+                number=invoice_number,
                 timesheets=[
                     timesheet,
                 ],
                 contract=project.contract,
                 project=project,
-                date=invoice_date,
             )
 
             if render:
@@ -363,30 +368,6 @@ def view_timesheet_for_invoice(self, invoice: Invoice) -> IntentResult[None]:
                 error_msg=error_message,
             )
 
-    def generate_invoice_number(
-        self,
-        invoice_date: Optional[date] = None,
-    ) -> IntentResult[str]:
-        """Creates a unique invoice number"""
-        # get the number of the most recent invoice
-        result: IntentResult[Invoice] = self._invoicing_data_source.get_last_invoice()
-        if result.was_intent_successful:
-            last_invoice: Invoice = result.data
-            last_invoice_number: str = last_invoice.invoice_number
-            # increment the invoice number
-            invoice_number = last_invoice_number + 1
-            return IntentResult(
-                was_intent_successful=True,
-                data=f"{invoice_number:05d}",
-            )
-        else:
-            # create the first invoice number
-            invoice_number = 1
-            return IntentResult(
-                was_intent_successful=True,
-                data=f"{invoice_number:05d}",
-            )
-
     def get_time_tracking_data_as_dataframe(self) -> Optional[DataFrame]:
 
         result = self._timetracking_intent.get_timetracking_data()

tuttle/invoicing.py

@@ -17,13 +17,14 @@ def generate_invoice(
     timesheets: List[Timesheet],
     contract: Contract,
     project: Project,
+    number: str,
     date: datetime.date = datetime.date.today(),
-    counter: int = None,
 ) -> Invoice:
     invoice = Invoice(
         date=date,
         contract=contract,
         project=project,
+        number=number,
     )
     for timesheet in timesheets:
         total_hours = timesheet.total / pandas.Timedelta("1h")
@@ -38,8 +39,6 @@ def generate_invoice(
             description=timesheet.title,
         )
 
-    # TODO: replace with auto-incrementing numbers
-    invoice.generate_number(counter=counter)
     return invoice
 
 

tuttle_tests/test_invoice.py

@@ -48,7 +48,7 @@ def test_generate_invoice(
     demo_projects,
     demo_calendar_timetracking,
 ):
-    for project in demo_projects:
+    for i, project in enumerate(demo_projects):
         timesheets = []
         for period in ["January 2022", "February 2022"]:
             (period_start, period_end) = get_month_start_end(period)
@@ -66,5 +66,6 @@ def test_generate_invoice(
             contract=project.contract,
             project=project,
             date=datetime.date.today(),
+            number=f"{datetime.date.today().strftime('%Y-%m-%d')}-{i}",
         )
         # assert invoice.total > 0