Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions backend/alembic/versions/0017_todo_items.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import sqlalchemy as sa
from alembic import op

revision = "0017_todo_items"
down_revision = "0016_health_daily_summary"
branch_labels = None
depends_on = None


def upgrade() -> None:
op.create_table(
"todo_items",
sa.Column("id", sa.String(36), primary_key=True),
sa.Column("user_id", sa.String(36), sa.ForeignKey("users.id"), nullable=False),
sa.Column("title", sa.String(100), nullable=False),
sa.Column("source", sa.String(16), nullable=False),
sa.Column("suggestion_key", sa.String(40), nullable=True),
sa.Column("day", sa.Date(), nullable=True),
sa.Column("done_at", sa.DateTime(timezone=True), nullable=True),
sa.Column("dismissed", sa.Boolean(), server_default=sa.false(), nullable=False),
sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
)
op.create_index("ix_todo_items_user_id", "todo_items", ["user_id"])


def downgrade() -> None:
raise RuntimeError("Restore a verified backup instead of a destructive downgrade")
3 changes: 2 additions & 1 deletion backend/app/account_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
RefreshSession,
RepeatEvent,
Report,
TodoItem,
Transcript,
User,
UserRole,
Expand Down Expand Up @@ -308,7 +309,7 @@ async def delete_account(
))
for model in (
ConsentRecord, QuestionTtsGrant, Device, RefreshSession,
HealthDailySummary, HealthLinkConsent,
HealthDailySummary, HealthLinkConsent, TodoItem,
):
await session.execute(delete(model).where(model.user_id == user.id))
if user.phone:
Expand Down
2 changes: 2 additions & 0 deletions backend/app/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from app.routes.profiles import router as profiles_router
from app.routes.questions import router as questions_router
from app.routes.reports import router as reports_router
from app.routes.todos import router as todos_router
from app.routes.webhooks import router as webhooks_router

router = APIRouter()
Expand All @@ -25,4 +26,5 @@
router.include_router(analysis_router)
router.include_router(reports_router)
router.include_router(health_router)
router.include_router(todos_router)
router.include_router(webhooks_router)
20 changes: 20 additions & 0 deletions backend/app/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,26 @@ class HealthDailySummary(Base):
updated_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow)


class TodoItem(Base):
"""개인 할 일. 가족에게 보이지 않는다.

USER = 본인이 쓴 할 일(완료하거나 지울 때까지 남는다). SUGGESTED = 그날(Asia/Seoul) 처음 열 때
질환·걸음 수로 골라 둔 추천 활동. 추천을 지우면 그날 다시 만들지 않도록 dismissed 로 남긴다.
"""

__tablename__ = "todo_items"

id: Mapped[str] = mapped_column(String(36), primary_key=True, default=new_id)
user_id: Mapped[str] = mapped_column(ForeignKey("users.id"), index=True)
title: Mapped[str] = mapped_column(String(100))
source: Mapped[str] = mapped_column(String(16))
suggestion_key: Mapped[str | None] = mapped_column(String(40), nullable=True)
day: Mapped[date | None] = mapped_column(Date, nullable=True)
done_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
dismissed: Mapped[bool] = mapped_column(Boolean, default=False, server_default=false())
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=utcnow)


class ParentProfile(Base):
__tablename__ = "parent_profiles"

Expand Down
155 changes: 155 additions & 0 deletions backend/app/routes/todos.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,155 @@
from __future__ import annotations

from datetime import UTC, date, datetime, time, timedelta
from typing import Annotated

from fastapi import APIRouter, HTTPException, Path, Response, status
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession

from app.models import HealthDailySummary, ParentProfile, TodoItem, User
from app.routes.shared import aware
from app.schemas import TodoCreate, TodoUpdate
from app.security import CurrentUser, SessionDep
from app.services.reports import REPORT_TIMEZONE
from app.services.todos import daily_suggestions

router = APIRouter()

USER_SOURCE = "USER"
SUGGESTED_SOURCE = "SUGGESTED"
# 남아 있는(완료하지 않은) 직접 쓴 할 일 상한
MAX_OPEN_TODOS = 100
# 지난 추천과 끝낸 할 일은 이만큼 지나면 지운다(목록에는 오늘 것만 보인다)
KEEP_DAYS = 7


def todo_view(item: TodoItem) -> dict:
return {
"id": item.id,
"title": item.title,
"source": item.source,
"done": item.done_at is not None,
"doneAt": aware(item.done_at) if item.done_at else None,
"createdAt": aware(item.created_at),
}


async def recent_steps(session: AsyncSession, user_id: str, today: date) -> int | None:
"""어제·그제 하루 요약 중 가장 최근 걸음 수. 오늘 값은 하루가 덜 차서 보지 않는다."""
return await session.scalar(
select(HealthDailySummary.steps)
.where(
HealthDailySummary.user_id == user_id,
HealthDailySummary.day >= today - timedelta(days=2),
HealthDailySummary.day < today,
HealthDailySummary.steps.is_not(None),
)
.order_by(HealthDailySummary.day.desc())
.limit(1)
)


async def own_item(session: AsyncSession, user_id: str, todo_id: str) -> TodoItem:
item = await session.get(TodoItem, todo_id)
if item is None or item.user_id != user_id or item.dismissed:
raise HTTPException(status.HTTP_404_NOT_FOUND, "할 일을 찾을 수 없어요")
return item


@router.get("/todos", tags=["Todo"])
async def list_todos(user: CurrentUser, session: SessionDep) -> dict:
today = datetime.now(REPORT_TIMEZONE).date()
start_of_today = datetime.combine(today, time.min, REPORT_TIMEZONE)
# 같은 사람이 동시에 열어도 추천이 두 벌 생기지 않게 사람 단위로 줄 세운다.
await session.execute(select(User.id).where(User.id == user.id).with_for_update())
items = list(await session.scalars(select(TodoItem).where(TodoItem.user_id == user.id)))

stale_day = today - timedelta(days=KEEP_DAYS)
stale_before = start_of_today - timedelta(days=KEEP_DAYS)

def stale(item: TodoItem) -> bool:
if item.source == SUGGESTED_SOURCE and item.day is not None:
return item.day < stale_day
return item.done_at is not None and aware(item.done_at) < stale_before

for item in [i for i in items if stale(i)]:
await session.delete(item)
items.remove(item)

if not any(i.source == SUGGESTED_SOURCE and i.day == today for i in items):
profile = await session.get(ParentProfile, user.id)
steps = await recent_steps(session, user.id, today)
conditions = profile.conditions if profile else []
for key, text in daily_suggestions(user.id, today, conditions, steps):
item = TodoItem(
user_id=user.id, title=text, source=SUGGESTED_SOURCE, suggestion_key=key,
day=today, dismissed=False, created_at=datetime.now(UTC),
)
session.add(item)
items.append(item)
await session.commit()

def visible(item: TodoItem) -> bool:
if item.dismissed:
return False
if item.source == SUGGESTED_SOURCE:
return item.day == today
return item.done_at is None or aware(item.done_at) >= start_of_today

shown = sorted(
(i for i in items if visible(i)),
key=lambda i: (i.source != SUGGESTED_SOURCE, aware(i.created_at)),
)
return {"date": today.isoformat(), "items": [todo_view(i) for i in shown]}


@router.post("/todos", status_code=201, tags=["Todo"])
async def create_todo(payload: TodoCreate, user: CurrentUser, session: SessionDep) -> dict:
open_count = len(list(await session.scalars(
select(TodoItem.id).where(
TodoItem.user_id == user.id,
TodoItem.source == USER_SOURCE,
TodoItem.done_at.is_(None),
)
)))
if open_count >= MAX_OPEN_TODOS:
raise HTTPException(status.HTTP_409_CONFLICT, "할 일은 100개까지 남겨 둘 수 있어요")
item = TodoItem(
user_id=user.id, title=payload.title, source=USER_SOURCE, created_at=datetime.now(UTC)
)
session.add(item)
await session.commit()
return todo_view(item)


@router.patch("/todos/{todoId}", tags=["Todo"])
async def update_todo(
todo_id: Annotated[str, Path(alias="todoId", max_length=36)],
payload: TodoUpdate,
user: CurrentUser,
session: SessionDep,
) -> dict:
item = await own_item(session, user.id, todo_id)
if payload.done and item.done_at is None:
item.done_at = datetime.now(UTC)
elif not payload.done:
item.done_at = None
await session.commit()
return todo_view(item)


@router.delete("/todos/{todoId}", status_code=204, tags=["Todo"])
async def delete_todo(
todo_id: Annotated[str, Path(alias="todoId", max_length=36)],
user: CurrentUser,
session: SessionDep,
) -> Response:
item = await own_item(session, user.id, todo_id)
if item.source == SUGGESTED_SOURCE:
# 지운 추천이 그날 다시 생기지 않게 표시만 남긴다.
item.dismissed = True
else:
await session.delete(item)
await session.commit()
return Response(status_code=status.HTTP_204_NO_CONTENT)
16 changes: 16 additions & 0 deletions backend/app/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,3 +476,19 @@ class ReportView(ApiModel):
issued_at: datetime
# [{callId, observedAt, text}] 응급 표현이 있었던 통화. 없으면 빈 배열.
safety_notices: list[dict[str, Any]] = Field(default_factory=list)


class TodoCreate(ApiModel):
title: str = Field(min_length=1, max_length=100)

@field_validator("title")
@classmethod
def stripped_title(cls, value: str) -> str:
value = value.strip()
if not value:
raise ValueError("할 일을 적어주세요")
return value


class TodoUpdate(ApiModel):
done: bool
87 changes: 87 additions & 0 deletions backend/app/services/todos.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
from __future__ import annotations

import hashlib
from datetime import date

# 추천 활동은 외부 AI 없이 정해 둔 목록에서 고른다(동의서 v5 범위 안). 일반적인 생활 습관만 두고
# 진단·약 복용 지시처럼 의료 판단이 들어가는 문장은 넣지 않는다(가드레일과 같은 경계).
SUGGESTION_POOL: dict[str, list[tuple[str, str]]] = {
"FORGETFULNESS": [
("forgetfulness-diary", "오늘 있었던 일 한 줄 적기"),
("forgetfulness-call", "가족이나 친구와 안부 나누기"),
],
"RESPIRATORY": [
("respiratory-water", "따뜻한 물 자주 마시기"),
("respiratory-air", "창문 열고 5분 환기하기"),
],
"RHINITIS": [
("rhinitis-humidity", "실내 습도 확인하기"),
("rhinitis-wash", "외출 후 손 씻고 세수하기"),
],
"DIABETES": [
("diabetes-walk", "식사 후 10분 걷기"),
("diabetes-meal", "끼니 거르지 않고 제때 먹기"),
],
"HYPERTENSION": [
("hypertension-record", "혈압 재고 기록하기"),
("hypertension-soup", "국물은 조금만 먹기"),
],
"DYSLIPIDEMIA": [
("dyslipidemia-veg", "채소 반찬 한 가지 더 먹기"),
("dyslipidemia-walk", "30분 걷기"),
],
"ASTHMA": [
("asthma-dust", "외출 전 미세먼지 확인하기"),
("asthma-clean", "먼지 쌓인 곳 닦기"),
],
"OBESITY": [
("obesity-stairs", "계단으로 한 층 오르기"),
("obesity-water", "물 6잔 마시기"),
],
}

DEFAULT_POOL: list[tuple[str, str]] = [
("default-walk", "20분 산책하기"),
("default-water", "물 6잔 마시기"),
("default-stretch", "자기 전 5분 스트레칭"),
("default-sleep", "정해진 시간에 잠자리에 들기"),
]

# 건강 앱 하루 요약에서 최근 걸음 수가 이보다 적으면 걷기를 맨 앞에 둔다.
LOW_STEPS = 3000
LOW_STEPS_SUGGESTION = ("steps-more", "어제보다 1,000걸음 더 걷기")
DAILY_SUGGESTIONS = 3


def _rotated(items: list[tuple[str, str]], seed: bytes) -> list[tuple[str, str]]:
if not items:
return []
start = int.from_bytes(seed[:4], "big") % len(items)
return items[start:] + items[:start]


def daily_suggestions(
user_id: str,
day: date,
conditions: list[str],
recent_steps: int | None,
) -> list[tuple[str, str]]:
"""그날의 추천 활동(key, 문장). 같은 사람·같은 날이면 같은 결과다."""
seed = hashlib.sha256(f"{user_id}:{day.isoformat()}".encode()).digest()
ordered: list[tuple[str, str]] = []
if recent_steps is not None and recent_steps < LOW_STEPS:
ordered.append(LOW_STEPS_SUGGESTION)
by_condition = [item for code in conditions for item in SUGGESTION_POOL.get(code, [])]
ordered += _rotated(by_condition, seed)
ordered += _rotated(DEFAULT_POOL, seed[4:])

chosen: list[tuple[str, str]] = []
seen_text: set[str] = set()
for key, text in ordered:
if text in seen_text:
continue
seen_text.add(text)
chosen.append((key, text))
if len(chosen) == DAILY_SUGGESTIONS:
break
return chosen
Loading
Loading