New features pushed to main

backend/alembic/versions/112_align_body_areas_with_frontend.py

@@ -0,0 +1,208 @@
+"""align body area catalog with frontend
+
+Revision ID: 112_align_body_areas_with_frontend
+Revises: 111_create_journey_events
+Create Date: 2026-06-09
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects.postgresql import UUID
+
+revision: str = "112_align_body_areas"
+down_revision: str | None = "111_create_journey_events"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+BODY_AREAS = (
+    ("d7246d41-427a-4acf-b7f1-19c87e045a23", "face", "Face", "center", "head", 50, 10, "front"),
+    ("e4718197-848b-488c-a9e6-29ce3c978526", "neck", "Pescoço", "center", "head", 50, 17, "front"),
+    (
+        "7a9d2743-a641-46f2-8206-a6bc967652e0",
+        "shoulders",
+        "Ombros",
+        "center",
+        "upper_limb",
+        25,
+        25,
+        "front",
+    ),
+    (
+        "57d0040e-9cb5-4930-8d68-e5db16409026",
+        "arms",
+        "Braços",
+        "center",
+        "upper_limb",
+        20,
+        50,
+        "front",
+    ),
+    (
+        "d0427a6e-14da-4f46-a2f5-6df4581e0b3b",
+        "hands",
+        "Mãos",
+        "center",
+        "upper_limb",
+        15,
+        75,
+        "front",
+    ),
+    (
+        "64d0af93-f2d5-484f-a1a6-53d8f3778cad",
+        "abdomen",
+        "Abdômen",
+        "center",
+        "trunk",
+        50,
+        35,
+        "front",
+    ),
+    ("93d7f00b-cde9-4e2d-a84d-f6618e3dafaf", "hip", "Quadril", "center", "trunk", 50, 50, "front"),
+    (
+        "2c242eb6-0c2f-43ee-a625-7aed0593c953",
+        "legs",
+        "Pernas",
+        "center",
+        "lower_limb",
+        35,
+        65,
+        "front",
+    ),
+    (
+        "3ae541eb-62b2-4298-aa6f-b95a785a35a9",
+        "knees",
+        "Joelhos",
+        "center",
+        "lower_limb",
+        35,
+        80,
+        "front",
+    ),
+    (
+        "b0d125a5-366f-43b4-b17c-d0b61743ed69",
+        "feet",
+        "Pés",
+        "center",
+        "lower_limb",
+        35,
+        95,
+        "front",
+    ),
+    (
+        "5c19647e-df64-4bc1-893a-c8a077612631",
+        "scalp",
+        "Couro cabeludo",
+        "center",
+        "head",
+        50,
+        8,
+        "back",
+    ),
+    ("49201184-5df7-4f50-a3de-d28258586138", "nape", "Nuca", "center", "head", 50, 17, "back"),
+    ("04947b01-d28b-4db1-993a-3bb18b68ecac", "back", "Costas", "center", "trunk", 50, 35, "back"),
+    (
+        "e224e751-dff5-4215-b165-d9a2d03c4431",
+        "buttocks",
+        "Glúteos",
+        "center",
+        "trunk",
+        50,
+        52,
+        "back",
+    ),
+    (
+        "43265efe-892f-45f6-afb4-639373512cfb",
+        "posterior_thighs",
+        "Posterior das coxas",
+        "center",
+        "lower_limb",
+        35,
+        65,
+        "back",
+    ),
+    (
+        "3d0353f1-5c81-4c17-9d22-b900f67d141e",
+        "calves",
+        "Panturrilhas",
+        "center",
+        "lower_limb",
+        35,
+        85,
+        "back",
+    ),
+)
+
+
+def upgrade() -> None:
+    body_view_enum = sa.Enum("front", "back", name="body_view_enum")
+    body_view_enum.create(op.get_bind(), checkfirst=True)
+
+    op.add_column("body_areas", sa.Column("x", sa.SmallInteger(), nullable=True))
+    op.add_column("body_areas", sa.Column("y", sa.SmallInteger(), nullable=True))
+    op.add_column("body_areas", sa.Column("view", body_view_enum, nullable=True))
+    op.add_column(
+        "body_areas",
+        sa.Column("is_active", sa.Boolean(), server_default=sa.text("true"), nullable=False),
+    )
+
+    op.execute("UPDATE body_areas SET x = 50, y = 50, view = 'front', is_active = false")
+    op.alter_column("body_areas", "x", nullable=False)
+    op.alter_column("body_areas", "y", nullable=False)
+    op.alter_column("body_areas", "view", nullable=False)
+    op.create_check_constraint("body_areas_x_range", "body_areas", "x >= 0 AND x <= 100")
+    op.create_check_constraint("body_areas_y_range", "body_areas", "y >= 0 AND y <= 100")
+
+    body_areas = sa.table(
+        "body_areas",
+        sa.column("id", UUID(as_uuid=True)),
+        sa.column("code", sa.Text()),
+        sa.column("label", sa.Text()),
+        sa.column("side", sa.Enum(name="body_side_enum")),
+        sa.column("system_part", sa.Enum(name="body_system_part_enum")),
+        sa.column("x", sa.SmallInteger()),
+        sa.column("y", sa.SmallInteger()),
+        sa.column("view", sa.Enum(name="body_view_enum")),
+        sa.column("is_active", sa.Boolean()),
+    )
+    op.bulk_insert(
+        body_areas,
+        [
+            {
+                "id": area_id,
+                "code": code,
+                "label": label,
+                "side": side,
+                "system_part": system_part,
+                "x": x,
+                "y": y,
+                "view": view,
+                "is_active": True,
+            }
+            for area_id, code, label, side, system_part, x, y, view in BODY_AREAS
+            if code != "abdomen"
+        ],
+    )
+    op.execute(
+        """
+        UPDATE body_areas
+        SET label = 'Abdômen', side = 'center', system_part = 'trunk',
+            x = 50, y = 35, view = 'front', is_active = true
+        WHERE code = 'abdomen'
+        """
+    )
+
+
+def downgrade() -> None:
+    codes = ", ".join(f"'{area[1]}'" for area in BODY_AREAS if area[1] != "abdomen")
+    op.execute(f"DELETE FROM body_areas WHERE code IN ({codes})")
+    op.execute("UPDATE body_areas SET is_active = true WHERE code = 'abdomen'")
+    op.drop_constraint("body_areas_y_range", "body_areas", type_="check")
+    op.drop_constraint("body_areas_x_range", "body_areas", type_="check")
+    op.drop_column("body_areas", "is_active")
+    op.drop_column("body_areas", "view")
+    op.drop_column("body_areas", "y")
+    op.drop_column("body_areas", "x")
+    sa.Enum(name="body_view_enum").drop(op.get_bind(), checkfirst=True)

backend/alembic/versions/aeb509f804c0_create_daily_medication_progress_table.py

@@ -0,0 +1,78 @@
+"""create daily medication progress table
+
+Revision ID: aeb509f804c0
+Revises: 108_patient_health_appointments
+Create Date: 2026-06-08 23:56:27.762692
+
+"""
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = "aeb509f804c0"
+down_revision: str | None = "112_align_body_areas"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+
+def upgrade() -> None:
+    op.create_table(
+        "daily_medication_progress",
+        sa.Column("id", postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column("patient_id", postgresql.UUID(as_uuid=True), nullable=False),
+        sa.Column("progress_date", sa.Date(), nullable=False),
+        sa.Column("expected_count", sa.Integer(), nullable=False),
+        sa.Column("taken_count", sa.Integer(), nullable=False),
+        sa.Column(
+            "created_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.Column(
+            "updated_at",
+            sa.DateTime(timezone=True),
+            server_default=sa.text("now()"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(
+            ["patient_id"],
+            ["patient_profiles.id"],
+            ondelete="RESTRICT",
+        ),
+        sa.PrimaryKeyConstraint("id"),
+        sa.UniqueConstraint(
+            "patient_id",
+            "progress_date",
+            name="uq_daily_medication_progress_patient_date",
+        ),
+    )
+
+    op.create_index(
+        "ix_daily_medication_progress_patient_id",
+        "daily_medication_progress",
+        ["patient_id"],
+        unique=False,
+    )
+    op.create_index(
+        "ix_daily_medication_progress_progress_date",
+        "daily_medication_progress",
+        ["progress_date"],
+        unique=False,
+    )
+
+
+def downgrade() -> None:
+    op.drop_index(
+        "ix_daily_medication_progress_progress_date",
+        table_name="daily_medication_progress",
+    )
+    op.drop_index(
+        "ix_daily_medication_progress_patient_id",
+        table_name="daily_medication_progress",
+    )
+    op.drop_table("daily_medication_progress")

backend/bruno/ROUTES.md

@@ -52,6 +52,7 @@ Contrato HTTP da API v1. Fonte: `docs/milestones/M*.md`.
 | `PATCH` | `/v1/patients/me` | 20/min | patient | `patient/update_profile.bru` ✅ |
 | `GET` | `/v1/patients` | 100/min | professional, admin | `patient/list_patients.bru` |
 | `GET` | `/v1/patients/{id}` | 100/min | professional, admin | `patient/get_patient.bru` |
+| `GET` | `/v1/patients/me/journey` | 100/min | patient | `patient/get_journey.bru` |
 
 ---
 

backend/bruno/patient/get_journey.bru

@@ -0,0 +1,19 @@
+meta {
+  name: Get Journey
+  type: http
+  seq: 10
+}
+
+get {
+  url: {{baseUrl}}/v1/patients/me/journey
+  auth: bearer
+}
+
+assert {
+  res.status: eq 200
+  res.body.summary: isDefined
+  res.body.summary.classification: isDefined
+  res.body.summary.treatment_duration_months: isDefined
+  res.body.summary.progress_percent: isDefined
+  res.body.months: isDefined
+}

backend/src/pequi/main.py

@@ -83,11 +83,6 @@ async def health_check() -> JSONResponse:
     from pequi.routers import treatment_v2 as treatment_v2_router
 
     app.include_router(patient_router.router, prefix="/v1/patients", tags=["patients"])
-    app.include_router(
-        journey_router.router,
-        prefix="/v1/patients/me/journey",
-        tags=["journey"],
-    )
     app.include_router(journey_router.router, prefix="/v2/journey", tags=["journey"])
     app.include_router(account_router.router, prefix="/v1/account", tags=["account"])
     app.include_router(auth_router.router, prefix="/v1/auth", tags=["auth"])

backend/src/pequi/models/__init__.py

@@ -10,6 +10,7 @@
     CommunityPost,
 )
 from pequi.models.consent import Consent
+from pequi.models.daily_medication_progress import DailyMedicationProgress
 from pequi.models.data_deletion import DataDeletionRequest
 from pequi.models.dose_log import AdherenceSnapshot, DoseLog
 from pequi.models.health_appointment import PatientHealthAppointment
@@ -50,4 +51,5 @@
     "Treatment",
     "User",
     "WeeklySymptomSummary",
+    "DailyMedicationProgress",
 ]

backend/src/pequi/models/body_map.py

@@ -2,6 +2,7 @@
 from enum import StrEnum
 
 from sqlalchemy import (
+    Boolean,
     CheckConstraint,
     Column,
     DateTime,
@@ -33,6 +34,11 @@ class BodySystemPart(StrEnum):
     lower_limb = "lower_limb"
 
 
+class BodyView(StrEnum):
+    front = "front"
+    back = "back"
+
+
 class BodyFindingType(StrEnum):
     lesion = "lesion"
     hypoesthesia = "hypoesthesia"
@@ -44,6 +50,8 @@ class BodyFindingType(StrEnum):
 class BodyArea(Base):
     __tablename__ = "body_areas"
     __table_args__ = (
+        CheckConstraint("x >= 0 AND x <= 100", name="body_areas_x_range"),
+        CheckConstraint("y >= 0 AND y <= 100", name="body_areas_y_range"),
         Index("ix_body_areas_system_part", "system_part"),
         Index("ix_body_areas_label", "label"),
     )
@@ -59,6 +67,10 @@ class BodyArea(Base):
         Enum(BodySystemPart, name="body_system_part_enum"),
         nullable=False,
     )
+    x = Column(SmallInteger, nullable=False, default=50)
+    y = Column(SmallInteger, nullable=False, default=50)
+    view = Column(Enum(BodyView, name="body_view_enum"), nullable=False, default=BodyView.front)
+    is_active = Column(Boolean, nullable=False, default=True, server_default=text("true"))
 
 
 class BodyMapEntry(Base):