Modify Shot Data Table Functions

This commit is contained in:
2026-03-05 22:12:02 +08:00
parent c8c4c99a6e
commit 1f229bff6c
26 changed files with 212 additions and 186 deletions
+2 -1
View File
@@ -367,7 +367,8 @@ async def list_project_members(
joined_at=member.joined_at,
user_email=member.user.email,
user_first_name=member.user.first_name,
user_last_name=member.user.last_name
user_last_name=member.user.last_name,
user_avatar_url=member.user.avatar_url
)
result.append(member_data)
+13 -5
View File
@@ -455,7 +455,8 @@ async def create_task(
"shot_name": db_task.shot.name if db_task.shot else None,
"asset_name": db_task.asset.name if db_task.asset else None,
"assigned_user_name": f"{db_task.assigned_user.first_name} {db_task.assigned_user.last_name}" if db_task.assigned_user else None,
"assigned_user_email": db_task.assigned_user.email if db_task.assigned_user else None
"assigned_user_email": db_task.assigned_user.email if db_task.assigned_user else None,
"assigned_user_avatar_url": db_task.assigned_user.avatar_url if db_task.assigned_user else None
}
return TaskResponse(**task_data)
@@ -744,7 +745,8 @@ async def get_task(
"shot_name": task.shot.name if task.shot else None,
"asset_name": task.asset.name if task.asset else None,
"assigned_user_name": f"{task.assigned_user.first_name} {task.assigned_user.last_name}" if task.assigned_user else None,
"assigned_user_email": task.assigned_user.email if task.assigned_user else None
"assigned_user_email": task.assigned_user.email if task.assigned_user else None,
"assigned_user_avatar_url": task.assigned_user.avatar_url if task.assigned_user else None
}
return TaskResponse(**task_data)
@@ -862,7 +864,8 @@ async def update_task(
"shot_name": task.shot.name if task.shot else None,
"asset_name": task.asset.name if task.asset else None,
"assigned_user_name": f"{task.assigned_user.first_name} {task.assigned_user.last_name}" if task.assigned_user else None,
"assigned_user_email": task.assigned_user.email if task.assigned_user else None
"assigned_user_email": task.assigned_user.email if task.assigned_user else None,
"assigned_user_avatar_url": task.assigned_user.avatar_url if task.assigned_user else None
}
return TaskResponse(**task_data)
@@ -951,7 +954,8 @@ async def update_task_status(
"shot_name": task.shot.name if task.shot else None,
"asset_name": task.asset.name if task.asset else None,
"assigned_user_name": f"{task.assigned_user.first_name} {task.assigned_user.last_name}" if task.assigned_user else None,
"assigned_user_email": task.assigned_user.email if task.assigned_user else None
"assigned_user_email": task.assigned_user.email if task.assigned_user else None,
"assigned_user_avatar_url": task.assigned_user.avatar_url if task.assigned_user else None
}
return TaskResponse(**task_data)
@@ -1049,7 +1053,8 @@ async def assign_task(
"shot_name": task.shot.name if task.shot else None,
"asset_name": task.asset.name if task.asset else None,
"assigned_user_name": f"{task.assigned_user.first_name} {task.assigned_user.last_name}" if task.assigned_user else None,
"assigned_user_email": task.assigned_user.email if task.assigned_user else None
"assigned_user_email": task.assigned_user.email if task.assigned_user else None,
"assigned_user_avatar_url": task.assigned_user.avatar_url if task.assigned_user else None
}
return TaskResponse(**task_data)
@@ -1130,6 +1135,7 @@ async def get_task_notes(
"user_first_name": note.user.first_name,
"user_last_name": note.user.last_name,
"user_email": note.user.email,
"user_avatar_url": note.user.avatar_url,
"child_notes": []
}
@@ -1208,6 +1214,7 @@ async def create_task_note(
"user_first_name": db_note.user.first_name,
"user_last_name": db_note.user.last_name,
"user_email": db_note.user.email,
"user_avatar_url": db_note.user.avatar_url,
"child_notes": []
}
@@ -1256,6 +1263,7 @@ async def update_task_note(
"user_first_name": note.user.first_name,
"user_last_name": note.user.last_name,
"user_email": note.user.email,
"user_avatar_url": note.user.avatar_url,
"child_notes": []
}
+1
View File
@@ -211,6 +211,7 @@ class ProjectMemberResponse(ProjectMemberBase):
user_email: str
user_first_name: str
user_last_name: str
user_avatar_url: Optional[str] = None
class Config:
from_attributes = True
+3
View File
@@ -57,6 +57,7 @@ class TaskResponse(TaskBase):
asset_name: Optional[str] = None
assigned_user_name: Optional[str] = None
assigned_user_email: Optional[str] = None
assigned_user_avatar_url: Optional[str] = None
class Config:
from_attributes = True
@@ -78,6 +79,7 @@ class TaskListResponse(BaseModel):
asset_name: Optional[str] = None
assigned_user_id: Optional[int] = None
assigned_user_name: Optional[str] = None
assigned_user_avatar_url: Optional[str] = None
created_at: datetime
updated_at: datetime
@@ -110,6 +112,7 @@ class ProductionNoteResponse(ProductionNoteBase):
user_first_name: str
user_last_name: str
user_email: str
user_avatar_url: Optional[str] = None
# Child notes for threading
child_notes: Optional[List['ProductionNoteResponse']] = None