From 220ced73f72f3440508baa41f38ac0026d6bde19 Mon Sep 17 00:00:00 2001 From: fakz9 Date: Fri, 16 Aug 2024 20:38:33 +0300 Subject: [PATCH] feat: deals table --- schemas/barcode.py | 4 ++-- services/time_tracking.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/schemas/barcode.py b/schemas/barcode.py index 9473251..859e10b 100644 --- a/schemas/barcode.py +++ b/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): diff --git a/services/time_tracking.py b/services/time_tracking.py index 29022d4..1d191e8 100644 --- a/services/time_tracking.py +++ b/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,