feat: deals table

schemas/barcode.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Optional
 
 from schemas.base import BaseSchema, OkMessageSchema
 
@@ -28,7 +28,7 @@ class BaseBarcodeTemplateSchema(BaseSchema):
     is_default: bool
     size: BarcodeTemplateSizeSchema
     additional_attributes: list[BarcodeTemplateAdditionalAttributeSchema]
-    additional_field: str | None = None
+    additional_field: Optional[str] = None
 
 
 class BarcodeTemplateSchema(BaseBarcodeTemplateSchema):

services/time_tracking.py

@@ -21,6 +21,9 @@ class TimeTrackingService(BaseService):
                     PaymentRecord.user
                 )
             )
+            .join(
+                User.is_deleted == False
+            )
             .where(
                 func.date(func.date_trunc('month', PaymentRecord.start_date)) == request.date,
                 func.date(func.date_trunc('month', PaymentRecord.end_date)) == request.date,