Goals can now choose between milestone-based progress (existing) and cumulative checkin-based progress (new). Cumulative mode supports cross-unit conversion (e.g. kcal → g fat) via a configurable conversion rate. New GoalCheckin model stores daily inputs; progress auto-recalculates on every checkin C/U/D. Backup import/export covers the new table. Frontend GoalDialog, GoalDetailPage and GoalPage cards adapt to show cumulative progress or milestone progress based on track_type. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
178 lines
4.9 KiB
Python
178 lines
4.9 KiB
Python
from pydantic import BaseModel, Field, field_validator
|
|
from datetime import datetime, date
|
|
from typing import Optional, List
|
|
|
|
from app.schemas.category import CategoryResponse
|
|
from app.schemas.task import TaskResponse
|
|
|
|
|
|
# ============ GoalCheckin Schemas ============
|
|
|
|
class GoalCheckinCreate(BaseModel):
|
|
value: float = Field(..., gt=0)
|
|
note: Optional[str] = None
|
|
checkin_date: date
|
|
|
|
|
|
class GoalCheckinUpdate(BaseModel):
|
|
value: Optional[float] = Field(None, gt=0)
|
|
note: Optional[str] = None
|
|
checkin_date: Optional[date] = None
|
|
|
|
@property
|
|
def clearable_fields(self) -> set:
|
|
return {"note"}
|
|
|
|
|
|
class GoalCheckinResponse(BaseModel):
|
|
id: int
|
|
uuid: Optional[str] = None
|
|
goal_id: int
|
|
value: float
|
|
note: Optional[str] = None
|
|
checkin_date: date
|
|
created_at: datetime
|
|
|
|
class Config:
|
|
from_attributes = True
|
|
|
|
|
|
# ============ GoalStep Schemas ============
|
|
|
|
class GoalStepBase(BaseModel):
|
|
title: str = Field(..., max_length=200)
|
|
step_type: str = Field(..., pattern="^(phase|milestone)$")
|
|
status: str = Field(default="pending", pattern="^(pending|in_progress|completed)$")
|
|
target_date: Optional[date] = None
|
|
parent_id: Optional[int] = None
|
|
sort_order: int = Field(default=0)
|
|
|
|
|
|
class GoalStepCreate(GoalStepBase):
|
|
pass
|
|
|
|
|
|
class GoalStepUpdate(BaseModel):
|
|
title: Optional[str] = Field(None, max_length=200)
|
|
step_type: Optional[str] = Field(None, pattern="^(phase|milestone)$")
|
|
status: Optional[str] = Field(None, pattern="^(pending|in_progress|completed)$")
|
|
target_date: Optional[date] = None
|
|
parent_id: Optional[int] = None
|
|
sort_order: Optional[int] = None
|
|
|
|
@property
|
|
def clearable_fields(self) -> set:
|
|
return {"target_date", "parent_id"}
|
|
|
|
|
|
class GoalStepResponse(GoalStepBase):
|
|
id: int
|
|
uuid: Optional[str] = None
|
|
goal_id: int
|
|
reached_at: Optional[datetime] = None
|
|
created_at: datetime
|
|
children: List["GoalStepResponse"] = []
|
|
|
|
class Config:
|
|
from_attributes = True
|
|
|
|
|
|
# ============ GoalReview Schemas ============
|
|
|
|
class GoalReviewCreate(BaseModel):
|
|
content: str = Field(..., min_length=1)
|
|
rating: Optional[int] = Field(None, ge=1, le=5)
|
|
|
|
|
|
class GoalReviewResponse(BaseModel):
|
|
id: int
|
|
uuid: Optional[str] = None
|
|
goal_id: int
|
|
content: str
|
|
rating: Optional[int] = None
|
|
created_at: datetime
|
|
|
|
class Config:
|
|
from_attributes = True
|
|
|
|
|
|
# ============ Goal Schemas ============
|
|
|
|
class GoalBase(BaseModel):
|
|
title: str = Field(..., max_length=200)
|
|
description: Optional[str] = None
|
|
status: str = Field(default="active", pattern="^(active|paused|completed|abandoned)$")
|
|
track_type: str = Field(default="milestone", pattern="^(milestone|cumulative)$")
|
|
target_value: Optional[float] = None
|
|
target_unit: Optional[str] = Field(None, max_length=20)
|
|
input_unit: Optional[str] = Field(None, max_length=20)
|
|
conversion_rate: float = Field(default=1.0)
|
|
target_date: Optional[date] = None
|
|
category_id: Optional[int] = None
|
|
color: str = Field(default="#FFB7C5", max_length=20)
|
|
icon: str = Field(default="flag", max_length=50)
|
|
sort_order: int = Field(default=0)
|
|
|
|
|
|
class GoalCreate(GoalBase):
|
|
pass
|
|
|
|
|
|
class GoalUpdate(BaseModel):
|
|
title: Optional[str] = Field(None, max_length=200)
|
|
description: Optional[str] = None
|
|
status: Optional[str] = Field(None, pattern="^(active|paused|completed|abandoned)$")
|
|
track_type: Optional[str] = Field(None, pattern="^(milestone|cumulative)$")
|
|
target_value: Optional[float] = None
|
|
target_unit: Optional[str] = Field(None, max_length=20)
|
|
input_unit: Optional[str] = Field(None, max_length=20)
|
|
conversion_rate: Optional[float] = None
|
|
target_date: Optional[date] = None
|
|
category_id: Optional[int] = None
|
|
color: Optional[str] = Field(None, max_length=20)
|
|
icon: Optional[str] = Field(None, max_length=50)
|
|
sort_order: Optional[int] = None
|
|
|
|
@property
|
|
def clearable_fields(self) -> set:
|
|
return {"description", "target_date", "category_id",
|
|
"target_value", "target_unit", "input_unit"}
|
|
|
|
|
|
class GoalListResponse(GoalBase):
|
|
id: int
|
|
uuid: Optional[str] = None
|
|
progress: int
|
|
current_value: float = 0
|
|
completed_at: Optional[datetime] = None
|
|
created_at: datetime
|
|
updated_at: datetime
|
|
category: Optional[CategoryResponse] = None
|
|
total_steps: int = 0
|
|
completed_steps: int = 0
|
|
|
|
class Config:
|
|
from_attributes = True
|
|
|
|
|
|
class GoalDetailResponse(GoalListResponse):
|
|
steps: List[GoalStepResponse] = []
|
|
reviews: List[GoalReviewResponse] = []
|
|
checkins: List[GoalCheckinResponse] = []
|
|
tasks: List[TaskResponse] = []
|
|
|
|
|
|
class GoalStatusUpdate(BaseModel):
|
|
status: str = Field(..., pattern="^(active|paused|completed|abandoned)$")
|
|
|
|
|
|
# ============ Reorder Schema ============
|
|
|
|
class ReorderItem(BaseModel):
|
|
id: int
|
|
sort_order: int
|
|
|
|
|
|
class ReorderRequest(BaseModel):
|
|
items: list[ReorderItem]
|