fix time

Author: Aleks-Ti

api_backend/drug_regimen/service.py

@@ -31,7 +31,7 @@ async def update_regmen(self, regimen_data: UpdateRegimenSchema, regimen_id: int
         regimen_obj = await self.regimen_repository.find_one_ON_manager(regimen_id)
 
         dict_regimen_data = regimen_data.model_dump(exclude_none=True)
-        if regimen_data.reception_time:
+        if regimen_data.reception_time is not None:
             dict_regimen_data["reception_time"] = self.conversion_time(
                 regimen_data.reception_time,
                 regimen_obj.manager.timezone,

event_worker/src/event/repository.py

@@ -12,8 +12,8 @@ class EventRepository(SQLAlchemyRepository):
     async def scan_event(self) -> list[Row]:
         now_utc = datetime.now(UTC)
         interval = timedelta(minutes=1)
-        start_time = (now_utc - interval).time()
-        end_time = (now_utc + interval).time()
+        start_dt = now_utc - interval
+        end_dt = now_utc + interval
         async with async_session_maker() as session:
             stmt = text("""
                     SELECT
@@ -34,13 +34,17 @@ async def scan_event(self) -> list[Row]:
                         AND m.start_date <= :now
                         AND m.finish_date >= :now
                         AND r.is_active = true
-                        AND r.reception_time BETWEEN :start_time AND :end_time;
+                        AND (
+                            CASE WHEN :start_time <= :end_time
+                                THEN r.reception_time BETWEEN :start_time AND :end_time
+                                ELSE r.reception_time >= :start_time OR r.reception_time <= :end_time
+                            END
+                        );
                 """)
             params = {
                 "now": now_utc,
-                "regimen_active": True,
-                "start_time": start_time,
-                "end_time": end_time,
+                "start_time": start_dt.time(),
+                "end_time": end_dt.time(),
             }
 
             res = await session.execute(stmt, params)

event_worker/src/settings/database.py

@@ -1,18 +1,16 @@
 from collections.abc import AsyncGenerator, Callable
 
 from sqlalchemy.engine.url import URL
-from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession
+from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker
 from sqlalchemy.ext.asyncio import create_async_engine as _create_async_engine
-from sqlalchemy.orm import sessionmaker
-
-from src.settings.configuration import config_project
+from api_backend.settings.configuration import config_project
 
 
 def create_async_engine(url: URL | str) -> AsyncEngine:
     return _create_async_engine(url=url, echo=False, pool_pre_ping=True)
 
 
-async_session_maker: Callable[..., AsyncSession] = sessionmaker(
+async_session_maker: Callable[..., AsyncSession] = async_sessionmaker(
     create_async_engine(config_project.postgres_db.build_connection()),
     class_=AsyncSession,
     expire_on_commit=False,