feat: Phase 3c — dose logging + adherence, profile management, tests

Three workstreams, all backend+frontend (per scope decisions):

Dose logging + real adherence (backend + frontend):
* log_dose now returns the created dose (201 + body) instead of an empty 201.
* get_adherence implemented for real: queries the medication_doses collection
  over the last 30 days, counts taken vs total, computes the rate. The previous
  implementation hardcoded zeros. Removed the dead calculate_adherence stub.
* Frontend: fixed DoseLog type to match backend MedicationDose (taken:bool,
  loggedAt, camelCase); added AdherenceStats + LogDoseRequest types; logDose() +
  getAdherence() in api.ts; loadAdherence/logDose actions in the medication
  store (adherence cache keyed by med id); new DoseLogger component (Taken/
  Skipped buttons + LinearProgress adherence bar) embedded in each
  MedicationManager card.

Profile management (backend + frontend):
* New GET/PUT /api/profiles/me endpoints (ProfileResponse excludes encryption
  fields; find_by_user_id + update_name on ProfileRepository).
* Register auto-creates a default 'patient' profile (deterministic profile_id =
  profile_<user_id>) — this is the contract the frontend relies on.
* Frontend: Profile type; getProfile()/updateProfileName() in api.ts; useProfileStore;
  new ProfileEditor component (view/edit name, shows role) as a 4th Dashboard tab.
* Resolved the MedicationManager profile_id TODO: now derives profile_<user_id>
  instead of the 'default' fallback.
* NOTE: profile name is stored plaintext (the model anticipates encryption via
  nameIv/nameAuthTag but no crypto layer is implemented yet — TODO).

Vitest tests:
* Added @testing-library/user-event; setupTests clears localStorage + cleanup
  between tests; new test/mockStore.ts helper (mocks the co-located stores,
  handles both selector and no-selector call patterns).
* 5 test files, 20 tests: SeverityChip (4), useMedicationStore actions incl.
  loadMedications/createMedication/logDose (4), MedicationManager render+dialog
  (5), InteractionsChecker selection+results (4), HealthStats table+dialog (3).

Verified: backend cargo fmt/build/clippy 0 warnings, 19 unit tests pass;
frontend npm build clean, 20 vitest tests pass. Solaria round-trip confirmed:
profile auto-created on register (GET /profiles/me), PUT updates name, dose log
returns the dose body, adherence computes 66.7% for 2-taken/1-skipped.

KNOWN FOLLOW-UP (separate task): the backend Medication list response is deeply
nested + camelCase + stores fields inside medicationData.data; the frontend
Medication type assumes flat top-level snake_case fields. This pre-dates Phase 3c
and affects the whole MedicationManager — needs a backend serialization fix or a
frontend adapter.
This commit is contained in:
goose 2026-06-28 10:26:58 -03:00
parent 71add3fe92
commit b6be945855
24 changed files with 1063 additions and 64 deletions

View file

@ -53,6 +53,9 @@ pub fn build_app(state: AppState) -> Router {
.route("/api/shares/:id", delete(handlers::delete_share)) .route("/api/shares/:id", delete(handlers::delete_share))
// Permission checking // Permission checking
.route("/api/permissions/check", post(handlers::check_permission)) .route("/api/permissions/check", post(handlers::check_permission))
// Profile management (Phase 3c)
.route("/api/profiles/me", get(handlers::get_my_profile))
.route("/api/profiles/me", put(handlers::update_my_profile))
// Session management (Phase 2.6) // Session management (Phase 2.6)
.route("/api/sessions", get(handlers::get_sessions)) .route("/api/sessions", get(handlers::get_sessions))
.route("/api/sessions/:id", delete(handlers::revoke_session)) .route("/api/sessions/:id", delete(handlers::revoke_session))

View file

@ -338,15 +338,4 @@ impl MongoDb {
.map_err(|e| anyhow::anyhow!("Failed to log dose: {}", e))?; .map_err(|e| anyhow::anyhow!("Failed to log dose: {}", e))?;
Ok(result.inserted_id.as_object_id()) Ok(result.inserted_id.as_object_id())
} }
pub async fn get_medication_adherence(
&self,
medication_id: &str,
days: i64,
) -> Result<crate::models::medication::AdherenceStats> {
let repo = MedicationRepository::new(self.medications.clone());
repo.calculate_adherence(medication_id, days)
.await
.map_err(|e| anyhow::anyhow!("Failed to calculate adherence: {}", e))
}
} }

View file

@ -108,6 +108,20 @@ pub async fn register(
) )
.await; .await;
} }
// Auto-create a default profile for the new user. The profile_id is
// deterministic (profile_<user_id>) and is the contract the frontend
// uses for medication creation. Best-effort: registration still
// succeeds if this fails (GET /profiles/me lazily creates one).
let database = state.db.get_database();
let profile_repo =
crate::models::profile::ProfileRepository::new(database.collection("profiles"));
let profile =
crate::handlers::profile::build_default_profile(&id.to_string(), &req.username);
if let Err(e) = profile_repo.create(&profile).await {
tracing::warn!("Failed to auto-create profile for {}: {}", id, e);
}
id id
} }
Ok(None) => { Ok(None) => {

View file

@ -9,7 +9,7 @@ use crate::{
auth::jwt::Claims, // Fixed: import from auth::jwt instead of handlers::auth auth::jwt::Claims, // Fixed: import from auth::jwt instead of handlers::auth
config::AppState, config::AppState,
models::medication::{ models::medication::{
CreateMedicationRequest, LogDoseRequest, Medication, MedicationRepository, CreateMedicationRequest, LogDoseRequest, Medication, MedicationDose, MedicationRepository,
UpdateMedicationRequest, UpdateMedicationRequest,
}, },
}; };
@ -158,12 +158,12 @@ pub async fn log_dose(
Extension(claims): Extension<Claims>, Extension(claims): Extension<Claims>,
Path(id): Path<String>, Path(id): Path<String>,
Json(req): Json<LogDoseRequest>, Json(req): Json<LogDoseRequest>,
) -> Result<StatusCode, StatusCode> { ) -> Result<(StatusCode, Json<MedicationDose>), StatusCode> {
let database = state.db.get_database(); let database = state.db.get_database();
let now = SystemTime::now(); let now = SystemTime::now();
let dose = crate::models::medication::MedicationDose { let mut dose = crate::models::medication::MedicationDose {
id: None, id: None,
medication_id: id.clone(), medication_id: id.clone(),
user_id: claims.sub.clone(), user_id: claims.sub.clone(),
@ -173,14 +173,16 @@ pub async fn log_dose(
notes: req.notes, notes: req.notes,
}; };
match database let result = database
.collection("medication_doses") .collection::<crate::models::medication::MedicationDose>("medication_doses")
.insert_one(dose.clone(), None) .insert_one(&dose, None)
.await .await
{ .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
Ok(_) => Ok(StatusCode::CREATED),
Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR), // Populate the generated _id so the caller gets the persisted dose back.
} dose.id = result.inserted_id.as_object_id();
Ok((StatusCode::CREATED, Json(dose)))
} }
pub async fn get_adherence( pub async fn get_adherence(
@ -188,11 +190,50 @@ pub async fn get_adherence(
Extension(_claims): Extension<Claims>, Extension(_claims): Extension<Claims>,
Path(id): Path<String>, Path(id): Path<String>,
) -> Result<Json<crate::models::medication::AdherenceStats>, StatusCode> { ) -> Result<Json<crate::models::medication::AdherenceStats>, StatusCode> {
let database = state.db.get_database(); use mongodb::bson::{doc, DateTime};
let repo = MedicationRepository::new(database.collection("medications"));
match repo.calculate_adherence(&id, 30).await { const PERIOD_DAYS: i64 = 30;
Ok(stats) => Ok(Json(stats)),
Err(_) => Err(StatusCode::INTERNAL_SERVER_ERROR), let database = state.db.get_database();
} let doses: mongodb::Collection<MedicationDose> = database.collection("medication_doses");
// Look at doses logged in the last PERIOD_DAYS days for this medication.
let since = DateTime::from_system_time(
SystemTime::now() - std::time::Duration::from_secs(PERIOD_DAYS as u64 * 86400),
);
let filter = doc! {
"medicationId": &id,
"loggedAt": { "$gte": since }
};
let total = doses
.count_documents(filter.clone(), None)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
let taken_filter = doc! { "$and": [filter, doc! { "taken": true }] };
let taken = doses
.count_documents(taken_filter, None)
.await
.map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
// Without a dose-schedule model, every logged dose counts as one scheduled
// dose that was resolved (taken or intentionally skipped). Adherence is the
// share that were marked taken. Real scheduling is future work.
let missed = total.saturating_sub(taken);
let rate = if total == 0 {
0.0
} else {
(taken as f64 / total as f64) * 100.0
};
Ok(Json(crate::models::medication::AdherenceStats {
medication_id: id,
total_doses: total as i64,
scheduled_doses: total as i64,
taken_doses: taken as i64,
missed_doses: missed as i64,
adherence_rate: rate,
period_days: PERIOD_DAYS,
}))
} }

View file

@ -4,6 +4,7 @@ pub mod health_stats;
pub mod interactions; pub mod interactions;
pub mod medications; pub mod medications;
pub mod permissions; pub mod permissions;
pub mod profile;
pub mod sessions; pub mod sessions;
pub mod shares; pub mod shares;
pub mod users; pub mod users;
@ -21,6 +22,7 @@ pub use medications::{
log_dose, update_medication, log_dose, update_medication,
}; };
pub use permissions::check_permission; pub use permissions::check_permission;
pub use profile::{get_my_profile, update_my_profile};
pub use sessions::{get_sessions, revoke_all_sessions, revoke_session}; pub use sessions::{get_sessions, revoke_all_sessions, revoke_session};
pub use shares::{create_share, delete_share, list_shares, update_share}; pub use shares::{create_share, delete_share, list_shares, update_share};
pub use users::{ pub use users::{

View file

@ -0,0 +1,137 @@
use axum::{
extract::{Extension, State},
http::StatusCode,
Json,
};
use mongodb::bson::DateTime;
use serde::{Deserialize, Serialize};
use validator::Validate;
use crate::{
auth::jwt::Claims,
config::AppState,
models::profile::{Profile, ProfileRepository},
};
/// The profile as exposed to clients (omits the internal encryption fields).
#[derive(Debug, Serialize)]
pub struct ProfileResponse {
pub profile_id: String,
pub user_id: String,
pub name: String,
pub role: String,
pub permissions: Vec<String>,
pub created_at: DateTime,
pub updated_at: DateTime,
}
impl From<Profile> for ProfileResponse {
fn from(p: Profile) -> Self {
Self {
profile_id: p.profile_id,
user_id: p.user_id,
name: p.name,
role: p.role,
permissions: p.permissions,
created_at: p.created_at,
updated_at: p.updated_at,
}
}
}
/// Create the default "patient" profile for a freshly registered user. Called
/// from `register`. The profile_id is deterministic: `profile_<user_id>` — this
/// is the contract the frontend relies on for medication creation.
pub fn build_default_profile(user_id: &str, name: &str) -> Profile {
let now = DateTime::now();
Profile {
id: None,
profile_id: format!("profile_{user_id}"),
user_id: user_id.to_string(),
family_id: None,
// TODO: encrypt the name (the model anticipates nameIv/nameAuthTag, but
// no crypto layer is implemented yet).
name: name.to_string(),
name_iv: String::new(),
name_auth_tag: String::new(),
role: "patient".to_string(),
permissions: vec!["read:self".to_string(), "write:self".to_string()],
created_at: now,
updated_at: now,
}
}
#[derive(Debug, Deserialize, Validate)]
pub struct UpdateProfileNameRequest {
#[validate(length(min = 1, max = 100))]
pub name: String,
}
/// GET /api/profiles/me — the current user's profile. If for some reason the
/// auto-created profile is missing, lazily create it.
pub async fn get_my_profile(
State(state): State<AppState>,
Extension(claims): Extension<Claims>,
) -> Result<Json<ProfileResponse>, (StatusCode, Json<serde_json::Value>)> {
let database = state.db.get_database();
let repo = ProfileRepository::new(database.collection("profiles"));
let profile = match repo.find_by_user_id(&claims.sub).await {
Ok(Some(p)) => p,
Ok(None) => {
// Lazily create if missing (e.g. users registered before this code shipped).
let p = build_default_profile(&claims.sub, &claims.sub);
if let Err(e) = repo.create(&p).await {
tracing::error!("Failed to lazily create profile: {}", e);
return Err((
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({ "error": "failed to load profile" })),
));
}
p
}
Err(e) => {
tracing::error!("Profile lookup failed: {}", e);
return Err((
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({ "error": "database error" })),
));
}
};
Ok(Json(ProfileResponse::from(profile)))
}
/// PUT /api/profiles/me — update the profile's display name.
pub async fn update_my_profile(
State(state): State<AppState>,
Extension(claims): Extension<Claims>,
Json(req): Json<UpdateProfileNameRequest>,
) -> Result<Json<ProfileResponse>, (StatusCode, Json<serde_json::Value>)> {
if let Err(errors) = req.validate() {
return Err((
StatusCode::BAD_REQUEST,
Json(
serde_json::json!({ "error": "validation failed", "details": errors.to_string() }),
),
));
}
let database = state.db.get_database();
let repo = ProfileRepository::new(database.collection("profiles"));
match repo.update_name(&claims.sub, &req.name).await {
Ok(Some(updated)) => Ok(Json(ProfileResponse::from(updated))),
Ok(None) => Err((
StatusCode::NOT_FOUND,
Json(serde_json::json!({ "error": "profile not found" })),
)),
Err(e) => {
tracing::error!("Profile update failed: {}", e);
Err((
StatusCode::INTERNAL_SERVER_ERROR,
Json(serde_json::json!({ "error": "database error" })),
))
}
}
}

View file

@ -335,21 +335,7 @@ impl MedicationRepository {
Ok(result.deleted_count > 0) Ok(result.deleted_count > 0)
} }
pub async fn calculate_adherence( // NOTE: adherence is computed in handlers::medications::get_adherence by
&self, // querying the medication_doses collection directly (it needs a different
medication_id: &str, // collection than the medications this repository wraps).
days: i64,
) -> Result<AdherenceStats, Box<dyn std::error::Error>> {
// For now, return a placeholder adherence calculation
// In a full implementation, this would query the medication_doses collection
Ok(AdherenceStats {
medication_id: medication_id.to_string(),
total_doses: 0,
scheduled_doses: 0,
taken_doses: 0,
missed_doses: 0,
adherence_rate: 100.0,
period_days: days,
})
}
} }

View file

@ -52,4 +52,33 @@ impl ProfileRepository {
.find_one(doc! { "profileId": profile_id }, None) .find_one(doc! { "profileId": profile_id }, None)
.await .await
} }
/// Look up a profile by its owning user id.
pub async fn find_by_user_id(&self, user_id: &str) -> mongodb::error::Result<Option<Profile>> {
self.collection
.find_one(doc! { "userId": user_id }, None)
.await
}
/// Update the profile's display name. NOTE: name is currently stored
/// plaintext — the model's nameIv/nameAuthTag fields anticipate encryption
/// that isn't implemented yet (TODO).
pub async fn update_name(
&self,
user_id: &str,
name: &str,
) -> mongodb::error::Result<Option<Profile>> {
self.collection
.find_one_and_update(
doc! { "userId": user_id },
doc! { "$set": {
"name": name,
"nameIv": "",
"nameAuthTag": "",
"updatedAt": DateTime::now()
}},
None,
)
.await
}
} }

View file

@ -24,6 +24,7 @@
"devDependencies": { "devDependencies": {
"@testing-library/jest-dom": "^6.9.1", "@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2", "@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/node": "^22.10.0", "@types/node": "^22.10.0",
"@types/react": "^19.2.14", "@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",
@ -2012,6 +2013,20 @@
} }
} }
}, },
"node_modules/@testing-library/user-event": {
"version": "14.6.1",
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-14.6.1.tgz",
"integrity": "sha512-vq7fv0rnt+QTXgPxr5Hjc210p6YKq2kmdziLgnsZGgLJ9e6VAShx1pACLuRjd/AS/sr7phAR58OIIpf0LlmQNw==",
"dev": true,
"license": "MIT",
"engines": {
"node": ">=12",
"npm": ">=6"
},
"peerDependencies": {
"@testing-library/dom": ">=7.21.4"
}
},
"node_modules/@types/aria-query": { "node_modules/@types/aria-query": {
"version": "5.0.4", "version": "5.0.4",
"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",

View file

@ -27,6 +27,7 @@
"devDependencies": { "devDependencies": {
"@testing-library/jest-dom": "^6.9.1", "@testing-library/jest-dom": "^6.9.1",
"@testing-library/react": "^16.3.2", "@testing-library/react": "^16.3.2",
"@testing-library/user-event": "^14.6.1",
"@types/node": "^22.10.0", "@types/node": "^22.10.0",
"@types/react": "^19.2.14", "@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3", "@types/react-dom": "^19.2.3",

View file

@ -0,0 +1,26 @@
import { describe, it, expect } from 'vitest';
import { render, screen } from '@testing-library/react';
import { SeverityChip } from './SeverityChip';
import { InteractionSeverity } from '../../types/api';
describe('SeverityChip', () => {
it('renders the severe label', () => {
render(<SeverityChip severity={InteractionSeverity.Severe} />);
expect(screen.getByText('Severe')).toBeInTheDocument();
});
it('renders moderate', () => {
render(<SeverityChip severity={InteractionSeverity.Moderate} />);
expect(screen.getByText('Moderate')).toBeInTheDocument();
});
it('renders mild', () => {
render(<SeverityChip severity={InteractionSeverity.Mild} />);
expect(screen.getByText('Mild')).toBeInTheDocument();
});
it('renders unknown for the unknown severity', () => {
render(<SeverityChip severity={InteractionSeverity.Unknown} />);
expect(screen.getByText('Unknown')).toBeInTheDocument();
});
});

View file

@ -0,0 +1,59 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { mockStoreFactory, setMockStore, resetMockStore } from '../../test/mockStore';
vi.mock('../../store/useStore', () => mockStoreFactory());
const { HealthStats } = await import('./HealthStats');
const healthActions = {
loadStats: vi.fn(),
createStat: vi.fn(),
updateStat: vi.fn(),
deleteStat: vi.fn(),
loadTrends: vi.fn(),
clearError: vi.fn(),
isLoading: false,
error: null,
stats: [],
trends: [],
};
describe('HealthStats', () => {
beforeEach(() => resetMockStore());
it('shows the empty state when there are no readings', () => {
setMockStore({ useHealthStore: { ...healthActions } });
render(<HealthStats />);
expect(screen.getByText(/No health readings yet/i)).toBeInTheDocument();
});
it('renders the readings table when stats exist', () => {
setMockStore({
useHealthStore: {
...healthActions,
stats: [
{
stat_id: 's1',
stat_type: 'weight',
value: 78.5,
unit: 'kg',
measured_at: '2026-06-01T10:00:00.000Z',
},
],
},
});
render(<HealthStats />);
// "weight" appears in both the chart selector and the table; the value
// string is unique to the table cell.
expect(screen.getByText('78.5 kg')).toBeInTheDocument();
expect(screen.getByText('Jun 1, 07:00')).toBeInTheDocument();
});
it('opens the record dialog when Record is clicked', () => {
setMockStore({ useHealthStore: { ...healthActions } });
render(<HealthStats />);
fireEvent.click(screen.getByText('Record'));
expect(screen.getByText('Record a measurement')).toBeInTheDocument();
});
});

View file

@ -0,0 +1,113 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { mockStoreFactory, setMockStore, resetMockStore } from '../../test/mockStore';
vi.mock('../../store/useStore', () => mockStoreFactory());
const { InteractionsChecker } = await import('./InteractionsChecker');
const interactionActions = {
checkInteractions: vi.fn(),
checkNewMedication: vi.fn(),
clearInteractions: vi.fn(),
clearError: vi.fn(),
isChecking: false,
error: null,
interactions: [],
};
const medActions = {
loadMedications: vi.fn(),
createMedication: vi.fn(),
updateMedication: vi.fn(),
deleteMedication: vi.fn(),
selectMedication: vi.fn(),
clearError: vi.fn(),
loadAdherence: vi.fn(),
logDose: vi.fn(),
isLoading: false,
error: null,
adherence: {},
selectedMedication: null,
};
describe('InteractionsChecker', () => {
beforeEach(() => resetMockStore());
it('prompts to add medications when none exist', () => {
setMockStore({
useMedicationStore: { ...medActions, medications: [] },
useInteractionStore: { ...interactionActions },
});
render(<InteractionsChecker />);
expect(screen.getByText(/Add medications first/i)).toBeInTheDocument();
});
it('renders a chip per medication', () => {
setMockStore({
useMedicationStore: {
...medActions,
medications: [
{ medication_id: 'm1', name: 'Warfarin' },
{ medication_id: 'm2', name: 'Aspirin' },
],
},
useInteractionStore: { ...interactionActions },
});
render(<InteractionsChecker />);
expect(screen.getByText('Warfarin')).toBeInTheDocument();
expect(screen.getByText('Aspirin')).toBeInTheDocument();
});
it('disables the check button until two medications are selected', () => {
setMockStore({
useMedicationStore: {
...medActions,
medications: [
{ medication_id: 'm1', name: 'Warfarin' },
{ medication_id: 'm2', name: 'Aspirin' },
],
},
useInteractionStore: { ...interactionActions },
});
render(<InteractionsChecker />);
const button = screen.getByText('Check interactions');
expect(button).toBeDisabled();
fireEvent.click(screen.getByText('Warfarin'));
expect(button).toBeDisabled();
fireEvent.click(screen.getByText('Aspirin'));
expect(button).not.toBeDisabled();
});
it('renders interaction results when present', () => {
setMockStore({
useMedicationStore: {
...medActions,
medications: [
{ medication_id: 'm1', name: 'Warfarin' },
{ medication_id: 'm2', name: 'Aspirin' },
],
},
useInteractionStore: {
...interactionActions,
interactions: [
{
medications: ['warfarin', 'aspirin'],
severity: 'severe',
description: 'Increased bleeding risk.',
disclaimer: 'For informational purposes only.',
},
],
},
});
render(<InteractionsChecker />);
// Pre-select two meds so the results section renders.
fireEvent.click(screen.getByText('Warfarin'));
fireEvent.click(screen.getByText('Aspirin'));
expect(screen.getByText('Increased bleeding risk.')).toBeInTheDocument();
expect(screen.getByText('Severe')).toBeInTheDocument();
});
});

View file

@ -0,0 +1,84 @@
import { useEffect, useState, type FC } from 'react';
import { Box, Button, LinearProgress, Stack, Typography } from '@mui/material';
import CheckIcon from '@mui/icons-material/Check';
import CloseIcon from '@mui/icons-material/Close';
import { useMedicationStore } from '../../store/useStore';
interface Props {
medicationId: string;
}
/**
* Per-medication dose logging + adherence display. Renders inside each
* MedicationManager card. Loads adherence on mount and refreshes after a dose
* is logged.
*/
export const DoseLogger: FC<Props> = ({ medicationId }) => {
const { adherence, loadAdherence, logDose } = useMedicationStore();
const [busy, setBusy] = useState(false);
useEffect(() => {
loadAdherence(medicationId);
}, [medicationId, loadAdherence]);
const stats = adherence[medicationId];
const rate = stats ? Math.round(stats.adherence_rate) : 0;
const handleLog = async (taken: boolean) => {
setBusy(true);
try {
await logDose(medicationId, taken);
} catch {
/* store surfaces error in the MedicationManager banner */
} finally {
setBusy(false);
}
};
return (
<Box sx={{ mt: 1.5 }}>
<Stack direction="row" spacing={1} sx={{ mb: 1 }}>
<Button
size="small"
variant="outlined"
color="success"
startIcon={<CheckIcon />}
disabled={busy}
onClick={() => handleLog(true)}
>
Taken
</Button>
<Button
size="small"
variant="outlined"
color="inherit"
startIcon={<CloseIcon />}
disabled={busy}
onClick={() => handleLog(false)}
>
Skipped
</Button>
</Stack>
{stats && (
<Box>
<Stack direction="row" justifyContent="space-between" sx={{ mb: 0.5 }}>
<Typography variant="caption" color="text.secondary">
Adherence (last {stats.period_days}d)
</Typography>
<Typography variant="caption" fontWeight={600}>
{rate}% · {stats.taken_doses}/{stats.total_doses} taken
</Typography>
</Stack>
<LinearProgress
variant="determinate"
value={rate}
color={rate >= 80 ? 'success' : rate >= 50 ? 'warning' : 'error'}
/>
</Box>
)}
</Box>
);
};
export default DoseLogger;

View file

@ -0,0 +1,83 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
import { render, screen, fireEvent } from '@testing-library/react';
import { mockStoreFactory, setMockStore, resetMockStore } from '../../test/mockStore';
vi.mock('../../store/useStore', () => mockStoreFactory());
// Import AFTER the mock is registered so the component picks up the mock.
const { MedicationManager } = await import('./MedicationManager');
const { useAuthStore } = await import('../../store/useStore');
const med = (overrides: Partial<Record<string, unknown>> = {}) => ({
medication_id: 'm1',
name: 'Ibuprofen',
dosage: '200mg',
frequency: 'daily',
active: true,
instructions: undefined,
...overrides,
});
const baseActions = {
loadMedications: vi.fn(),
createMedication: vi.fn(),
updateMedication: vi.fn(),
deleteMedication: vi.fn(),
selectMedication: vi.fn(),
clearError: vi.fn(),
loadAdherence: vi.fn(),
logDose: vi.fn(),
isLoading: false,
error: null,
adherence: {},
selectedMedication: null,
};
describe('MedicationManager', () => {
beforeEach(() => {
resetMockStore();
setMockStore({
useAuthStore: { user: { user_id: 'u1', username: 'tester' }, profile: {} },
});
baseActions.loadMedications.mockClear();
});
it('renders the medications from the store', () => {
setMockStore({
useMedicationStore: {
...baseActions,
medications: [med({ name: 'Aspirin' }), med({ medication_id: 'm2', name: 'Warfarin' })],
},
});
render(<MedicationManager />);
expect(screen.getByText('Aspirin')).toBeInTheDocument();
expect(screen.getByText('Warfarin')).toBeInTheDocument();
});
it('shows the empty state when there are no medications', () => {
setMockStore({ useMedicationStore: { ...baseActions, medications: [] } });
render(<MedicationManager />);
expect(screen.getByText(/No medications yet/i)).toBeInTheDocument();
});
it('loads medications on mount', () => {
setMockStore({ useMedicationStore: { ...baseActions, medications: [] } });
render(<MedicationManager />);
expect(baseActions.loadMedications).toHaveBeenCalled();
});
it('opens the create dialog when Add is clicked', () => {
setMockStore({ useMedicationStore: { ...baseActions, medications: [] } });
render(<MedicationManager />);
fireEvent.click(screen.getByText('Add'));
expect(screen.getByText('Add medication')).toBeInTheDocument();
});
it('renders an error banner when the store has an error', () => {
setMockStore({
useMedicationStore: { ...baseActions, medications: [], error: 'Something broke' },
});
render(<MedicationManager />);
expect(screen.getByText('Something broke')).toBeInTheDocument();
});
});

View file

@ -30,6 +30,7 @@ import type {
CreateMedicationRequest, CreateMedicationRequest,
UpdateMedicationRequest, UpdateMedicationRequest,
} from '../../types/api'; } from '../../types/api';
import { DoseLogger } from './DoseLogger';
const ROUTES = ['oral', 'topical', 'injection', 'inhalation', 'other'] as const; const ROUTES = ['oral', 'topical', 'injection', 'inhalation', 'other'] as const;
@ -66,11 +67,12 @@ export const MedicationManager: FC = () => {
}, [loadMedications]); }, [loadMedications]);
const openCreate = () => { const openCreate = () => {
// TODO: real profile management — for now, source profile_id from the user, // profile_id is deterministic: profile_<user_id>. The backend auto-creates
// falling back to 'default' (the backend accepts any string). // this profile on register, so the id always resolves to a real profile.
const profileId = user?.profile_id ?? `profile_${user?.user_id ?? 'default'}`;
setCreateForm({ setCreateForm({
...emptyCreate, ...emptyCreate,
profile_id: user?.profile_id ?? 'default', profile_id: profileId,
}); });
setCreateOpen(true); setCreateOpen(true);
}; };
@ -178,6 +180,7 @@ export const MedicationManager: FC = () => {
{med.instructions} {med.instructions}
</Typography> </Typography>
)} )}
{med.medication_id && <DoseLogger medicationId={med.medication_id} />}
</Box> </Box>
</Stack> </Stack>
</CardContent> </CardContent>

View file

@ -0,0 +1,128 @@
import { useEffect, useState, type FC } from 'react';
import {
Box,
Button,
Card,
CardContent,
CircularProgress,
Alert,
Chip,
Stack,
TextField,
Typography,
} from '@mui/material';
import SaveIcon from '@mui/icons-material/Save';
import { useProfileStore, useAuthStore } from '../../store/useStore';
export const ProfileEditor: FC = () => {
const { profile, isLoading, error, loadProfile, updateName, clearError } =
useProfileStore();
const user = useAuthStore((s) => s.user);
const [name, setName] = useState('');
const [editing, setEditing] = useState(false);
const [saving, setSaving] = useState(false);
useEffect(() => {
loadProfile();
}, [loadProfile]);
useEffect(() => {
if (profile?.name) setName(profile.name);
}, [profile]);
const handleSave = async () => {
setSaving(true);
try {
await updateName(name);
setEditing(false);
} catch {
/* error surfaced via store */
} finally {
setSaving(false);
}
};
return (
<Box>
<Typography variant="h6" sx={{ mb: 2 }}>
Profile
</Typography>
{error && (
<Alert severity="error" sx={{ mb: 2 }} onClose={clearError}>
{error}
</Alert>
)}
{isLoading && !profile ? (
<Box display="flex" justifyContent="center" py={4}>
<CircularProgress />
</Box>
) : (
<Card>
<CardContent>
<Stack spacing={2}>
<Box>
<Typography variant="caption" color="text.secondary">
Display name
</Typography>
{editing ? (
<Stack direction="row" spacing={1} sx={{ mt: 0.5 }}>
<TextField
size="small"
fullWidth
value={name}
onChange={(e) => setName(e.target.value)}
autoFocus
/>
<Button
variant="contained"
startIcon={<SaveIcon />}
onClick={handleSave}
disabled={saving || !name.trim()}
>
{saving ? <CircularProgress size={24} /> : 'Save'}
</Button>
<Button onClick={() => { setEditing(false); setName(profile?.name ?? ''); }}>
Cancel
</Button>
</Stack>
) : (
<Stack direction="row" alignItems="center" spacing={1}>
<Typography variant="h6">{profile?.name ?? user?.username ?? '—'}</Typography>
<Button size="small" onClick={() => setEditing(true)}>Edit</Button>
</Stack>
)}
</Box>
<Box>
<Typography variant="caption" color="text.secondary">
Account
</Typography>
<Typography variant="body2">{user?.email}</Typography>
</Box>
<Box>
<Typography variant="caption" color="text.secondary">
Role
</Typography>
<Box sx={{ mt: 0.5 }}>
<Chip size="small" label={profile?.role ?? 'patient'} variant="outlined" />
</Box>
</Box>
{profile?.profile_id && (
<Typography variant="caption" color="text.secondary">
Profile ID: {profile.profile_id}
</Typography>
)}
</Stack>
</CardContent>
</Card>
)}
</Box>
);
};
export default ProfileEditor;

View file

@ -5,8 +5,9 @@ import { useAuthStore } from '../store/useStore';
import { MedicationManager } from '../components/medication/MedicationManager'; import { MedicationManager } from '../components/medication/MedicationManager';
import { HealthStats } from '../components/health/HealthStats'; import { HealthStats } from '../components/health/HealthStats';
import { InteractionsChecker } from '../components/interactions/InteractionsChecker'; import { InteractionsChecker } from '../components/interactions/InteractionsChecker';
import { ProfileEditor } from '../components/profile/ProfileEditor';
type TabIndex = 0 | 1 | 2; type TabIndex = 0 | 1 | 2 | 3;
export const Dashboard: FC = () => { export const Dashboard: FC = () => {
const navigate = useNavigate(); const navigate = useNavigate();
@ -14,7 +15,7 @@ export const Dashboard: FC = () => {
const [tab, setTab] = useState<TabIndex>(0); const [tab, setTab] = useState<TabIndex>(0);
// On mount, refresh the user record from the backend (confirms the token is // On mount, refresh the user record from the backend (confirms the token is
// still valid, and medication-create needs user.profile_id). // still valid, and medication-create derives profile_id from user_id).
useEffect(() => { useEffect(() => {
if (isAuthenticated && !user) { if (isAuthenticated && !user) {
loadUser(); loadUser();
@ -49,12 +50,14 @@ export const Dashboard: FC = () => {
<Tab label="Medications" /> <Tab label="Medications" />
<Tab label="Health" /> <Tab label="Health" />
<Tab label="Interactions" /> <Tab label="Interactions" />
<Tab label="Profile" />
</Tabs> </Tabs>
<Box> <Box>
{tab === 0 && <MedicationManager />} {tab === 0 && <MedicationManager />}
{tab === 1 && <HealthStats />} {tab === 1 && <HealthStats />}
{tab === 2 && <InteractionsChecker />} {tab === 2 && <InteractionsChecker />}
{tab === 3 && <ProfileEditor />}
</Box> </Box>
</Container> </Container>
</> </>

View file

@ -14,6 +14,10 @@ import {
CreateHealthStatRequest, CreateHealthStatRequest,
TrendData, TrendData,
ApiError, ApiError,
DoseLog,
LogDoseRequest,
AdherenceStats,
Profile,
} from '../types/api'; } from '../types/api';
// API base URL. In dev this is "/api", proxied by the Vite dev server to the // API base URL. In dev this is "/api", proxied by the Vite dev server to the
@ -206,6 +210,18 @@ class ApiService {
return response.data; return response.data;
} }
// ---- Profile (Phase 3c) ----
async getProfile(): Promise<Profile> {
const response = await this.client.get<Profile>('/profiles/me');
return response.data;
}
async updateProfileName(name: string): Promise<Profile> {
const response = await this.client.put<Profile>('/profiles/me', { name });
return response.data;
}
// ---- Medications ---- // ---- Medications ----
async getMedications(): Promise<Medication[]> { async getMedications(): Promise<Medication[]> {
@ -234,6 +250,18 @@ class ApiService {
await this.client.post(`/medications/${id}/delete`); await this.client.post(`/medications/${id}/delete`);
} }
// ---- Dose logging + adherence (Phase 3c) ----
async logDose(medicationId: string, req: LogDoseRequest): Promise<DoseLog> {
const response = await this.client.post<DoseLog>(`/medications/${medicationId}/log`, req);
return response.data;
}
async getAdherence(medicationId: string): Promise<AdherenceStats> {
const response = await this.client.get<AdherenceStats>(`/medications/${medicationId}/adherence`);
return response.data;
}
// ---- Drug Interactions (Phase 2.8) ---- // ---- Drug Interactions (Phase 2.8) ----
async checkInteractions(medications: string[]): Promise<DrugInteraction[]> { async checkInteractions(medications: string[]): Promise<DrugInteraction[]> {

View file

@ -1,5 +1,16 @@
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom'; import '@testing-library/jest-dom';
import { afterEach, beforeEach } from 'vitest';
import { cleanup } from '@testing-library/react';
// Unmount anything rendered between tests (RTL auto-runs this in watch mode but
// we set it explicitly so single-run `vitest run` stays isolated).
afterEach(() => {
cleanup();
});
// The auth store is persisted under localStorage key 'normogen-auth', and the
// api client reads 'token'/'refresh_token' from localStorage. Clear between
// tests so state never bleeds across cases.
beforeEach(() => {
localStorage.clear();
});

View file

@ -0,0 +1,82 @@
import { describe, it, expect, beforeEach, vi } from 'vitest';
// Mock the api client so the store's real reducer logic is exercised without HTTP.
const apiMock = {
getMedications: vi.fn(),
createMedication: vi.fn(),
logDose: vi.fn(),
getAdherence: vi.fn(),
};
vi.mock('../services/api', () => ({ default: apiMock }));
// Import the store AFTER the mock is registered.
const { useMedicationStore } = await import('./useStore');
describe('useMedicationStore', () => {
beforeEach(() => {
useMedicationStore.setState({
medications: [],
isLoading: false,
error: null,
adherence: {},
});
apiMock.getMedications.mockReset();
apiMock.createMedication.mockReset();
});
it('loadMedications populates state from the api client', async () => {
const meds = [{ medication_id: 'm1', name: 'Aspirin', dosage: '100mg' }];
apiMock.getMedications.mockResolvedValue(meds);
await useMedicationStore.getState().loadMedications();
expect(apiMock.getMedications).toHaveBeenCalledOnce();
expect(useMedicationStore.getState().medications).toEqual(meds);
expect(useMedicationStore.getState().isLoading).toBe(false);
});
it('loadMedications sets an error message on failure (and does not throw)', async () => {
apiMock.getMedications.mockRejectedValue(new Error('boom'));
// Should NOT throw — load actions swallow.
await useMedicationStore.getState().loadMedications();
expect(useMedicationStore.getState().error).toBe('boom');
expect(useMedicationStore.getState().isLoading).toBe(false);
});
it('createMedication appends the new medication and re-throws on error', async () => {
apiMock.createMedication.mockResolvedValue({ medication_id: 'm2', name: 'New' });
await useMedicationStore.getState().createMedication({ name: 'New' });
expect(useMedicationStore.getState().medications).toEqual([
{ medication_id: 'm2', name: 'New' },
]);
// Now an error path: createMedication rejects -> store re-throws.
apiMock.createMedication.mockRejectedValue(new Error('nope'));
await expect(
useMedicationStore.getState().createMedication({ name: 'Bad' }),
).rejects.toThrow('nope');
});
it('logDose logs the dose then refreshes adherence', async () => {
apiMock.logDose.mockResolvedValue({});
apiMock.getAdherence.mockResolvedValue({
medication_id: 'm1',
total_doses: 1,
scheduled_doses: 1,
taken_doses: 1,
missed_doses: 0,
adherence_rate: 100,
period_days: 30,
});
await useMedicationStore.getState().logDose('m1', true);
expect(apiMock.logDose).toHaveBeenCalledWith('m1', { taken: true, notes: undefined });
expect(apiMock.getAdherence).toHaveBeenCalledWith('m1');
expect(useMedicationStore.getState().adherence['m1'].adherence_rate).toBe(100);
});
});

View file

@ -1,6 +1,13 @@
import { create } from 'zustand'; import { create } from 'zustand';
import { devtools, persist } from 'zustand/middleware'; import { devtools, persist } from 'zustand/middleware';
import { User, Medication, HealthStat, DrugInteraction } from '../types/api'; import {
User,
Medication,
HealthStat,
DrugInteraction,
AdherenceStats,
Profile,
} from '../types/api';
import apiService from '../services/api'; import apiService from '../services/api';
interface AuthState { interface AuthState {
@ -23,7 +30,9 @@ interface MedicationState {
selectedMedication: Medication | null; selectedMedication: Medication | null;
isLoading: boolean; isLoading: boolean;
error: string | null; error: string | null;
// Adherence cache: medicationId -> stats. Loaded on demand per medication.
adherence: Record<string, AdherenceStats>;
// Actions // Actions
loadMedications: () => Promise<void>; loadMedications: () => Promise<void>;
createMedication: (data: any) => Promise<void>; createMedication: (data: any) => Promise<void>;
@ -31,6 +40,8 @@ interface MedicationState {
deleteMedication: (id: string) => Promise<void>; deleteMedication: (id: string) => Promise<void>;
selectMedication: (medication: Medication | null) => void; selectMedication: (medication: Medication | null) => void;
clearError: () => void; clearError: () => void;
loadAdherence: (medicationId: string) => Promise<void>;
logDose: (medicationId: string, taken: boolean, notes?: string) => Promise<void>;
} }
interface HealthState { interface HealthState {
@ -52,7 +63,7 @@ interface InteractionState {
interactions: DrugInteraction[]; interactions: DrugInteraction[];
isChecking: boolean; isChecking: boolean;
error: string | null; error: string | null;
// Actions // Actions
checkInteractions: (medications: string[]) => Promise<void>; checkInteractions: (medications: string[]) => Promise<void>;
checkNewMedication: (name: string, dosage: string) => Promise<void>; checkNewMedication: (name: string, dosage: string) => Promise<void>;
@ -60,6 +71,15 @@ interface InteractionState {
clearError: () => void; clearError: () => void;
} }
interface ProfileState {
profile: Profile | null;
isLoading: boolean;
error: string | null;
loadProfile: () => Promise<void>;
updateName: (name: string) => Promise<void>;
clearError: () => void;
}
// Auth Store // Auth Store
export const useAuthStore = create<AuthState>()( export const useAuthStore = create<AuthState>()(
devtools( devtools(
@ -178,6 +198,7 @@ export const useMedicationStore = create<MedicationState>()(
selectedMedication: null, selectedMedication: null,
isLoading: false, isLoading: false,
error: null, error: null,
adherence: {},
loadMedications: async () => { loadMedications: async () => {
set({ isLoading: true, error: null }); set({ isLoading: true, error: null });
@ -252,10 +273,34 @@ export const useMedicationStore = create<MedicationState>()(
}, },
clearError: () => set({ error: null }), clearError: () => set({ error: null }),
loadAdherence: async (medicationId) => {
try {
const stats = await apiService.getAdherence(medicationId);
set((state) => ({
adherence: { ...state.adherence, [medicationId]: stats },
}));
} catch (error: any) {
// Adherence is non-critical; surface nothing disruptive.
set({ error: error.message || 'Failed to load adherence' });
}
},
logDose: async (medicationId, taken, notes) => {
try {
await apiService.logDose(medicationId, { taken, notes });
// Refresh adherence for this med so the % reflects the new dose.
const stats = await apiService.getAdherence(medicationId);
set((state) => ({
adherence: { ...state.adherence, [medicationId]: stats },
}));
} catch (error: any) {
set({ error: error.message || 'Failed to log dose' });
throw error;
}
},
})) }))
); );
// Health Store
export const useHealthStore = create<HealthState>()( export const useHealthStore = create<HealthState>()(
devtools((set, get) => ({ devtools((set, get) => ({
stats: [], stats: [],
@ -383,3 +428,41 @@ export const useInteractionStore = create<InteractionState>()(
clearError: () => set({ error: null }), clearError: () => set({ error: null }),
})) }))
); );
// Profile Store (Phase 3c)
export const useProfileStore = create<ProfileState>()(
devtools((set, get) => ({
profile: null,
isLoading: false,
error: null,
loadProfile: async () => {
set({ isLoading: true, error: null });
try {
const profile = await apiService.getProfile();
set({ profile, isLoading: false });
} catch (error: any) {
set({
error: error.message || 'Failed to load profile',
isLoading: false,
});
}
},
updateName: async (name) => {
set({ isLoading: true, error: null });
try {
const profile = await apiService.updateProfileName(name);
set({ profile, isLoading: false });
} catch (error: any) {
set({
error: error.message || 'Failed to update profile',
isLoading: false,
});
throw error;
}
},
clearError: () => set({ error: null }),
})),
);

View file

@ -0,0 +1,49 @@
import { vi } from 'vitest';
/**
* Test helper for mocking the zustand stores. Because the stores are co-located
* in one module (../store/useStore) and consumed both with and without a
* selector (`useAuthStore(s => s.user)` vs `useMedicationStore()`), the mock
* returns a function that accepts an optional selector.
*
* Usage in a test file:
*
* vi.mock('../store/useStore', () => mockStoreFactory());
* // then per test:
* setMockStore({ useMedicationStore: { medications: [...], ... } });
*
* Each store's actions default to vi.fn() mocks; override them in setMockStore.
*/
export type StoreSlice = Record<string, unknown>;
const state: Record<string, StoreSlice> = {};
function makeHook(name: string) {
const fn = vi.fn((selector?: (s: StoreSlice) => unknown) =>
selector ? selector(state[name] ?? {}) : state[name] ?? {},
);
return fn;
}
export function mockStoreFactory() {
return {
useAuthStore: makeHook('useAuthStore'),
useMedicationStore: makeHook('useMedicationStore'),
useHealthStore: makeHook('useHealthStore'),
useInteractionStore: makeHook('useInteractionStore'),
useProfileStore: makeHook('useProfileStore'),
};
}
/** Set/override the state a store returns for the current test. */
export function setMockStore(next: Record<string, StoreSlice>) {
for (const [name, slice] of Object.entries(next)) {
// Merge so callers can update one field without re-declaring actions.
state[name] = { ...state[name], ...slice };
}
}
/** Reset all mocked store state between tests. */
export function resetMockStore() {
for (const key of Object.keys(state)) delete state[key];
}

View file

@ -235,16 +235,46 @@ export interface LabResult {
created_at?: string; created_at?: string;
} }
// Dose Log Types // Dose Log Types — match backend MedicationDose (camelCase serialization).
export interface DoseLog { export interface DoseLog {
log_id?: string; id?: string;
medication_id: string; medicationId: string;
scheduled_time: string; userId?: string;
taken_time?: string; loggedAt: string;
status: 'scheduled' | 'taken' | 'skipped' | 'missed'; scheduledTime?: string;
taken: boolean;
notes?: string; notes?: string;
} }
// Request body for POST /medications/:id/log.
export interface LogDoseRequest {
taken?: boolean;
scheduled_time?: string;
notes?: string;
}
// Response from GET /medications/:id/adherence.
export interface AdherenceStats {
medication_id: string;
total_doses: number;
scheduled_doses: number;
taken_doses: number;
missed_doses: number;
adherence_rate: number;
period_days: number;
}
// Profile Types — match backend ProfileResponse.
export interface Profile {
profile_id: string;
user_id: string;
name: string;
role: string;
permissions: string[];
created_at: string;
updated_at: string;
}
// Error Types // Error Types
export interface ApiError { export interface ApiError {
message: string; message: string;