Refactor: Исправлены datetime объекты с timezone в CRUD и моделях. Обновлена валидация схем вопросов (min_length вместо min_items).

Author: belyashnikovatn

src/crud/crud_research.py

@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Any, Dict, List, Optional
 from uuid import UUID
 
@@ -76,7 +76,7 @@ async def update_research_type(
             if field in update_data:
                 setattr(research_type_db, field, update_data[field])
 
-        research_type_db.updated_at = datetime.utcnow()
+        research_type_db.updated_at = datetime.now(timezone.utc)
 
         try:
             session.add(research_type_db)
@@ -163,7 +163,7 @@ async def update_instance(
 
         # Если статус меняется на завершенный, устанавливаем время завершения
         if update_data.get('status') == 'COMPLETED' and not instance_db.completed_at:
-            update_data['completed_at'] = datetime.utcnow()
+            update_data['completed_at'] = datetime.now(timezone.utc)
 
         for field in instance_data:
             if field in update_data:

src/models/research.py

@@ -1,4 +1,4 @@
-from datetime import datetime
+from datetime import datetime, timezone
 from uuid import UUID
 
 from sqlalchemy import Enum, ForeignKey, Text
@@ -41,8 +41,10 @@ class ResearchType(BaseTabitModel):
         ForeignKey('companyuser.id', ondelete='SET NULL'),
         nullable=True,
     )
-    created_at: Mapped[datetime] = mapped_column(default=datetime.utcnow)
-    updated_at: Mapped[datetime] = mapped_column(default=datetime.utcnow, onupdate=datetime.utcnow)
+    created_at: Mapped[datetime] = mapped_column(default=datetime.now(timezone.utc))
+    updated_at: Mapped[datetime] = mapped_column(
+        default=datetime.now(timezone.utc), onupdate=datetime.now(timezone.utc)
+    )
 
     def __repr__(self):
         return (
@@ -84,7 +86,7 @@ class ResearchInstance(BaseTabitModel):
     status: Mapped[SurveysStatus] = mapped_column(
         Enum(SurveysStatus), default=SurveysStatus.IN_PROGRESS
     )
-    started_at: Mapped[datetime] = mapped_column(default=datetime.utcnow)
+    started_at: Mapped[datetime] = mapped_column(default=datetime.now(timezone.utc))
     completed_at: Mapped[datetime] = mapped_column(nullable=True)
     answers: Mapped[str] = mapped_column(Text, nullable=True)  # JSON строка с ответами
 

src/schemas/research.py

@@ -32,7 +32,7 @@ class ResearchTypeBaseSchema(BaseModel):
 
     title: str = Field(..., min_length=1, max_length=255, description='Заголовок опроса')
     description: Optional[str] = Field(None, max_length=1000, description='Описание опроса')
-    questions: List[QuestionSchema] = Field(..., min_items=1, description='Список вопросов')
+    questions: List[QuestionSchema] = Field(..., min_length=1, description='Список вопросов')
     is_active: bool = Field(default=True, description='Активен ли тип опроса')
 
     @field_validator('questions')
@@ -70,7 +70,7 @@ class ResearchTypeUpdateSchema(BaseModel):
 
     title: Optional[str] = Field(None, min_length=1, max_length=255)
     description: Optional[str] = Field(None, max_length=1000)
-    questions: Optional[List[QuestionSchema]] = Field(None, min_items=1)
+    questions: Optional[List[QuestionSchema]] = Field(None, min_length=1)
     is_active: Optional[bool] = None
 
     model_config = ConfigDict(extra='forbid')