chore: release v1.1.0

.env.example

@@ -119,4 +119,3 @@ EXPIRY_WARNING_DAYS=30            # Days before expiry to show yellow warning
 # UI defaults
 # DEFAULT_LANGUAGE=en              # en or de
 # DEFAULT_STOCK_CALCULATION_MODE=automatic  # automatic or manual
-# DEFAULT_SHARE_STOCK_STATUS=true  # Show stock status on shared schedule links

.github/agents/release-manager.agent.md

@@ -1,376 +0,0 @@
----
-name: release-manager
-description: Manages the full release lifecycle - from branching and PRs through versioning and GitHub release notes. Use when code changes are complete and ready to ship.
-argument-hint: Describe what was changed, e.g., "fix stock correction bug" or "new refill tracking feature"
----
-
-# Release Manager Agent
-
-You are the release manager for **MedAssist-ng**. Your job is to guide code from "done" to "released" following the project's strict branch protection, CI pipeline, and semantic versioning rules.
-
-**All output (commits, PR titles, release notes) MUST be in English**, even if the user communicates in German.
-
-## Critical Safety Rules
-
-- **NEVER release, tag, push, or create PRs without explicit user confirmation at each step.** Always present your plan and wait for approval.
-- **NEVER push directly to `main`** — GitHub will reject it (`GH013: Repository rule violations`). All changes go through Pull Requests.
-- **NEVER skip CI checks.** Wait for all status checks to pass before merging.
-
----
-
-## PR Strategy: One PR per Feature/Fix
-
-**Each feature or bug fix MUST be submitted as its own separate PR.** Do NOT bundle multiple unrelated changes into a single PR.
-
-**Why:**
-- Each change gets its own PR number for release notes (e.g., `(#140)`, `(#141)`)
-- CI tests each change in isolation — failures are easy to trace
-- Git blame and rollbacks are precise
-- Code review stays focused
-
-**Rules:**
-- One logical change = one branch = one PR
-- If a bug fix is discovered while working on a feature, create a **separate branch and PR** for the fix
-- Related changes (e.g., a feature + its tests) belong in the **same** PR
-- Squash-merge is still used — keeps `main` history clean with one commit per PR
-- Branch naming reflects the change: `fix/bottle-stock-calc`, `feat/theme-dropdown`, etc.
-
-**Example — bad (bundled):**
-```
-PR #138: "feat: theme dropdown, fix bottle bugs, fix planner, fix reminders"
-```
-
-**Example — good (separate):**
-```
-PR #138: "fix: bottle-type stock calculations across all subsystems"
-PR #139: "fix: intake reminder past-intake seeding"
-PR #140: "feat: theme dropdown with Light/Dark/System options"
-PR #141: "fix: planner checkbox layout on single line"
-```
-
----
-
-## Task 1: Branch, PR, and Merge Workflow
-
-When code changes (features or bug fixes) are complete and tested locally:
-
-### Step 1: Verify Readiness
-
-1. Check for uncommitted changes: `git status`
-2. Ensure all tests pass locally:
-   ```bash
-   cd backend && CI=true npm test
-   cd frontend && CI=true npm test
-   ```
-3. If tests fail, stop and fix them first.
-
-### Step 2: Create Feature Branch
-
-1. Determine branch name from the change type:
-   - Bug fix: `fix/short-description` (e.g., `fix/stock-correction-consumption`)
-   - Feature: `feat/short-description` (e.g., `feat/refill-tracking`)
-   - Chore: `chore/short-description`
-2. Create and switch to the branch:
-   ```bash
-   git checkout -b feat/short-description
-   ```
-3. Stage and commit changes with a conventional commit message:
-   ```bash
-   git add .
-   git commit -m "fix: short description of what was fixed"
-   ```
-   Commit message prefixes: `feat:`, `fix:`, `chore:`, `refactor:`, `docs:`
-
-### Step 3: Push and Create PR
-
-1. Push the branch:
-   ```bash
-   git push -u origin feat/short-description
-   ```
-2. Create a Pull Request via GitHub CLI:
-   ```bash
-   gh pr create --title "fix: short description" --body "Description of charges"
-   ```
-3. **Present the PR URL to the user and wait for confirmation.**
-
-### Step 4: Wait for CI and Merge
-
-1. Monitor CI status:
-   ```bash
-   gh pr checks <PR_NUMBER> --watch
-   ```
-   Required checks:
-   - ✅ `backend-test` (TypeScript type-check + vitest coverage)
-   - ✅ `frontend-build` (npm build)
-2. If CI fails: analyze the failure, fix it, push again, and re-check.
-3. Once CI is green, **ask the user for merge confirmation**, then:
-   ```bash
-   gh pr merge <PR_NUMBER> --squash --delete-branch
-   ```
-4. Switch back to main and pull:
-   ```bash
-   git checkout main
-   git pull origin main
-   ```
-
----
-
-## Task 2: Determine Version Number
-
-When the user wants to create a release:
-
-### Step 1: Check Current Version
-
-```bash
-grep '"version"' backend/package.json
-```
-
-Also check the latest git tag:
-```bash
-git tag --sort=-v:refname | head -5
-```
-
-### Step 2: Analyze Changes Since Last Release
-
-```bash
-git log $(git describe --tags --abbrev=0)..HEAD --oneline
-```
-
-Read through the commits to understand what changed.
-
-### Step 3: Select SemVer Level
-
-Apply these rules strictly:
-
-| Change Type | Version Bump | Example |
-|------------|-------------|---------|
-| Bug fixes only, no new features | **patch** | `1.4.2` → `1.4.3` |
-| New features (backward compatible) | **minor** | `1.4.2` → `1.5.0` |
-| Breaking changes (DB schema without migration, removed ENV vars, changed API) | **major** | `1.4.2` → `2.0.0` |
-
-**Guidelines:**
-- When in doubt between patch and minor, prefer **minor** if any user-visible behavior is new.
-- Bug fixes that also introduce small UX improvements = **patch**.
-- Multiple bug fixes in one release = still **patch**.
-- New UI sections, new API endpoints, new settings = **minor**.
-- If a user can run `docker compose pull && docker compose up -d` without changing anything → NOT a breaking change.
-
-**Present your version recommendation to the user with reasoning and wait for confirmation.**
-
----
-
-## Task 3: Execute Release
-
-Use the release script — it is **fully non-interactive** (no y/N prompts) and handles the entire flow automatically:
-
-```bash
-./scripts/release.sh <patch|minor|major|x.y.z>
-```
-
-The script performs these steps in order:
-1. Checks out and updates `main`
-2. Creates release branch `chore/release-X.Y.Z`
-3. Bumps version in `backend/package.json` and `frontend/package.json`
-4. Commits, pushes, and creates a PR
-5. Waits for CI checks (with retry logic — polls every 15s, waits up to 10 minutes)
-6. Merges the PR (squash + delete branch)
-7. Creates a signed tag `vX.Y.Z` and pushes it
-
-**The script auto-detects the git remote** (`origin` or `github`) and uses it consistently.
-
-**CI wait behavior:** GitHub Actions can take 10-30 seconds before checks appear on a new PR. The script waits 20 seconds initially, then polls every 15 seconds until checks are registered, then watches them to completion. Maximum wait is 10 minutes.
-
-**On failure:** If CI fails, the script exits with an error. The release branch and PR remain open for inspection. Fix the issue, push to the branch, and the PR will re-run CI. Then merge manually or re-run the script.
-
-### Version Files (MANDATORY)
-
-The version number is displayed in the **About modal** (Settings → About) as a single unified app version. This version is a **clickable link** pointing to the corresponding GitHub release (`https://github.com/DanielVolz/medassist-ng/releases/tag/vX.Y.Z`). The version is read from:
-
-- **`backend/package.json`** → Backend version, returned by `/health` endpoint
-- **`frontend/package.json`** → Frontend version, injected at build time via Vite's `__APP_VERSION__` define and used to construct the release link
-
-**Both files MUST be updated to the new version before tagging a release.** If forgotten:
-- The About modal will show the old version
-- The version link will point to a non-existent GitHub release page
-
-### Manual Release (if script is not available)
-
-1. Create release branch:
-   ```bash
-   git checkout main && git pull origin main
-   git checkout -b chore/release-X.Y.Z
-   ```
-2. Update versions in **both** `backend/package.json` and `frontend/package.json` to `X.Y.Z`
-3. Commit, push, create PR, wait for CI, merge (same as Task 1)
-4. Create signed tag:
-   ```bash
-   git checkout main && git pull origin main
-   git tag -s "vX.Y.Z" -m "Release vX.Y.Z"
-   git push origin "vX.Y.Z"
-   ```
-
-### After Tagging
-
-- The `docker-build.yml` workflow automatically builds and pushes Docker images to GHCR with both versioned tags (`1.8.7`, `1.8`) and `latest`.
-- The `update-test-badges.yml` workflow runs automatically after a successful Docker build to update test count badges in the README.
-- Track progress: `https://github.com/DanielVolz/medassist-ng/actions`
-
----
-
-## Task 4: Write Release Notes
-
-When the user asks to write release notes (MANDATORY for minor/major releases):
-
-### Step 1: Gather Changes
-
-```bash
-git log vPREVIOUS..vNEW --oneline
-```
-
-Read the actual code changes (not just commit messages) to understand what was added or fixed.
-
-### Step 2: Write Release Notes
-
-**Release title:** Use just `vX.Y.Z` (e.g., `v1.4.1`), NOT "Release vX.Y.Z".
-
-**Required structure:**
-
-1. **"What's New"** (1-2 sentences): Brief intro explaining the main change
-2. **"New Features" / "Bug Fixes" / "Improvements"**: Grouped bullet points with **bold feature names** and descriptions
-3. **"Where to Find It"**: Tell users where they can access the new feature or see the fix
-4. **Breaking Changes Warning** (if applicable): See below
-
-**Style guidelines:**
-- Use `### Heading` for sections
-- Use **bold** for feature names in bullet points
-- Keep descriptions on the same line as the feature name
-- **No emojis** — do not use emoji in headings or bullet points
-- **Include commit references** — each bullet point must end with the PR number (e.g., `(#136)`) or short commit hash (e.g., `(ab12cd3)`) linking to the commit/PR. Use PR numbers when available.
-- Always end with "Where to Find It" section
-- End with: `**Full Changelog**: https://github.com/DanielVolz/medassist-ng/compare/vPREV...vNEW`
-
-**ONLY include user-relevant changes.** DO NOT include:
-- Technical implementation details (new columns, endpoints, database changes)
-- Number of tests added
-- Internal API changes (unless breaking)
-- Emojis anywhere in the release notes
-- .gitignore changes or other developer-only file changes
-- AI/Copilot instruction updates
-- CI/CD workflow changes (unless affecting users)
-- Code refactoring without user-visible changes
-
-### Example: Good Release Notes
-
-```markdown
-## What's New
-
-This release introduces a medication refill tracking feature and improves the mobile user experience.
-
-### New Features
-
-- **Medication Refill**: Track when you refill your medications with a single click. Add full packs or individual pills and view complete refill history. (#120)
-- **Automatic Stock Updates**: Stock levels are automatically recalculated after each refill. (#120)
-- **Refill History**: Each medication shows a complete history of all refills with timestamps. (#122)
-
-### Improvements
-
-- **Centered Tooltips**: Info tooltips now display centered on screen for better readability. (#125)
-- **Touch-friendly**: Tooltips close automatically when scrolling on touch devices. (#125)
-
-### Where to Find It
-
-The refill button appears in the medication detail modal and in the edit form for each medication.
-
-**Full Changelog**: https://github.com/DanielVolz/medassist-ng/compare/v1.2.3...v1.3.0
-```
-
-### Breaking Changes Warning
-
-If the update breaks existing configurations or stored data, it MUST be prominently warned:
-
-**Breaking Changes include:**
-- Database schema changes without automatic migration
-- Removed or renamed ENV variables
-- Changed API endpoints
-- Incompatible `.env` format changes
-- Loss of stored data after update
-
-**Format:**
-
-```markdown
-## ⚠️ BREAKING CHANGES - Please read before updating!
-
-**Database migration required**: This update changes the database schema.
-Existing installations need to:
-1. Create backup of `data/` folder
-2. Stop containers
-3. Perform update
-4. If issues occur: Rollback using backup
-
-**ENV variables changed**:
-- `OLD_VAR` was renamed to `NEW_VAR`
-- `REMOVED_VAR` is no longer supported
-```
-
-**What is NOT a Breaking Change:**
-- ✅ New optional columns with DEFAULT values
-- ✅ New ENV variables (with sensible defaults)
-- ✅ New features that don't affect existing data
-- ✅ Bug fixes that correct behavior
-
-### Step 3: Publish
-
-Present the release notes to the user. They will copy them to the GitHub release page or ask you to publish via:
-```bash
-gh release create vX.Y.Z --title "vX.Y.Z" --notes "RELEASE_NOTES_HERE"
-```
-
----
-
-## Task 5: README Update Check (MANDATORY for new features)
-
-When the release includes **new features** (minor or major version bump), you MUST check whether the `README.md` needs to be updated **before** executing the release.
-
-### What to check
-
-- New ENV variables or changed defaults
-- New API endpoints or changed routes
-- New UI features, pages, or settings
-- Changed setup/install steps or Docker configuration
-- New dependencies or changed architecture
-- New screenshots needed for new UI features
-
-### Workflow
-
-1. Review the changes included in the release
-2. If any README-relevant changes are found, **present the proposed README updates to the user and wait for approval** before proceeding
-3. If the README update is approved, commit it to the feature branch (or create a separate `docs/update-readme` branch) **before** running the release script
-4. Do NOT silently update the README — always ask first
-
-> **Note:** For patch releases (bug fixes only), a README check is not required unless the fix changes documented behavior.
-
----
-
-## Complete Workflow Summary
-
-```
-Code complete & tests pass locally
-        ↓
-1. Create feature branch (fix/... or feat/...)
-2. Commit, push, create PR
-3. Wait for CI (backend-test + frontend-build)
-4. Merge PR to main (squash + delete branch)
-        ↓
-Ready for release?
-        ↓
-5. Check current version (git tag + package.json)
-6. Analyze changes → determine SemVer level
-7. If minor/major: check README.md for needed updates (Task 5)
-8. Run ./scripts/release.sh <patch|minor|major>
-   (or manually: branch → version bump → PR → CI → merge → tag)
-        ↓
-9. Write release notes (mandatory for minor/major)
-10. Publish GitHub release
-        ↓
-Docker images built automatically via CI
-```

.github/copilot-instructions.md

@@ -2,15 +2,8 @@
 
 ## General Rules
 
-- **English is the primary language**: All code, comments, documentation, commit messages, PR descriptions, and GitHub releases MUST be written in English. The user may communicate in German, but all project artifacts must be in English.
-- **NEVER release without explicit permission**: Do NOT create tags, releases, or version bumps unless the user explicitly asks for it. Always wait for explicit confirmation before any release action.
-- **NEVER create PRs, push, or merge**: Only the **release-manager agent** (`@release-manager`) is allowed to create Pull Requests, push branches to the remote, or merge code. Regular agents and Copilot MUST NOT perform any git operations that affect the remote repository (no `git push`, no `gh pr create`, no `gh pr merge`). Present your local changes and tell the user to invoke `@release-manager` when ready to ship.
 - **No temporary files**: Delete temporary scripts/files immediately after use. Do not commit temporary debug scripts, test files, or one-off utilities to the repository.
 - **Clean workspace**: Always clean up after yourself. If you create a file for a specific task, delete it once done.
-- **Remove old code when re-implementing**: When fixing a bug or re-implementing a feature that didn't work, ALWAYS remove the old/broken code completely. Never leave dead code, unused functions, or obsolete implementations in the codebase.
-- **Tests are mandatory**: Every new feature and every bug fix MUST have corresponding tests. When modifying existing features, update or add tests accordingly. If old tests become obsolete due to code changes, remove or update them.
-- **Fix bugs, don't test around them**: If you discover incorrect behavior in the code while writing tests, ALWAYS fix the buggy code first, then write tests that verify the correct behavior. NEVER write tests that mimic or assert broken behavior. The user's time is finite and irreplaceable — every bug left unfixed wastes it.
-- **Keep README.md up to date**: After implementing code changes, check whether the `README.md` needs to be updated (e.g., new features, changed ENV variables, new commands, changed architecture, new endpoints, updated screenshots). If changes are relevant to the README, **ask the user for confirmation** before updating it. Do NOT silently update the README — always present the proposed README changes and wait for approval. Examples of README-relevant changes: new ENV variables, new API endpoints, new UI features, changed setup/install steps, new dependencies, changed Docker configuration.
 
 ## Architecture Overview
 
@@ -53,25 +46,25 @@ cd backend && npm run test:coverage # Run with coverage report
 
 ## Testing (MANDATORY)
 
-> ⚠️ **IMPORTANT**: Every new feature MUST be covered by tests!
-> Pull Requests without tests for new features will not be accepted.
+> ⚠️ **WICHTIG**: Jede neue Funktionalität MUSS mit Tests abgedeckt werden!
+> Pull Requests ohne Tests für neue Features werden nicht akzeptiert.
 
-### Test Framework
-- **Vitest 2.1** with v8 Coverage
+### Test-Framework
+- **Vitest 2.1** mit v8 Coverage
 - Tests in `backend/src/test/*.test.ts`
-- Coverage goal: At least equal or better coverage after changes
+- Coverage-Ziel: Mindestens gleiche oder bessere Coverage nach Änderungen
 
-### Test Structure
-| File | Tests |
-|------|-------|
-| `routes.test.ts` | API endpoints (Auth, Medications, Doses, Settings, Share, Planner) |
-| `services.test.ts` | Scheduler utilities (Timezone, Blisters, Usage calculation) |
-| `db.test.ts` | Database schema and operations |
+### Test-Struktur
+| Datei | Testet |
+|-------|--------|
+| `routes.test.ts` | API-Endpunkte (Auth, Medications, Doses, Settings, Share, Planner) |
+| `services.test.ts` | Scheduler-Utilities (Timezone, Blisters, Usage-Berechnung) |
+| `db.test.ts` | Datenbank-Schema und Operationen |
 
-### Writing Tests
+### Tests schreiben
 
 ```typescript
-// Backend Test Example (backend/src/test/example.test.ts)
+// Backend Test Beispiel (backend/src/test/example.test.ts)
 import { describe, it, expect, beforeAll, afterAll } from 'vitest';
 import { createTestApp, createTestUser } from './routes.test'; // Test-Utilities
 
@@ -102,24 +95,24 @@ describe('Feature Name', () => {
 });
 ```
 
-### Test Commands
+### Test-Commands
 ```bash
 cd backend
-CI=true npm test            # Run tests once (ALWAYS run this way!)
-CI=true npm run test:coverage  # With coverage report
-npm test -- --watch         # Watch mode for manual development
-npm test -- -t "test name"  # Run single test
+CI=true npm test            # Tests einmal ausführen (IMMER so ausführen!)
+CI=true npm run test:coverage  # Mit Coverage-Report
+npm test -- --watch         # Watch-Mode für manuelle Entwicklung
+npm test -- -t "test name"  # Einzelnen Test ausführen
 ```
 
-> ⚠️ **IMPORTANT for AI agents**: ALWAYS run tests with `CI=true`!
-> Without `CI=true`, Vitest runs in watch mode and waits for input.
+> ⚠️ **WICHTIG für AI-Agenten**: Tests IMMER mit `CI=true` ausführen!
+> Ohne `CI=true` läuft Vitest im Watch-Mode und wartet auf Eingaben.
 
 ## CI/CD Pipeline (GitHub Actions)
 
-### Workflow Overview
+### Workflow-Übersicht
 
 ```
-Pull Request created
+Pull Request erstellt
         ↓
 ┌─────────────────────────────────────┐
 │  test.yml                           │
@@ -131,62 +124,65 @@ Pull Request created
 │      ├─ npm ci                      │
 │      └─ npm run build               │
 └─────────────────────────────────────┘
-        ↓ Tests must pass
-    PR can be merged
+        ↓ Tests müssen bestehen
+    PR kann gemerged werden
         ↓
-Push to main / Tag created
+Push to main / Tag erstellt
         ↓
 ┌─────────────────────────────────────┐
 │  docker-build.yml                   │
-│  └─ build-and-push                  │
-│      ├─ Build Docker images         │
-│      └─ Push to GHCR                │
-│      (Tag builds also set "latest") │
-└─────────────────────────────────────┘
-        ↓ After successful build
-┌─────────────────────────────────────┐
-│  update-test-badges.yml             │
-│  (workflow_run after docker-build)  │
-│  └─ Run tests, update badge counts  │
+│  ├─ backend-test (parallel)         │
+│  ├─ frontend-build (parallel)       │
+│  └─ build-and-push (nach Tests)     │
+│      ├─ Docker Images bauen         │
+│      └─ Push zu GHCR                │
 └─────────────────────────────────────┘
 ```
 
 ### Branch Protection
 
-> ⚠️ **IMPORTANT**: The `main` branch is protected!  
-> Direct pushing to `main` is **not possible** - GitHub will reject the push.  
-> All changes must go through Pull Requests.
+> ⚠️ **WICHTIG**: Der `main` Branch ist geschützt!  
+> Direktes Pushen nach `main` ist **nicht möglich** - GitHub lehnt den Push ab.  
+> Alle Änderungen müssen über Pull Requests erfolgen.
 
-- **main** branch is protected (Repository Rules)
-- Direct pushing is rejected by GitHub with: `GH013: Repository rule violations`
-- PRs require:
-  - ✅ `backend-test` Status Check passed
-  - ✅ `frontend-build` Status Check passed
-- After successful merge, the feature branch is automatically deleted
+- **main** Branch ist geschützt (Repository Rules)
+- Direktes Pushen wird von GitHub abgelehnt mit: `GH013: Repository rule violations`
+- PRs benötigen:
+  - ✅ `backend-test` Status Check bestanden
+  - ✅ `frontend-build` Status Check bestanden
+- Nach erfolgreichem Merge wird der Feature-Branch automatisch gelöscht
 
-**Workflow for changes:**
+**Workflow für Änderungen:**
 ```bash
-# 1. Create feature branch
-git checkout -b feat/my-feature
+# 1. Feature Branch erstellen
+git checkout -b feat/mein-feature
 
-# 2. Commit and push changes
-git add . && git commit -m "feat: Description"
-git push -u origin feat/my-feature
+# 2. Änderungen committen und pushen
+git add . && git commit -m "feat: Beschreibung"
+git push -u origin feat/mein-feature
 
-# 3. Create PR (via GitHub CLI or Web)
-gh pr create --title "My Feature" --body "Description"
+# 3. PR erstellen (via GitHub CLI oder Web)
+gh pr create --title "Mein Feature" --body "Beschreibung"
 
-# 4. Wait until CI is green, then merge
+# 4. Warten bis CI grün ist, dann mergen
 gh pr merge --squash --delete-branch
 ```
 
-### Workflow Files
-| File | Trigger | Purpose |
-|------|---------|--------|
-| `.github/workflows/test.yml` | Pull Requests | Run tests, block PR on failures |
-| `.github/workflows/docker-build.yml` | Push to main, Tags | Build and push Docker images (+ create GitHub release on tags) |
-| `.github/workflows/update-test-badges.yml` | After successful docker-build | Update test count badges in README |
-| `.github/workflows/codeql.yml` | Push to main, PRs, Weekly | Security analysis |
+### Workflow-Dateien
+| Datei | Trigger | Zweck |
+|-------|---------|-------|
+| `.github/workflows/test.yml` | Pull Requests | Tests ausführen, PR blockieren bei Fehlern |
+| `.github/workflows/docker-build.yml` | Push to main, Tags | Tests + Docker Images bauen und pushen |
+
+### Neuen Code hinzufügen - Checkliste
+1. ✅ Feature implementieren
+2. ✅ Tests für das Feature schreiben
+3. ✅ Lokal `npm run test:coverage` ausführen
+4. ✅ Coverage darf nicht sinken
+5. ✅ Feature Branch erstellen und pushen
+6. ✅ Pull Request erstellen
+7. ✅ Warten bis CI grün ist
+8. ✅ PR mergen (Branch wird automatisch gelöscht)
 
 ## Key Patterns
 
@@ -374,77 +370,55 @@ Example: `5-0-1735344000000` = Medication 5, Blister 0, timestamp
 - **API responses**: Return objects directly, Fastify serializes to JSON
 - **Environment**: Copy `.env.example` → `.env`, secrets must be 10+ chars
 - **i18n**: All UI text via `t('key')` function, translations in `frontend/src/i18n/*.json`
-- **UI Consistency**: Always use existing components for modals, buttons, and forms. For confirmation dialogs, use `ConfirmModal` component. Never create inline modals with custom button styling - all UI elements must match the existing design system. When adding new sections to existing components, ensure font sizes, spacing, margins, and button styles match exactly with other sections. Check existing CSS classes before creating new ones.
 
-## Database Schema Changes (IMPORTANT: Backward Compatibility!)
+## Database Schema Changes (WICHTIG: Abwärtskompatibilität!)
 
-> ⚠️ **CRITICAL**: The app MUST remain backward compatible with older databases!
-> Users upgrade their Docker containers but keep their existing DB.
-> The app must NOT crash if old columns are missing.
+> ⚠️ **KRITISCH**: Die App MUSS abwärtskompatibel mit älteren Datenbanken bleiben!
+> Nutzer upgraden ihre Docker-Container, aber behalten ihre bestehende DB.
+> Die App darf NICHT abstürzen wenn alte Spalten fehlen.
 
-### ⚠️ MANDATORY for EVERY New Feature
+### Regeln für neue Spalten
 
-**Before implementing ANY feature that touches user data or settings:**
+1. **IMMER mit DEFAULT-Wert**: Neue Spalten müssen `NOT NULL DEFAULT <wert>` haben
+2. **NULL-sicher im Code**: Alle Abfragen müssen `?? defaultValue` oder `?? false` verwenden
+3. **Schema-SQL aktualisieren**: In diesen Dateien hinzufügen:
+   - `backend/src/db/schema.ts` - Drizzle Schema
+   - `backend/src/db/schema-sql.ts` - `getTableCreationSQL()` für neue DBs
+   - `backend/src/db/client.ts` - `ALTER TABLE ADD COLUMN IF NOT EXISTS` Migration
+4. **Test-Schemas updaten**: Alle Test-Dateien mit eigenem Schema:
+   - `backend/src/test/e2e-routes.test.ts`
+   - `backend/src/test/integration.test.ts`
+   - `backend/src/test/planner.test.ts`
 
-1. **Check if new DB columns are needed** - Does the feature require storing new data?
-2. **If YES → Follow ALL steps below** - Schema.ts + Drizzle migration + ALTER migration + NULL-safe code
-3. **NEVER skip the ALTER migration** - This is the #1 cause of production 500 errors!
+### Beispiel: Neue Spalte hinzufügen
 
-**Common mistake:** Adding a column to `schema.ts` and forgetting the ALTER migration in `client.ts`.
-The Drizzle migration only works for NEW databases. Existing production databases need the ALTER migration!
-
-### Schema Management with Drizzle Kit
-
-The database schema uses **Drizzle Kit** for migrations. There is a **single source of truth**:
-
-- **`backend/src/db/schema.ts`** - Drizzle ORM schema definitions (TypeScript)
-- **`backend/drizzle/`** - Generated SQL migrations (auto-generated from schema.ts)
-
-**DO NOT manually edit migration files!** They are generated from schema.ts.
-
-### Adding New Columns
-
-1. **Add to schema.ts** with DEFAULT value:
 ```typescript
+// 1. schema.ts - Drizzle Definition
 maxNaggingReminders: integer("max_nagging_reminders").notNull().default(5),
-   ```
 
-2. **Generate migration**:
-   ```bash
-   cd backend && npx drizzle-kit generate --name add_column_name
-   ```
+// 2. schema-sql.ts - Für neue Datenbanken
+"max_nagging_reminders integer NOT NULL DEFAULT 5,"
 
-3. **Add backward-compatible ALTER migration** in `client.ts` `runAlterMigrations()`:
-   ```typescript
-   `ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`,
-   ```
+// 3. client.ts - Migration für bestehende DBs (IN ensureTablesExist())
+await client.execute(`ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`).catch(() => {});
 
-4. **NULL-safe reading** in routes:
-   ```typescript
+// 4. Routes - NULL-sicher lesen
 maxNaggingReminders: settings.maxNaggingReminders ?? 5,
 ```
 
-### Rules for New Columns
+### Was NICHT erlaubt ist
 
-1. **ALWAYS with DEFAULT value**: New columns must have `NOT NULL DEFAULT <value>`
-2. **NULL-safe in code**: All queries must use `?? defaultValue` or `?? false`
-3. **Generate migration**: Run `npx drizzle-kit generate` after schema changes
-4. **Add ALTER migration**: For backward compatibility with existing DBs
+- ❌ Spalten löschen oder umbenennen (bricht alte DBs)
+- ❌ `NOT NULL` ohne `DEFAULT` (INSERT schlägt fehl)
+- ❌ Spalten ohne Fallback im Code lesen
+- ❌ DB löschen als "Lösung" dokumentieren
 
-### What is NOT Allowed
+### Wann Abwärtskompatibilität NICHT möglich ist
 
-- ❌ Deleting or renaming columns (breaks old DBs)
-- ❌ `NOT NULL` without `DEFAULT` (INSERT fails)
-- ❌ Reading columns without fallback in code
-- ❌ Manually editing migration SQL files
-- ❌ Documenting "delete DB" as a solution
-
-### When Backward Compatibility is NOT Possible
-
-If a breaking change is unavoidable:
-1. **Explicitly communicate**: Document in release notes
-2. **Migration script**: Provide automatic upgrade script
-3. **Version check**: App should check DB version and warn
+Wenn eine Breaking Change unvermeidbar ist:
+1. **Explizit kommunizieren**: In Release Notes dokumentieren
+2. **Migration-Script**: Automatisches Upgrade-Script bereitstellen
+3. **Versionsprüfung**: App sollte DB-Version prüfen und warnen
 
 ## File Locations
 
@@ -452,8 +426,6 @@ If a breaking change is unavoidable:
 |---------|----------|
 | Backend entry | `backend/src/index.ts` |
 | Database schema | `backend/src/db/schema.ts` |
-| Drizzle migrations | `backend/drizzle/*.sql` |
-| Drizzle config | `backend/drizzle.config.ts` |
 | Backend routes | `backend/src/routes/*.ts` |
 | Backend services | `backend/src/services/*.ts` |
 | Frontend app | `frontend/src/App.tsx` |

.github/workflows/codeql.yml

@@ -3,30 +3,8 @@ name: "CodeQL"
 on:
   push:
     branches: [main]
-    paths:
-      - '**.js'
-      - '**.ts'
-      - '**.tsx'
-      - '**.jsx'
-      - 'backend/package.json'
-      - 'backend/package-lock.json'
-      - 'frontend/package.json'
-      - 'frontend/package-lock.json'
-      - '.github/codeql/**'
-      - '.github/workflows/codeql.yml'
   pull_request:
     branches: [main]
-    paths:
-      - '**.js'
-      - '**.ts'
-      - '**.tsx'
-      - '**.jsx'
-      - 'backend/package.json'
-      - 'backend/package-lock.json'
-      - 'frontend/package.json'
-      - 'frontend/package-lock.json'
-      - '.github/codeql/**'
-      - '.github/workflows/codeql.yml'
   schedule:
     - cron: "0 6 * * 1" # Weekly on Monday at 6am UTC
   workflow_dispatch: # Allow manual trigger

.github/workflows/docker-build.yml

@@ -20,16 +20,50 @@ env:
 
 jobs:
   # =============================================================================
-  # Build and Push Docker Images
-  # Triggered on pushes to main (tagged as "main") and version tags (v*).
-  # Tests are NOT run here — branch protection on main requires all PR checks
-  # (backend-test + frontend-build from test.yml) to pass before merge.
-  # Tags are created from main, so code is already tested.
-  #
-  # main push  → "main" tag only (for testing before release)
-  # Tag builds → semver tags (e.g., 1.9.0, 1.9) plus "latest"
+  # Run Tests First
+  # =============================================================================
+  backend-test:
+    name: Backend Tests
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    defaults:
+      run:
+        working-directory: backend
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: backend/package-lock.json
+      - run: npm ci
+      - run: npx tsc --noEmit
+      - run: npm run test:run
+
+  frontend-build:
+    name: Frontend Build
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    defaults:
+      run:
+        working-directory: frontend
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+          cache-dependency-path: frontend/package-lock.json
+      - run: npm ci
+      - run: npm run build
+
+  # =============================================================================
+  # Build and Push Docker Images (only after tests pass)
   # =============================================================================
   build-and-push:
+    needs: [backend-test, frontend-build]
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -67,7 +101,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=raw,value=${{ github.event.inputs.tag || 'latest' }},enable=${{ github.event_name == 'workflow_dispatch' }}
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
 
       - name: Build and push
         uses: docker/build-push-action@v5
@@ -79,8 +113,6 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           platforms: linux/amd64,linux/arm64
-          provenance: false
-          sbom: false
 
   # =============================================================================
   # Create GitHub Release (only on tag push)
@@ -98,28 +130,13 @@ jobs:
         with:
           fetch-depth: 0  # Fetch all history for changelog generation
 
-      - name: Check if release exists
-        id: check_release
-        run: |
-          CURRENT_TAG=${GITHUB_REF#refs/tags/}
-          if gh release view "$CURRENT_TAG" &>/dev/null; then
-            echo "exists=true" >> $GITHUB_OUTPUT
-            echo "Release $CURRENT_TAG already exists, skipping creation"
-          else
-            echo "exists=false" >> $GITHUB_OUTPUT
-          fi
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Get previous tag
-        if: steps.check_release.outputs.exists == 'false'
         id: prev_tag
         run: |
           PREV_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
           echo "tag=${PREV_TAG}" >> $GITHUB_OUTPUT
 
       - name: Generate changelog
-        if: steps.check_release.outputs.exists == 'false'
         id: changelog
         run: |
           CURRENT_TAG=${GITHUB_REF#refs/tags/}
@@ -148,7 +165,6 @@ jobs:
           echo "**Full Changelog**: https://github.com/${{ github.repository }}/compare/${PREV_TAG}...${CURRENT_TAG}" >> changelog.md
 
       - name: Create GitHub Release
-        if: steps.check_release.outputs.exists == 'false'
         uses: softprops/action-gh-release@v2
         with:
           body_path: changelog.md

.github/workflows/release.yml

@@ -0,0 +1,42 @@
+name: Create Release
+
+on:
+  push:
+    tags: ['v*']
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Generate changelog
+        id: changelog
+        run: |
+          # Get previous tag
+          PREV_TAG=$(git describe --tags --abbrev=0 HEAD^ 2>/dev/null || echo "")
+          
+          if [ -z "$PREV_TAG" ]; then
+            # First release - get all commits
+            CHANGES=$(git log --pretty=format:"- %s" HEAD)
+          else
+            # Get commits since last tag
+            CHANGES=$(git log --pretty=format:"- %s" ${PREV_TAG}..HEAD)
+          fi
+          
+          # Write to file for multiline support
+          echo "$CHANGES" > changelog.txt
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v1
+        with:
+          body_path: changelog.txt
+          generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -10,38 +10,10 @@ permissions:
 
 jobs:
   # =============================================================================
-  # Detect which paths changed to skip unnecessary jobs
-  # =============================================================================
-  changes:
-    name: Detect Changes
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-    outputs:
-      backend: ${{ steps.filter.outputs.backend }}
-      frontend: ${{ steps.filter.outputs.frontend }}
-    steps:
-      - uses: dorny/paths-filter@v3
-        id: filter
-        with:
-          filters: |
-            backend:
-              - 'backend/**'
-              - 'biome.json'
-              - '.github/workflows/test.yml'
-            frontend:
-              - 'frontend/**'
-              - 'biome.json'
-              - '.github/workflows/test.yml'
-
-  # =============================================================================
-  # Backend Tests (skipped if no backend-related files changed)
+  # Backend Tests
   # =============================================================================
   backend-test:
     name: Backend Tests
-    needs: changes
-    if: needs.changes.outputs.backend == 'true'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -63,9 +35,6 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Lint
-        run: npm run lint
-
       - name: TypeScript type check
         run: npx tsc --noEmit
 
@@ -81,12 +50,10 @@ jobs:
           retention-days: 7
 
   # =============================================================================
-  # Frontend Build Validation (skipped if no frontend-related files changed)
+  # Frontend Build Validation
   # =============================================================================
   frontend-build:
     name: Frontend Build
-    needs: changes
-    if: needs.changes.outputs.frontend == 'true'
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -108,8 +75,5 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
-      - name: Lint
-        run: npm run lint
-
       - name: TypeScript type check & build
         run: npm run build

.github/workflows/update-test-badges.yml

@@ -1,103 +0,0 @@
-name: Update Test Badges
-
-on:
-  workflow_dispatch:
-  workflow_run:
-    workflows: ["Build and Push Docker Images"]
-    types: [completed]
-    branches: [main]
-
-permissions:
-  contents: write
-
-jobs:
-  update-badges:
-    name: Update Test Count Badges
-    runs-on: ubuntu-latest
-    # Only run after successful docker builds, not failed ones
-    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.BADGE_TOKEN || secrets.GITHUB_TOKEN }}
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '22'
-          cache: 'npm'
-          cache-dependency-path: '**/package-lock.json'
-
-      - name: Install backend dependencies
-        working-directory: backend
-        run: npm ci
-
-      - name: Install frontend dependencies
-        working-directory: frontend
-        run: npm ci
-
-      - name: Run backend tests and capture count
-        id: backend-tests
-        working-directory: backend
-        timeout-minutes: 5
-        env:
-          CI: true
-        run: |
-          OUTPUT=$(npm run test:run 2>&1) || true
-          echo "$OUTPUT"
-          # Strip ANSI escape codes, then extract "Tests  X passed" from output
-          CLEAN=$(echo "$OUTPUT" | sed 's/\x1b\[[0-9;]*m//g')
-          PASSED=$(echo "$CLEAN" | grep -oP 'Tests\s+\K\d+(?=\s+passed)' | tail -1)
-          echo "count=$PASSED" >> $GITHUB_OUTPUT
-
-      - name: Run frontend tests and capture count
-        id: frontend-tests
-        working-directory: frontend
-        timeout-minutes: 5
-        env:
-          CI: true
-        run: |
-          OUTPUT=$(npm run test:run 2>&1) || true
-          echo "$OUTPUT"
-          # Strip ANSI escape codes, then extract "Tests  X passed" from output
-          CLEAN=$(echo "$OUTPUT" | sed 's/\x1b\[[0-9;]*m//g')
-          PASSED=$(echo "$CLEAN" | grep -oP 'Tests\s+\K\d+(?=\s+passed)' | tail -1)
-          echo "count=$PASSED" >> $GITHUB_OUTPUT
-
-      - name: Update README badges
-        run: |
-          BACKEND_COUNT="${{ steps.backend-tests.outputs.count }}"
-          FRONTEND_COUNT="${{ steps.frontend-tests.outputs.count }}"
-          
-          echo "Backend tests: $BACKEND_COUNT"
-          echo "Frontend tests: $FRONTEND_COUNT"
-          
-          # Only update if we got valid counts
-          if [[ -n "$BACKEND_COUNT" && -n "$FRONTEND_COUNT" ]]; then
-            # URL encode the slash for shields.io
-            BACKEND_BADGE="https://img.shields.io/badge/Backend_Tests-${BACKEND_COUNT}%2F${BACKEND_COUNT}-brightgreen?logo=vitest"
-            FRONTEND_BADGE="https://img.shields.io/badge/Frontend_Tests-${FRONTEND_COUNT}%2F${FRONTEND_COUNT}-brightgreen?logo=vitest"
-            
-            # Update README using sed
-            sed -i "s|https://img.shields.io/badge/Backend_Tests-[^\"]*|$BACKEND_BADGE|g" README.md
-            sed -i "s|https://img.shields.io/badge/Frontend_Tests-[^\"]*|$FRONTEND_BADGE|g" README.md
-            
-            echo "Updated badges in README.md"
-          else
-            echo "Could not extract test counts, skipping update"
-            exit 0
-          fi
-
-      - name: Commit and push badge updates
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add README.md
-          if git diff --cached --quiet; then
-            echo "No badge changes to commit"
-          else
-            git commit -m "chore: update test count badges [skip ci]"
-            git push
-          fi

.gitignore

@@ -1,83 +1,33 @@
-# ===================
-# Dependencies
-# ===================
+# Node
 node_modules/
-.pnpm-store/
-
-# ===================
-# Build outputs
-# ===================
-dist/
-build/
-.tmp/
-*.tsbuildinfo
-
-# ===================
-# Test & Coverage
-# ===================
-coverage/
-.nyc_output/
-
-# Playwright
-/frontend/playwright-report/
-/frontend/test-results/
-/frontend/e2e/.auth/
-/frontend/blob-report/
-
-# ===================
-# Environment
-# ===================
-.env
-.env.*
-!.env.example
-
-# ===================
-# Database & Data
-# ===================
-*.db
-*.sqlite
-*.sqlite3
-*.db-journal
-*.db-wal
-*.db-shm
-data/
-
-# ===================
-# Logs
-# ===================
-logs/
-*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 pnpm-debug.log*
 
-# ===================
-# OS files
-# ===================
-.DS_Store
-Thumbs.db
-*.swp
-*.swo
-*~
+# Build outputs
+dist/
+build/
+coverage/
+.tmp/
 
-# ===================
-# IDE / Editor
-# ===================
+# Env
+.env
+.env.*
+!.env.example
+
+# SQLite
+*.db
+*.sqlite
+*.sqlite3
+*.db-journal
+backend/data/
+
+# Logs
+logs/
+*.log
+
+# Editor
+.vscode/
 .idea/
-*.sublime-project
-*.sublime-workspace
-
-# Keep shared VS Code settings
-# .vscode/ is NOT ignored - settings.json is useful for the team
-
-# ===================
-# Misc
-# ===================
-*.local
-.cache/
-.turbo/
-.roo/
-.roomodes
-AGENTS.md
-docs/TECH_STACK.md
+.DS_Store

.husky/pre-commit

@@ -1 +0,0 @@
-npx lint-staged

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-  "vitest.root": "backend",
-  "vitest.enable": true,
-  "vitest.commandLine": "npm test --"
-}

README.md

@@ -17,11 +17,6 @@
   <img src="https://img.shields.io/badge/Docker-Ready-2496ED?logo=docker" alt="Docker" />
 </p>
 
-<p align="center">
-  <img src="https://img.shields.io/badge/Backend_Tests-514%2F514-brightgreen?logo=vitest" alt="Backend Tests 454/454" />
-  <img src="https://img.shields.io/badge/Frontend_Tests-708%2F708-brightgreen?logo=vitest" alt="Frontend Tests 611/611" />
-</p>
-
 ### 🤖 AI-Generated Code
 
 > This app was 100% coded with Claude Opus 4.5. Use at your own risk.
@@ -33,7 +28,6 @@
 > **Think of this app as a helpful tool, but make all health decisions independently!**
 
 - [Features](#features)
-- [Screenshots](#screenshots)
 - [Getting Started](#getting-started)
 - [Configuration](#configuration)
 - [Development](#development)
@@ -44,91 +38,11 @@
   <img src="docs/gifs/MedAssist-demo.gif" alt="MedAssist-ng Dashboard" width="100%" />
 </p>
 
-<a id="screenshots"></a>
-<details>
-<summary><strong>Screenshots</strong></summary>
-<blockquote>
-
-<details>
-<summary>Dashboard</summary>
-
-Overview with stock status, reorder reminders, and upcoming schedules.
-
-<img src="docs/screenshots/dashboard-desktop.png" alt="Dashboard" width="100%" />
-
-</details>
-
-<details>
-<summary>Medication Detail</summary>
-
-View medication details, stock information, and intake schedule.
-
-<img src="docs/screenshots/medication-detail-modal.png" alt="Medication Detail Modal" width="100%" />
-
-</details>
-
-<details>
-<summary>Medications & Edit Form</summary>
-
-Manage your medications with the edit form and refill feature.
-
-<img src="docs/screenshots/medications-edit-desktop.png" alt="Medications Edit Form" width="100%" />
-
-</details>
-
-<details>
-<summary>Demand Calculator (Planner)</summary>
-
-Calculate how many pills you need for a specific date range.
-
-<img src="docs/screenshots/planner-desktop.png" alt="Planner - Demand Calculator" width="100%" />
-
-</details>
-
-<details>
-<summary>Shared Schedule</summary>
-
-Share your medication schedule with others via a public link.
-
-<img src="docs/screenshots/share-schedule-desktop.png" alt="Shared Schedule" width="100%" />
-
-</details>
-
-<details>
-<summary>Mobile Views</summary>
-
-<table>
-  <tr>
-    <td align="center" width="33%">
-      <strong>Dashboard</strong><br>
-      <img src="docs/screenshots/dashboard-mobile.png" alt="Mobile Dashboard" width="100%" />
-    </td>
-    <td align="center" width="33%">
-      <strong>Medications</strong><br>
-      <img src="docs/screenshots/medications-mobile.png" alt="Mobile Medications" width="100%" />
-    </td>
-    <td align="center" width="33%">
-      <strong>Schedule</strong><br>
-      <img src="docs/screenshots/schedule-mobile.png" alt="Mobile Schedule" width="100%" />
-    </td>
-  </tr>
-</table>
-
-</details>
-
-</blockquote>
-</details>
-
 ### Smart Inventory
-- Track exact stock: packs, blisters, bottles, and loose pills
+- Track exact stock: packs, blisters, and loose pills
 - Display remaining days of supply
 - Automatic calculation based on intake schedule
 
-### Medication Refill
-- One-click refill with pack or loose pill options
-- Complete refill history per medication
-- Automatic stock updates after each refill
-
 ### Flexible Schedules
 - Daily, weekly, or custom intervals per medication
 - Independent schedules for each medication
@@ -141,20 +55,14 @@ Share your medication schedule with others via a public link.
 ### Trip Planner
 - Calculate how many pills you need for a trip or date range
 - Plan ahead for vacations, business trips, or hospital stays
-- Send demand reports via email or push notification
 
 ### Multi-Person Support
 - Manage medications for multiple people
 - Share schedules via link. Recipients can mark doses as taken, you see it live
 
-### Data Export & Import
-- Export all your data (medications, dose history, settings) as JSON
-- Import previously exported data with automatic ID remapping
-- Choose whether to include sensitive data in exports
-
 ### Notifications
 - Email via SMTP
-- Push notifications via ntfy, Pushover, Gotify, Telegram, Discord & more ([Shoutrrr](https://containrrr.dev/shoutrrr/))
+- Push notifications via ntfy, Gotify, Telegram, Discord (Shoutrrr)
 - Supports both stock warnings and intake reminders
 
 ### Privacy & Security
@@ -240,62 +148,6 @@ Generate secrets with: `openssl rand -hex 32`
 | `REMINDER_MINUTES_BEFORE` | `15` | Minutes before intake to send reminder |
 | `EXPIRY_WARNING_DAYS` | `30` | Days before expiry to show warning |
 
-### Push Notifications (Shoutrrr)
-
-MedAssist uses [Shoutrrr](https://containrrr.dev/shoutrrr/) for push notifications, supporting many services with a single URL format.
-
-**Supported services:** ntfy, Pushover, Gotify, Discord, Telegram, Slack, Matrix, and [many more](https://containrrr.dev/shoutrrr/v0.8/services/overview/).
-
-Configure push notifications in Settings → Push, or set defaults via environment variables:
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `DEFAULT_SHOUTRRR_ENABLED` | `false` | Enable push notifications by default |
-| `DEFAULT_SHOUTRRR_URL` | — | Shoutrrr URL (see examples below) |
-| `DEFAULT_SHOUTRRR_STOCK_REMINDERS` | `true` | Send stock warnings via push |
-| `DEFAULT_SHOUTRRR_INTAKE_REMINDERS` | `true` | Send intake reminders via push |
-
-### Default User Settings
-
-These defaults are applied when a new user is created. Once a user saves settings in the app, their values take precedence.
-
-| Variable | Default | Description |
-|----------|---------|-------------|
-| `DEFAULT_SHARE_STOCK_STATUS` | `true` | Show stock status (Normal/Low/Critical) on shared schedule links |
-
-#### URL Examples
-
-**ntfy** (free, self-hostable):
-```
-ntfy://ntfy.sh/your-topic
-ntfy://user:password@your-server.com/topic
-```
-
-**Pushover** (free app for iOS/Android):
-```
-pushover://shoutrrr:API_TOKEN@USER_KEY/
-```
-Get your keys at [pushover.net](https://pushover.net/):
-- **User Key**: Shown on your dashboard (top right)
-- **API Token**: Create an application → copy the API Token
-
-**Gotify** (self-hosted):
-```
-gotify://your-server.com/TOKEN
-```
-
-**Discord**:
-```
-discord://TOKEN@WEBHOOK_ID
-```
-
-**Telegram**:
-```
-telegram://TOKEN@telegram?chats=CHAT_ID
-```
-
-For all services and options, see the [Shoutrrr documentation](https://containrrr.dev/shoutrrr/v0.8/services/overview/).
-
 # Development
 
 ```bash

backend/.dockerignore

@@ -1,35 +0,0 @@
-# Dependencies
-node_modules/
-
-# Build outputs
-dist/
-coverage/
-
-# Development files
-*.log
-npm-debug.log*
-
-# Test files
-src/test/
-*.test.ts
-vitest.config.ts
-
-# Local data (mounted as volume in production)
-data/
-
-# IDE
-.vscode/
-.idea/
-
-# OS files
-.DS_Store
-Thumbs.db
-
-# Git
-.git/
-.gitignore
-
-# Docker
-Dockerfile
-.dockerignore
-docker-compose*.yml

backend/Dockerfile

@@ -46,9 +46,6 @@ COPY --from=builder /app/node_modules ./node_modules
 COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/package.json ./
 
-# Copy drizzle migrations folder (required for database setup)
-COPY drizzle ./drizzle
-
 # Create data directory and set ownership to node user (UID 1000)
 RUN mkdir -p /app/data && chown -R node:node /app
 

backend/drizzle.config.ts

@@ -1,10 +0,0 @@
-import { defineConfig } from "drizzle-kit";
-
-export default defineConfig({
-  schema: "./src/db/schema.ts",
-  out: "./drizzle",
-  dialect: "sqlite",
-  dbCredentials: {
-    url: process.env.DATABASE_URL || "./data/medassist-ng.db",
-  },
-});

backend/drizzle/0000_init.sql

@@ -1,112 +0,0 @@
-CREATE TABLE `dose_tracking` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`user_id` integer NOT NULL,
-	`dose_id` text(255) NOT NULL,
-	`taken_at` integer DEFAULT (strftime('%s','now')) NOT NULL,
-	`marked_by` text(100),
-	`dismissed` integer DEFAULT false NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE TABLE `medications` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`user_id` integer NOT NULL,
-	`name` text(100) NOT NULL,
-	`generic_name` text(100),
-	`taken_by_json` text DEFAULT '[]' NOT NULL,
-	`pack_count` integer DEFAULT 1 NOT NULL,
-	`blisters_per_pack` integer DEFAULT 1 NOT NULL,
-	`pills_per_blister` integer DEFAULT 1 NOT NULL,
-	`loose_tablets` integer DEFAULT 0 NOT NULL,
-	`pill_weight_mg` integer,
-	`usage_json` text DEFAULT '[]' NOT NULL,
-	`every_json` text DEFAULT '[]' NOT NULL,
-	`start_json` text DEFAULT '[]' NOT NULL,
-	`image_url` text,
-	`expiry_date` text,
-	`notes` text,
-	`intake_reminders_enabled` integer DEFAULT false NOT NULL,
-	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE TABLE `refill_history` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`medication_id` integer NOT NULL,
-	`user_id` integer NOT NULL,
-	`packs_added` integer DEFAULT 0 NOT NULL,
-	`loose_pills_added` integer DEFAULT 0 NOT NULL,
-	`refill_date` integer DEFAULT (strftime('%s','now')) NOT NULL,
-	FOREIGN KEY (`medication_id`) REFERENCES `medications`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE TABLE `refresh_tokens` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`user_id` integer NOT NULL,
-	`token_id` text(255) NOT NULL,
-	`expires_at` integer NOT NULL,
-	`rotated_at` integer,
-	`revoked` integer DEFAULT false NOT NULL,
-	`created_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `refresh_tokens_token_id_unique` ON `refresh_tokens` (`token_id`);--> statement-breakpoint
-CREATE TABLE `share_tokens` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`user_id` integer NOT NULL,
-	`token` text(64) NOT NULL,
-	`taken_by` text(100) NOT NULL,
-	`schedule_days` integer DEFAULT 30 NOT NULL,
-	`created_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`expires_at` integer,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `share_tokens_token_unique` ON `share_tokens` (`token`);--> statement-breakpoint
-CREATE TABLE `user_settings` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`user_id` integer NOT NULL,
-	`email_enabled` integer DEFAULT false NOT NULL,
-	`notification_email` text,
-	`email_stock_reminders` integer DEFAULT true NOT NULL,
-	`email_intake_reminders` integer DEFAULT true NOT NULL,
-	`shoutrrr_enabled` integer DEFAULT false NOT NULL,
-	`shoutrrr_url` text,
-	`shoutrrr_stock_reminders` integer DEFAULT true NOT NULL,
-	`shoutrrr_intake_reminders` integer DEFAULT true NOT NULL,
-	`reminder_days_before` integer DEFAULT 7 NOT NULL,
-	`repeat_daily_reminders` integer DEFAULT false NOT NULL,
-	`skip_reminders_for_taken_doses` integer DEFAULT false NOT NULL,
-	`repeat_reminders_enabled` integer DEFAULT false NOT NULL,
-	`reminder_repeat_interval_minutes` integer DEFAULT 30 NOT NULL,
-	`max_nagging_reminders` integer DEFAULT 5 NOT NULL,
-	`low_stock_days` integer DEFAULT 30 NOT NULL,
-	`normal_stock_days` integer DEFAULT 90 NOT NULL,
-	`high_stock_days` integer DEFAULT 180 NOT NULL,
-	`expiry_warning_days` integer DEFAULT 90 NOT NULL,
-	`language` text(10) DEFAULT 'en' NOT NULL,
-	`stock_calculation_mode` text(20) DEFAULT 'automatic' NOT NULL,
-	`last_auto_email_sent` text,
-	`last_notification_type` text,
-	`last_notification_channel` text,
-	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	FOREIGN KEY (`user_id`) REFERENCES `users`(`id`) ON UPDATE no action ON DELETE cascade
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `user_settings_user_id_unique` ON `user_settings` (`user_id`);--> statement-breakpoint
-CREATE TABLE `users` (
-	`id` integer PRIMARY KEY AUTOINCREMENT NOT NULL,
-	`username` text(100) NOT NULL,
-	`password_hash` text(255),
-	`avatar_url` text(255),
-	`auth_provider` text(50) DEFAULT 'local' NOT NULL,
-	`oidc_subject` text(255),
-	`is_active` integer DEFAULT true NOT NULL,
-	`last_login_at` integer,
-	`created_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL,
-	`updated_at` integer DEFAULT CURRENT_TIMESTAMP NOT NULL
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `users_username_unique` ON `users` (`username`);

backend/drizzle/0001_add_stock_adjustment.sql

@@ -1 +0,0 @@
-ALTER TABLE `medications` ADD `stock_adjustment` integer DEFAULT 0 NOT NULL;

backend/drizzle/0002_add_last_stock_correction_at.sql

@@ -1 +0,0 @@
-ALTER TABLE `medications` ADD `last_stock_correction_at` integer;

backend/drizzle/0003_add_reminder_info_columns.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `medications` ADD `dismissed_until` text;--> statement-breakpoint
-ALTER TABLE `user_settings` ADD `last_reminder_med_name` text;--> statement-breakpoint
-ALTER TABLE `user_settings` ADD `last_reminder_taken_by` text;

backend/drizzle/0004_add_package_type.sql

@@ -1,3 +0,0 @@
--- Add package type support (blister vs bottle)
-ALTER TABLE medications ADD COLUMN package_type TEXT DEFAULT 'blister' NOT NULL;
-ALTER TABLE medications ADD COLUMN total_pills INTEGER;

backend/drizzle/0005_add_intakes_json.sql

@@ -1,3 +0,0 @@
--- Add dose_unit column and intakes JSON array for per-intake takenBy support
-ALTER TABLE `medications` ADD `dose_unit` text(20) DEFAULT 'mg';--> statement-breakpoint
-ALTER TABLE `medications` ADD `intakes_json` text DEFAULT '[]' NOT NULL;

backend/drizzle/0006_add_stock_reminder_tracking.sql

@@ -1,3 +0,0 @@
-ALTER TABLE `user_settings` ADD `last_stock_reminder_sent` text;--> statement-breakpoint
-ALTER TABLE `user_settings` ADD `last_stock_reminder_channel` text;--> statement-breakpoint
-ALTER TABLE `user_settings` ADD `last_stock_reminder_med_names` text;

backend/drizzle/0007_add_share_stock_status.sql

@@ -1 +0,0 @@
-ALTER TABLE `user_settings` ADD `share_stock_status` integer DEFAULT true NOT NULL;

backend/drizzle/meta/0000_snapshot.json

@@ -1,819 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "0e7f882c-b6e8-4d7b-a6a8-a076969c3e76",
-  "prevId": "00000000-0000-0000-0000-000000000000",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/0001_snapshot.json

@@ -1,827 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "bcb60728-38c0-4965-adac-829c02240d89",
-  "prevId": "0e7f882c-b6e8-4d7b-a6a8-a076969c3e76",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stock_adjustment": {
-          "name": "stock_adjustment",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/0002_snapshot.json

@@ -1,834 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "098ee506-e43d-4ccb-bee5-c387905695ab",
-  "prevId": "bcb60728-38c0-4965-adac-829c02240d89",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stock_adjustment": {
-          "name": "stock_adjustment",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_stock_correction_at": {
-          "name": "last_stock_correction_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/0003_snapshot.json

@@ -1,855 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "4f1d8273-1e60-4da1-9bfc-bd51c2784836",
-  "prevId": "098ee506-e43d-4ccb-bee5-c387905695ab",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stock_adjustment": {
-          "name": "stock_adjustment",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_stock_correction_at": {
-          "name": "last_stock_correction_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "dismissed_until": {
-          "name": "dismissed_until",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_med_name": {
-          "name": "last_reminder_med_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_taken_by": {
-          "name": "last_reminder_taken_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/0005_snapshot.json

@@ -1,886 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "fb61e5fd-152d-4e61-8836-e2fd1d28e3f0",
-  "prevId": "4f1d8273-1e60-4da1-9bfc-bd51c2784836",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "package_type": {
-          "name": "package_type",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'blister'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "total_pills": {
-          "name": "total_pills",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stock_adjustment": {
-          "name": "stock_adjustment",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_stock_correction_at": {
-          "name": "last_stock_correction_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dose_unit": {
-          "name": "dose_unit",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'mg'"
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "intakes_json": {
-          "name": "intakes_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "dismissed_until": {
-          "name": "dismissed_until",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_med_name": {
-          "name": "last_reminder_med_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_taken_by": {
-          "name": "last_reminder_taken_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/0006_snapshot.json

@@ -1,907 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "7cd75e33-b3d8-4930-a60b-2a0a9f644c6d",
-  "prevId": "fb61e5fd-152d-4e61-8836-e2fd1d28e3f0",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "package_type": {
-          "name": "package_type",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'blister'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "total_pills": {
-          "name": "total_pills",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stock_adjustment": {
-          "name": "stock_adjustment",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_stock_correction_at": {
-          "name": "last_stock_correction_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dose_unit": {
-          "name": "dose_unit",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'mg'"
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "intakes_json": {
-          "name": "intakes_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "dismissed_until": {
-          "name": "dismissed_until",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_med_name": {
-          "name": "last_reminder_med_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_taken_by": {
-          "name": "last_reminder_taken_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_stock_reminder_sent": {
-          "name": "last_stock_reminder_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_stock_reminder_channel": {
-          "name": "last_stock_reminder_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_stock_reminder_med_names": {
-          "name": "last_stock_reminder_med_names",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/0007_snapshot.json

@@ -1,915 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "b6f1ee4b-cc31-4060-a4d4-bcd4fdc5bd87",
-  "prevId": "7cd75e33-b3d8-4930-a60b-2a0a9f644c6d",
-  "tables": {
-    "dose_tracking": {
-      "name": "dose_tracking",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dose_id": {
-          "name": "dose_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_at": {
-          "name": "taken_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        },
-        "marked_by": {
-          "name": "marked_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dismissed": {
-          "name": "dismissed",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "dose_tracking_user_id_users_id_fk": {
-          "name": "dose_tracking_user_id_users_id_fk",
-          "tableFrom": "dose_tracking",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "medications": {
-      "name": "medications",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "name": {
-          "name": "name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "generic_name": {
-          "name": "generic_name",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "taken_by_json": {
-          "name": "taken_by_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "package_type": {
-          "name": "package_type",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'blister'"
-        },
-        "pack_count": {
-          "name": "pack_count",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "blisters_per_pack": {
-          "name": "blisters_per_pack",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "pills_per_blister": {
-          "name": "pills_per_blister",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 1
-        },
-        "total_pills": {
-          "name": "total_pills",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "loose_tablets": {
-          "name": "loose_tablets",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "stock_adjustment": {
-          "name": "stock_adjustment",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "last_stock_correction_at": {
-          "name": "last_stock_correction_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "pill_weight_mg": {
-          "name": "pill_weight_mg",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "dose_unit": {
-          "name": "dose_unit",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'mg'"
-        },
-        "usage_json": {
-          "name": "usage_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "every_json": {
-          "name": "every_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "start_json": {
-          "name": "start_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "intakes_json": {
-          "name": "intakes_json",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'[]'"
-        },
-        "image_url": {
-          "name": "image_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "expiry_date": {
-          "name": "expiry_date",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "notes": {
-          "name": "notes",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "intake_reminders_enabled": {
-          "name": "intake_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "dismissed_until": {
-          "name": "dismissed_until",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "medications_user_id_users_id_fk": {
-          "name": "medications_user_id_users_id_fk",
-          "tableFrom": "medications",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refill_history": {
-      "name": "refill_history",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "medication_id": {
-          "name": "medication_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "packs_added": {
-          "name": "packs_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "loose_pills_added": {
-          "name": "loose_pills_added",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 0
-        },
-        "refill_date": {
-          "name": "refill_date",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(strftime('%s','now'))"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {
-        "refill_history_medication_id_medications_id_fk": {
-          "name": "refill_history_medication_id_medications_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "medications",
-          "columnsFrom": [
-            "medication_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        },
-        "refill_history_user_id_users_id_fk": {
-          "name": "refill_history_user_id_users_id_fk",
-          "tableFrom": "refill_history",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "refresh_tokens": {
-      "name": "refresh_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token_id": {
-          "name": "token_id",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rotated_at": {
-          "name": "rotated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "revoked": {
-          "name": "revoked",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "refresh_tokens_token_id_unique": {
-          "name": "refresh_tokens_token_id_unique",
-          "columns": [
-            "token_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "refresh_tokens_user_id_users_id_fk": {
-          "name": "refresh_tokens_user_id_users_id_fk",
-          "tableFrom": "refresh_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "share_tokens": {
-      "name": "share_tokens",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "token": {
-          "name": "token",
-          "type": "text(64)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "taken_by": {
-          "name": "taken_by",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "schedule_days": {
-          "name": "schedule_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "share_tokens_token_unique": {
-          "name": "share_tokens_token_unique",
-          "columns": [
-            "token"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "share_tokens_user_id_users_id_fk": {
-          "name": "share_tokens_user_id_users_id_fk",
-          "tableFrom": "share_tokens",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "user_settings": {
-      "name": "user_settings",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "user_id": {
-          "name": "user_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "email_enabled": {
-          "name": "email_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "notification_email": {
-          "name": "notification_email",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "email_stock_reminders": {
-          "name": "email_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "email_intake_reminders": {
-          "name": "email_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_enabled": {
-          "name": "shoutrrr_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "shoutrrr_url": {
-          "name": "shoutrrr_url",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "shoutrrr_stock_reminders": {
-          "name": "shoutrrr_stock_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "shoutrrr_intake_reminders": {
-          "name": "shoutrrr_intake_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "reminder_days_before": {
-          "name": "reminder_days_before",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 7
-        },
-        "repeat_daily_reminders": {
-          "name": "repeat_daily_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "skip_reminders_for_taken_doses": {
-          "name": "skip_reminders_for_taken_doses",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "repeat_reminders_enabled": {
-          "name": "repeat_reminders_enabled",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "reminder_repeat_interval_minutes": {
-          "name": "reminder_repeat_interval_minutes",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "max_nagging_reminders": {
-          "name": "max_nagging_reminders",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 5
-        },
-        "low_stock_days": {
-          "name": "low_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 30
-        },
-        "normal_stock_days": {
-          "name": "normal_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "high_stock_days": {
-          "name": "high_stock_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 180
-        },
-        "expiry_warning_days": {
-          "name": "expiry_warning_days",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": 90
-        },
-        "language": {
-          "name": "language",
-          "type": "text(10)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'en'"
-        },
-        "stock_calculation_mode": {
-          "name": "stock_calculation_mode",
-          "type": "text(20)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'automatic'"
-        },
-        "share_stock_status": {
-          "name": "share_stock_status",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_auto_email_sent": {
-          "name": "last_auto_email_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_type": {
-          "name": "last_notification_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_notification_channel": {
-          "name": "last_notification_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_med_name": {
-          "name": "last_reminder_med_name",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_reminder_taken_by": {
-          "name": "last_reminder_taken_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_stock_reminder_sent": {
-          "name": "last_stock_reminder_sent",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_stock_reminder_channel": {
-          "name": "last_stock_reminder_channel",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "last_stock_reminder_med_names": {
-          "name": "last_stock_reminder_med_names",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "user_settings_user_id_unique": {
-          "name": "user_settings_user_id_unique",
-          "columns": [
-            "user_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "user_settings_user_id_users_id_fk": {
-          "name": "user_settings_user_id_users_id_fk",
-          "tableFrom": "user_settings",
-          "tableTo": "users",
-          "columnsFrom": [
-            "user_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    },
-    "users": {
-      "name": "users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": true
-        },
-        "username": {
-          "name": "username",
-          "type": "text(100)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "password_hash": {
-          "name": "password_hash",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "avatar_url": {
-          "name": "avatar_url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "auth_provider": {
-          "name": "auth_provider",
-          "type": "text(50)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "'local'"
-        },
-        "oidc_subject": {
-          "name": "oidc_subject",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "is_active": {
-          "name": "is_active",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": true
-        },
-        "last_login_at": {
-          "name": "last_login_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "CURRENT_TIMESTAMP"
-        }
-      },
-      "indexes": {
-        "users_username_unique": {
-          "name": "users_username_unique",
-          "columns": [
-            "username"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {},
-      "checkConstraints": {}
-    }
-  },
-  "views": {},
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}

backend/drizzle/meta/_journal.json

@@ -1,62 +0,0 @@
-{
-  "version": "7",
-  "dialect": "sqlite",
-  "entries": [
-    {
-      "idx": 0,
-      "version": "6",
-      "when": 1768600500759,
-      "tag": "0000_init",
-      "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1768734577830,
-      "tag": "0001_add_stock_adjustment",
-      "breakpoints": true
-    },
-    {
-      "idx": 2,
-      "version": "6",
-      "when": 1768736677092,
-      "tag": "0002_add_last_stock_correction_at",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "6",
-      "when": 1769354512857,
-      "tag": "0003_add_reminder_info_columns",
-      "breakpoints": true
-    },
-    {
-      "idx": 4,
-      "version": "6",
-      "when": 1769886564000,
-      "tag": "0004_add_package_type",
-      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "6",
-      "when": 1769893708813,
-      "tag": "0005_add_intakes_json",
-      "breakpoints": true
-    },
-    {
-      "idx": 6,
-      "version": "6",
-      "when": 1770626907896,
-      "tag": "0006_add_stock_reminder_tracking",
-      "breakpoints": true
-    },
-    {
-      "idx": 7,
-      "version": "6",
-      "when": 1770659669121,
-      "tag": "0007_add_share_stock_status",
-      "breakpoints": true
-    }
-  ]
-}

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "medassist-ng-backend",
-  "version": "1.10.0",
+  "version": "1.1.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -10,11 +10,7 @@
     "migrate": "tsx src/db/migrate.ts",
     "test": "vitest",
     "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "lint": "npx biome check .",
-    "lint:fix": "npx biome check --write .",
-    "format": "npx biome format --write .",
-    "check": "npx biome check . && tsc --noEmit"
+    "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
     "@fastify/cookie": "^10.0.1",
@@ -28,19 +24,17 @@
     "@libsql/client": "^0.10.0",
     "argon2": "^0.40.0",
     "dotenv": "^16.4.5",
-    "drizzle-orm": "^0.45.1",
-    "fastify": "^5.7.3",
+    "drizzle-orm": "^0.32.2",
+    "fastify": "^5.0.0",
     "nodemailer": "^7.0.11",
     "openid-client": "^6.8.1",
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.12",
     "@types/node": "^22.7.4",
     "@types/nodemailer": "^6.4.21",
     "@types/supertest": "^6.0.2",
     "@vitest/coverage-v8": "^4.0.16",
-    "drizzle-kit": "^0.31.8",
     "supertest": "^7.0.0",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",

backend/src/db/client.ts

@@ -1,37 +1,109 @@
-import { existsSync, statSync } from "node:fs";
-import { resolve } from "node:path";
-import { type Client, createClient } from "@libsql/client";
-import dotenv from "dotenv";
+import { createClient, Client } from "@libsql/client";
 import { drizzle } from "drizzle-orm/libsql";
-import { log } from "../utils/logger.js";
-// Import utilities from db-utils (side-effect-free)
-import {
-	ensureDataDirectory,
-	ensureDefaultUser,
-	getDataDir,
-	getDbPaths,
-	repairOrphanedDoseIds,
-	repairTrailingHyphenDoseIds,
-	runAlterMigrations,
-	runDrizzleMigrations,
-} from "./db-utils.js";
+import { existsSync, mkdirSync, accessSync, constants, statSync, writeFileSync } from "fs";
+import { resolve } from "path";
+import dotenv from "dotenv";
+import { getTableCreationSQL } from "./schema-sql.js";
 
-// Re-export all utilities so existing imports from client.ts keep working
-export {
-	buildDbUrl,
-	ensureDataDirectory,
-	ensureDefaultUser,
-	getDataDir,
-	getDbPaths,
-	repairOrphanedDoseIds,
-	repairTrailingHyphenDoseIds,
-	runAlterMigrations,
-	runDrizzleMigrations,
-} from "./db-utils.js";
+dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
 
-// Load .env: try cwd first, then parent dir (for local dev running from backend/)
-const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
-dotenv.config({ path: envPath });
+// =============================================================================
+// Exported utility functions for testing
+// =============================================================================
+
+/** Build the database URL from a path */
+export function buildDbUrl(dbPath: string): string {
+  return `file:${dbPath}`;
+}
+
+/** Get data directory and database path */
+export function getDbPaths(cwd: string = process.cwd()): { dataDir: string; dbPath: string; url: string } {
+  const dataDir = resolve(cwd, "data");
+  const dbPath = resolve(dataDir, "medassist-ng.db");
+  const url = buildDbUrl(dbPath);
+  return { dataDir, dbPath, url };
+}
+
+/** Ensure data directory exists and is writable */
+export function ensureDataDirectory(dataDir: string): { success: boolean; error?: string } {
+  try {
+    if (!existsSync(dataDir)) {
+      mkdirSync(dataDir, { recursive: true });
+    }
+    
+    // Check if directory is writable
+    accessSync(dataDir, constants.W_OK);
+    
+    // Try to create a test file to verify write access
+    const testFile = resolve(dataDir, ".write-test");
+    writeFileSync(testFile, "test");
+    
+    return { success: true };
+  } catch (err: any) {
+    return { success: false, error: err.message };
+  }
+}
+
+/** Get the SQL statements for creating all tables (re-exported from schema-sql) */
+export { getTableCreationSQL } from "./schema-sql.js";
+
+/** Run table creation migrations on a client */
+export async function runTableMigrations(client: Client): Promise<{ success: boolean; errors: string[] }> {
+  const tableCreations = getTableCreationSQL();
+  const errors: string[] = [];
+
+  for (const sql of tableCreations) {
+    try {
+      await client.execute(sql);
+    } catch (e: any) {
+      errors.push(e.message);
+    }
+  }
+
+  // Run ALTER TABLE migrations for backward compatibility with older databases
+  // These add new columns to existing tables (silently fail if column already exists)
+  const alterMigrations = [
+    // Added in v1.x - repeat reminders and nagging settings
+    `ALTER TABLE user_settings ADD COLUMN skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0`,
+    `ALTER TABLE user_settings ADD COLUMN repeat_reminders_enabled integer NOT NULL DEFAULT 0`,
+    `ALTER TABLE user_settings ADD COLUMN reminder_repeat_interval_minutes integer NOT NULL DEFAULT 30`,
+    `ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`,
+  ];
+
+  for (const sql of alterMigrations) {
+    try {
+      await client.execute(sql);
+    } catch (e: any) {
+      // Silently ignore "duplicate column" errors - column already exists
+      if (!e.message?.includes("duplicate column")) {
+        errors.push(e.message);
+      }
+    }
+  }
+
+  return { success: errors.length === 0, errors };
+}
+
+/** Ensure default user exists for auth-disabled mode */
+export async function ensureDefaultUser(client: Client, authEnabled: boolean): Promise<boolean> {
+  if (authEnabled) {
+    return false; // No default user needed
+  }
+
+  try {
+    const result = await client.execute("SELECT id FROM users WHERE id = 1");
+    if (result.rows.length === 0) {
+      await client.execute(
+        "INSERT INTO users (id, username, auth_provider) VALUES (1, 'default', 'local')"
+      );
+      return true; // Created
+    }
+    return false; // Already exists
+  } catch (e: any) {
+    console.error(`[DB] Error creating default user:`, e.message);
+    return false;
+  }
+}
 
 // =============================================================================
 // Database initialization (runs on import)
@@ -40,34 +112,34 @@ dotenv.config({ path: envPath });
 // Use absolute path to ensure it works in Docker
 const { dataDir, dbPath, url } = getDbPaths();
 
-log.debug(`[DB] Data directory: ${dataDir}`);
-log.debug(`[DB] Database path: ${dbPath}`);
-log.debug(`[DB] Database URL: ${url}`);
+console.log(`[DB] Data directory: ${dataDir}`);
+console.log(`[DB] Database path: ${dbPath}`);
+console.log(`[DB] Database URL: ${url}`);
 
 // Ensure data directory exists and is writable
 const dirResult = ensureDataDirectory(dataDir);
 if (!dirResult.success) {
-	log.error(`[DB] ERROR: Cannot access data directory: ${dirResult.error}`);
-	log.error(`[DB] Please ensure the volume mount has correct permissions.`);
-	log.error(`[DB] Try running on host: sudo chown -R 1000:1000 ${dataDir}`);
+  console.error(`[DB] ERROR: Cannot access data directory: ${dirResult.error}`);
+  console.error(`[DB] Please ensure the volume mount has correct permissions.`);
+  console.error(`[DB] Try running on host: sudo chown -R 1000:1000 ${dataDir}`);
   process.exit(1);
 } else {
-	log.debug(`[DB] Data directory is writable`);
+  console.log(`[DB] Data directory is writable`);
   
   // Log directory stats
   const stats = statSync(dataDir);
-	log.debug(`[DB] Directory permissions: ${stats.mode.toString(8)}`);
-	log.debug(`[DB] Directory UID: ${stats.uid}, GID: ${stats.gid}`);
-	log.debug(`[DB] Write test successful`);
+  console.log(`[DB] Directory permissions: ${stats.mode.toString(8)}`);
+  console.log(`[DB] Directory UID: ${stats.uid}, GID: ${stats.gid}`);
+  console.log(`[DB] Write test successful`);
 }
 
 let client: Client;
 try {
   client = createClient({ url });
-	log.debug(`[DB] Database client created successfully`);
+  console.log(`[DB] Database client created successfully`);
 } catch (err: any) {
-	log.error(`[DB] ERROR: Failed to create database client: ${err.message}`);
-	log.error(`[DB] Database path: ${dbPath}`);
+  console.error(`[DB] ERROR: Failed to create database client: ${err.message}`);
+  console.error(`[DB] Database path: ${dbPath}`);
   process.exit(1);
 }
 
@@ -75,47 +147,17 @@ export const db = drizzle(client);
 
 // Auto-run migrations (self-healing database)
 async function runMigrations() {
-	// Run drizzle-kit generated migrations
-	log.info(`[DB] Running migrations...`);
-	const migrateResult = await runDrizzleMigrations(db);
-	if (!migrateResult.success) {
-		log.error(`[DB] Migration error: ${migrateResult.error}`);
-	} else if (migrateResult.warning) {
-		log.warn(`[DB] Migration warning: ${migrateResult.warning}`);
-	} else {
-		log.debug(`[DB] Drizzle migrations completed`);
-	}
-
-	// Run ALTER TABLE migrations for backward compatibility
-	const alterResult = await runAlterMigrations(client);
-	if (alterResult.errors.length > 0) {
-		alterResult.errors.forEach((err) => log.error(`[DB] ALTER migration error: ${err}`));
-	}
-	log.debug(`[DB] Tables verified/created`);
-
-	// Repair dose IDs with trailing hyphens (from frontend takenBy bug)
-	const trailingResult = await repairTrailingHyphenDoseIds(client);
-	if (trailingResult.repaired > 0) {
-		log.info(`[DB] Repaired ${trailingResult.repaired} dose IDs with trailing hyphens`);
-	}
-	if (trailingResult.errors.length > 0) {
-		trailingResult.errors.forEach((err) => log.error(`[DB] Trailing-hyphen repair error: ${err}`));
-	}
-
-	// Repair orphaned dose tracking IDs from past schedule changes
-	const repairResult = await repairOrphanedDoseIds(client);
-	if (repairResult.repaired > 0) {
-		log.info(`[DB] Repaired ${repairResult.repaired} orphaned dose tracking IDs`);
-	}
-	if (repairResult.errors.length > 0) {
-		repairResult.errors.forEach((err) => log.error(`[DB] Dose repair error: ${err}`));
+  const result = await runTableMigrations(client);
+  if (result.errors.length > 0) {
+    result.errors.forEach(err => console.error(`[DB] Table creation error:`, err));
   }
+  console.log(`[DB] Tables verified/created`);
 
   // If auth is disabled, ensure a default user exists (ID=1)
   const authEnabled = process.env.AUTH_ENABLED === "true";
   const created = await ensureDefaultUser(client, authEnabled);
   if (created) {
-		log.info(`[DB] Created default user for auth-disabled mode`);
+    console.log(`[DB] Created default user for auth-disabled mode`);
   }
 }
 

backend/src/db/db-utils.ts

@@ -1,358 +0,0 @@
-/**
- * Pure utility functions for database operations.
- * Separated from client.ts to allow importing without triggering
- * top-level database initialization side effects.
- */
-
-import { accessSync, constants, existsSync, mkdirSync, writeFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import type { Client } from "@libsql/client";
-import type { drizzle } from "drizzle-orm/libsql";
-import { migrate } from "drizzle-orm/libsql/migrator";
-import { parseIntakesJson, parseLocalDateTime } from "../utils/scheduler-utils.js";
-
-// Get migrations folder path (relative to this file's location)
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const migrationsFolder = resolve(__dirname, "../../drizzle");
-
-// =============================================================================
-// Path & Directory utilities
-// =============================================================================
-
-/**
- * Get the data directory path.
- *
- * Resolution order:
- * 1. DATA_DIR env var (set by docker-compose for containers)
- * 2. Monorepo detection: if ../docker-compose.yml exists, we're in backend/
- *    subdirectory → use ../data (project root's data folder)
- * 3. Fallback: resolve(cwd, "data") (running from project root or standalone)
- */
-export function getDataDir(cwd: string = process.cwd()): string {
-	// Docker containers set DATA_DIR explicitly
-	if (process.env.DATA_DIR) return resolve(process.env.DATA_DIR);
-
-	// Local dev: detect if we're in backend/ subdirectory of the monorepo
-	if (existsSync(resolve(cwd, "..", "docker-compose.yml"))) {
-		return resolve(cwd, "..", "data");
-	}
-
-	// Default: data/ relative to cwd (running from project root)
-	return resolve(cwd, "data");
-}
-
-/** Build the database URL from a path */
-export function buildDbUrl(dbPath: string): string {
-	return `file:${dbPath}`;
-}
-
-/** Get data directory and database path */
-export function getDbPaths(cwd: string = process.cwd()): { dataDir: string; dbPath: string; url: string } {
-	const dataDir = getDataDir(cwd);
-	const dbPath = resolve(dataDir, "medassist-ng.db");
-	const url = buildDbUrl(dbPath);
-	return { dataDir, dbPath, url };
-}
-
-/** Ensure data directory exists and is writable */
-export function ensureDataDirectory(dataDir: string): { success: boolean; error?: string } {
-	try {
-		if (!existsSync(dataDir)) {
-			mkdirSync(dataDir, { recursive: true });
-		}
-
-		// Check if directory is writable
-		accessSync(dataDir, constants.W_OK);
-
-		// Try to create a test file to verify write access
-		const testFile = resolve(dataDir, ".write-test");
-		writeFileSync(testFile, "test");
-
-		return { success: true };
-	} catch (err: any) {
-		return { success: false, error: err.message };
-	}
-}
-
-// =============================================================================
-// Migration utilities
-// =============================================================================
-
-/** Run drizzle-kit migrations on the database */
-export async function runDrizzleMigrations(
-	database: ReturnType<typeof drizzle>
-): Promise<{ success: boolean; error?: string; warning?: string }> {
-	try {
-		await migrate(database, { migrationsFolder });
-		return { success: true };
-	} catch (err: any) {
-		// If the error is about existing schema objects, the DB is already up-to-date
-		// This happens when ALTER migrations in client.ts have already added the columns,
-		// or when tables were created before drizzle migrations were introduced
-		if (err.message?.includes("duplicate column") || err.message?.includes("already exists")) {
-			return { success: true, warning: `Schema already up-to-date: ${err.message}` };
-		}
-		return { success: false, error: err.message };
-	}
-}
-
-/** Run ALTER TABLE migrations for backward compatibility with older databases */
-export async function runAlterMigrations(client: Client): Promise<{ success: boolean; errors: string[] }> {
-	const errors: string[] = [];
-
-	// These add new columns to existing tables (silently fail if column already exists)
-	const alterMigrations = [
-		// Added in v1.x - repeat reminders and nagging settings
-		`ALTER TABLE user_settings ADD COLUMN skip_reminders_for_taken_doses integer NOT NULL DEFAULT 0`,
-		`ALTER TABLE user_settings ADD COLUMN repeat_reminders_enabled integer NOT NULL DEFAULT 0`,
-		`ALTER TABLE user_settings ADD COLUMN reminder_repeat_interval_minutes integer NOT NULL DEFAULT 30`,
-		`ALTER TABLE user_settings ADD COLUMN max_nagging_reminders integer NOT NULL DEFAULT 5`,
-		// Added in v1.2.3 - dismiss missed doses without deducting stock
-		`ALTER TABLE dose_tracking ADD COLUMN dismissed integer NOT NULL DEFAULT 0`,
-		// Added in v1.3.x - stock calculation mode (automatic/manual)
-		`ALTER TABLE user_settings ADD COLUMN stock_calculation_mode text NOT NULL DEFAULT 'automatic'`,
-		// Added for stock correction - hidden offset that doesn't affect looseTablets
-		`ALTER TABLE medications ADD COLUMN stock_adjustment integer NOT NULL DEFAULT 0`,
-		// Added for stock correction - timestamp to ignore consumed doses before correction
-		`ALTER TABLE medications ADD COLUMN last_stock_correction_at integer`,
-		// Added in v1.5.1 - dismiss past doses until date (robust against timestamp changes)
-		`ALTER TABLE medications ADD COLUMN dismissed_until text`,
-		// Added for more detailed reminder info display
-		`ALTER TABLE user_settings ADD COLUMN last_reminder_med_name text`,
-		`ALTER TABLE user_settings ADD COLUMN last_reminder_taken_by text`,
-		// Added for package type support (blister vs bottle)
-		`ALTER TABLE medications ADD COLUMN package_type text NOT NULL DEFAULT 'blister'`,
-		`ALTER TABLE medications ADD COLUMN total_pills integer`,
-		// Added for dose unit selection (mg, g, mcg, ml, IU, etc.)
-		`ALTER TABLE medications ADD COLUMN dose_unit text DEFAULT 'mg'`,
-		// Added for intake-level takenBy: unified intakes structure
-		`ALTER TABLE medications ADD COLUMN intakes_json text NOT NULL DEFAULT '[]'`,
-		// Added for separate stock reminder tracking
-		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_sent text`,
-		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_channel text`,
-		`ALTER TABLE user_settings ADD COLUMN last_stock_reminder_med_names text`,
-		// Added for share stock visibility toggle
-		`ALTER TABLE user_settings ADD COLUMN share_stock_status integer NOT NULL DEFAULT 1`,
-	];
-
-	for (const sql of alterMigrations) {
-		try {
-			await client.execute(sql);
-		} catch (e: any) {
-			// Silently ignore "duplicate column" errors - column already exists
-			if (!e.message?.includes("duplicate column")) {
-				errors.push(e.message);
-			}
-		}
-	}
-
-	// Create tables that might be missing (silently fail if already exists)
-	const createTableMigrations = [
-		// Added in v1.3.x - refill history tracking
-		`CREATE TABLE IF NOT EXISTS refill_history (
-      id INTEGER PRIMARY KEY AUTOINCREMENT,
-      medication_id INTEGER NOT NULL REFERENCES medications(id) ON DELETE CASCADE,
-      user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
-      packs_added INTEGER NOT NULL DEFAULT 0,
-      loose_pills_added INTEGER NOT NULL DEFAULT 0,
-      refill_date INTEGER NOT NULL DEFAULT (strftime('%s','now'))
-    )`,
-	];
-
-	for (const sql of createTableMigrations) {
-		try {
-			await client.execute(sql);
-		} catch (e: any) {
-			// Silently ignore "table already exists" errors
-			if (!e.message?.includes("already exists")) {
-				errors.push(e.message);
-			}
-		}
-	}
-
-	return { success: errors.length === 0, errors };
-}
-
-// =============================================================================
-// User utilities
-// =============================================================================
-
-/** Ensure default user exists for auth-disabled mode */
-export async function ensureDefaultUser(client: Client, authEnabled: boolean): Promise<boolean> {
-	if (authEnabled) {
-		return false; // No default user needed
-	}
-
-	try {
-		const result = await client.execute("SELECT id FROM users WHERE id = 1");
-		if (result.rows.length === 0) {
-			await client.execute("INSERT INTO users (id, username, auth_provider) VALUES (1, 'default', 'local')");
-			return true; // Created
-		}
-		return false; // Already exists
-	} catch (e: any) {
-		console.error(`[DB] Error creating default user:`, e.message);
-		return false;
-	}
-}
-
-// =============================================================================
-// Startup repair: fix orphaned dose tracking IDs from past schedule changes
-// =============================================================================
-
-const MS_PER_DAY = 86_400_000;
-
-/**
- * Repair dose IDs that have a trailing hyphen caused by a frontend bug where
- * `[].toString()` produced an empty string, resulting in IDs like "5-0-1729123200000-"
- * instead of "5-0-1729123200000". This strips trailing hyphens from all dose IDs.
- *
- * This function is idempotent - safe to run on every startup.
- */
-export async function repairTrailingHyphenDoseIds(client: Client): Promise<{ repaired: number; errors: string[] }> {
-	const errors: string[] = [];
-	let repaired = 0;
-
-	try {
-		const result = await client.execute(
-			"UPDATE dose_tracking SET dose_id = RTRIM(dose_id, '-') WHERE dose_id LIKE '%-'"
-		);
-		repaired = result.rowsAffected;
-	} catch (e: any) {
-		errors.push(`Trailing-hyphen repair failed: ${e.message}`);
-	}
-
-	return { repaired, errors };
-}
-
-/**
- * Repair orphaned dose tracking IDs that no longer match the current intake schedule.
- * This fixes dose IDs that became invalid when a medication's schedule was changed
- * BEFORE the on-edit migration (PR #103) was introduced.
- *
- * For each medication, generates all valid schedule dateOnlyMs values from each intake's
- * start date up to today, then checks all dose_tracking entries. Any dose whose timestamp
- * doesn't match a valid schedule date is remapped to the nearest valid date.
- *
- * This function is idempotent - safe to run on every startup.
- */
-export async function repairOrphanedDoseIds(client: Client): Promise<{ repaired: number; errors: string[] }> {
-	const errors: string[] = [];
-	let repaired = 0;
-
-	try {
-		// Get all medications
-		const medsResult = await client.execute(
-			"SELECT id, intakes_json, usage_json, every_json, start_json, intake_reminders_enabled FROM medications"
-		);
-
-		if (medsResult.rows.length === 0) return { repaired, errors };
-
-		// Get all dose tracking entries
-		const dosesResult = await client.execute("SELECT id, dose_id FROM dose_tracking");
-		if (dosesResult.rows.length === 0) return { repaired, errors };
-
-		// Build a map of medId → dose entries for quick lookup
-		const dosesByMed = new Map<number, Array<{ id: number; doseId: string }>>();
-		for (const row of dosesResult.rows) {
-			const doseId = row.dose_id as string;
-			const parts = doseId.split("-");
-			if (parts.length < 3) continue;
-			const medId = parseInt(parts[0], 10);
-			if (Number.isNaN(medId)) continue;
-			if (!dosesByMed.has(medId)) dosesByMed.set(medId, []);
-			dosesByMed.get(medId)!.push({ id: row.id as number, doseId });
-		}
-
-		const now = new Date();
-		const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-
-		for (const med of medsResult.rows) {
-			const medId = med.id as number;
-			const medDoses = dosesByMed.get(medId);
-			if (!medDoses || medDoses.length === 0) continue;
-
-			// Parse intakes
-			const intakes = parseIntakesJson(
-				med.intakes_json as string | null,
-				{
-					usageJson: (med.usage_json as string) || "[]",
-					everyJson: (med.every_json as string) || "[]",
-					startJson: (med.start_json as string) || "[]",
-				},
-				(med.intake_reminders_enabled as number) === 1
-			);
-
-			if (intakes.length === 0) continue;
-
-			// For each intake index, build the set of valid dateOnlyMs values
-			const validDatesByIntake = new Map<number, Set<number>>();
-			for (let idx = 0; idx < intakes.length; idx++) {
-				const intake = intakes[idx];
-				const start = parseLocalDateTime(intake.start);
-				const every = intake.every;
-				if (every <= 0 || Number.isNaN(start.getTime())) continue;
-
-				const validDates = new Set<number>();
-				for (let d = new Date(start); d <= today; d.setDate(d.getDate() + every)) {
-					validDates.add(new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime());
-				}
-				validDatesByIntake.set(idx, validDates);
-			}
-
-			// Check each dose entry
-			for (const dose of medDoses) {
-				const parts = dose.doseId.split("-");
-				if (parts.length < 3) continue;
-
-				const intakeIdx = parseInt(parts[1], 10);
-				const dateOnlyMs = parseInt(parts[2], 10);
-				if (Number.isNaN(intakeIdx) || Number.isNaN(dateOnlyMs)) continue;
-
-				const validDates = validDatesByIntake.get(intakeIdx);
-				if (!validDates) continue; // Unknown intake index - skip
-
-				// Check if this dose's timestamp is valid
-				if (validDates.has(dateOnlyMs)) continue; // Already valid - nothing to do
-
-				// Orphaned dose - find the nearest valid schedule date
-				const intake = intakes[intakeIdx];
-				if (!intake) continue;
-
-				const halfInterval = (intake.every * MS_PER_DAY) / 2;
-				let bestMatch: number | null = null;
-				let bestDist = Infinity;
-
-				for (const validDate of validDates) {
-					const dist = Math.abs(validDate - dateOnlyMs);
-					if (dist < bestDist && dist <= halfInterval) {
-						bestDist = dist;
-						bestMatch = validDate;
-					}
-				}
-
-				if (bestMatch !== null) {
-					// Rebuild dose ID with new timestamp, preserving person suffix
-					const personSuffix = parts.length > 3 ? `-${parts.slice(3).join("-")}` : "";
-					const newDoseId = `${medId}-${intakeIdx}-${bestMatch}${personSuffix}`;
-
-					try {
-						await client.execute({
-							sql: "UPDATE dose_tracking SET dose_id = ? WHERE id = ?",
-							args: [newDoseId, dose.id],
-						});
-						repaired++;
-					} catch (e: any) {
-						errors.push(`Failed to repair dose ${dose.id}: ${e.message}`);
-					}
-				}
-			}
-		}
-	} catch (e: any) {
-		errors.push(`Repair failed: ${e.message}`);
-	}
-
-	return { repaired, errors };
-}

backend/src/db/migrate.ts

@@ -1,59 +1,48 @@
-import { existsSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import { type Client, createClient } from "@libsql/client";
+import { createClient, Client } from "@libsql/client";
 import dotenv from "dotenv";
-import { drizzle } from "drizzle-orm/libsql";
-import { migrate } from "drizzle-orm/libsql/migrator";
+import fs from "fs";
+import path from "path";
+import { getTableCreationSQL } from "./schema-sql.js";
 
-// Load .env: try cwd first, then parent dir (for local dev running from backend/)
-const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
-dotenv.config({ path: envPath });
-
-// Get migrations folder path (relative to this file's location)
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const migrationsFolder = resolve(__dirname, "../../drizzle");
+dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
 
 // =============================================================================
 // Exported utility functions for testing
 // =============================================================================
 
-/** Split SQL string into individual statements (for backwards compatibility with tests) */
+/** Get the full migration SQL string (re-exported from schema-sql) */
+export { getTableCreationSQL };
+
+/** Split SQL string into individual statements */
 export function splitSQLStatements(sql: string): string[] {
-	return sql.split(";").filter((s) => s.trim().length > 0);
+  return sql.split(';').filter(s => s.trim().length > 0);
 }
 
-/** Execute drizzle migrations on a database */
-export async function executeMigration(
-	client: Client
-): Promise<{ success: boolean; executed: number; errors: string[] }> {
+/** Execute migration statements on a client */
+export async function executeMigration(client: Client): Promise<{ success: boolean; executed: number; errors: string[] }> {
+  const statements = getTableCreationSQL();
   const errors: string[] = [];
-	const db = drizzle(client);
+  let executed = 0;
 
+  for (const stmt of statements) {
     try {
-		await migrate(db, { migrationsFolder });
-
-		// Count tables as a proxy for "executed" statements
-		const tables = await client.execute(
-			"SELECT COUNT(*) as count FROM sqlite_master WHERE type='table' AND name NOT LIKE 'sqlite_%' AND name NOT LIKE '__drizzle%'"
-		);
-		const executed = Number(tables.rows[0].count) || 0;
-
-		return { success: true, executed, errors };
+      await client.execute(stmt);
+      executed++;
     } catch (err: any) {
       errors.push(err.message);
-		return { success: false, executed: 0, errors };
     }
   }
 
+  return { success: errors.length === 0, executed, errors };
+}
+
 /** Get a preview of statement (first N characters) */
 export function getStatementPreview(stmt: string, maxLength: number = 50): string {
   const trimmed = stmt.trim();
   if (trimmed.length <= maxLength) {
     return trimmed;
   }
-	return `${trimmed.substring(0, maxLength)}...`;
+  return trimmed.substring(0, maxLength) + "...";
 }
 
 // =============================================================================
@@ -63,17 +52,19 @@ export function getStatementPreview(stmt: string, maxLength: number = 50): strin
 const url = "file:./data/medassist-ng.db";
 
 async function main() {
-	console.log("[DB] Starting database setup...");
-	console.log("[DB] Database URL:", url);
-	console.log("[DB] Migrations folder:", migrationsFolder);
+  console.log("Starting database setup...");
+  console.log("Database URL:", url);
   
   const client = createClient({ url });
-	const db = drizzle(client);
   
-	console.log("[DB] Running drizzle migrations...");
-	await migrate(db, { migrationsFolder });
+  const statements = getTableCreationSQL();
   
-	console.log("[DB] Database setup complete!");
+  for (const stmt of statements) {
+    console.log("Executing:", getStatementPreview(stmt));
+    await client.execute(stmt);
+  }
+
+  console.log("Database setup complete!");
   process.exit(0);
 }
 

backend/src/db/schema-sql.ts

@@ -97,17 +97,6 @@ export function getTableCreationSQL(): string[] {
       dose_id text NOT NULL,
       taken_at integer NOT NULL DEFAULT (strftime('%s','now')),
       marked_by text,
-      dismissed integer NOT NULL DEFAULT 0,
-      FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
-    )`,
-		`CREATE TABLE IF NOT EXISTS refill_history (
-      id integer PRIMARY KEY AUTOINCREMENT,
-      medication_id integer NOT NULL,
-      user_id integer NOT NULL,
-      packs_added integer NOT NULL DEFAULT 0,
-      loose_pills_added integer NOT NULL DEFAULT 0,
-      refill_date integer NOT NULL DEFAULT (strftime('%s','now')),
-      FOREIGN KEY (medication_id) REFERENCES medications(id) ON DELETE CASCADE,
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
   ];

backend/src/db/schema.ts

@@ -1,5 +1,5 @@
+import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
 import { sql } from "drizzle-orm";
-import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core";
 
 // =============================================================================
 // Users - Simple auth, no roles (every user is equal)
@@ -22,32 +22,22 @@ export const users = sqliteTable("users", {
 // =============================================================================
 export const medications = sqliteTable("medications", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-	userId: integer("user_id")
-		.notNull()
-		.references(() => users.id, { onDelete: "cascade" }),
+  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
   name: text("name", { length: 100 }).notNull(),
   genericName: text("generic_name", { length: 100 }),
   takenByJson: text("taken_by_json").notNull().default("[]"), // JSON array of person names
-	packageType: text("package_type", { length: 20 }).notNull().default("blister"), // 'blister' or 'bottle'
   packCount: integer("pack_count").notNull().default(1),
   blistersPerPack: integer("blisters_per_pack").notNull().default(1),
   pillsPerBlister: integer("pills_per_blister").notNull().default(1),
-	totalPills: integer("total_pills"), // For bottle type: total capacity of the container
-	looseTablets: integer("loose_tablets").notNull().default(0), // For blister: extra loose pills; for bottle: current stock
-	stockAdjustment: integer("stock_adjustment").notNull().default(0), // Hidden offset from stock corrections
-	lastStockCorrectionAt: integer("last_stock_correction_at", { mode: "timestamp" }), // When stock was last corrected - consumed doses before this don't count
+  looseTablets: integer("loose_tablets").notNull().default(0),
   pillWeightMg: integer("pill_weight_mg"),
-	doseUnit: text("dose_unit", { length: 20 }).default("mg"), // Unit for the dose (mg, g, mcg, ml, IU, etc.)
-	usageJson: text("usage_json").notNull().default("[]"), // DEPRECATED: Use intakesJson instead
-	everyJson: text("every_json").notNull().default("[]"), // DEPRECATED: Use intakesJson instead
-	startJson: text("start_json").notNull().default("[]"), // DEPRECATED: Use intakesJson instead
-	// New unified intakes structure: [{usage, every, start, takenBy, intakeRemindersEnabled}]
-	intakesJson: text("intakes_json").notNull().default("[]"),
+  usageJson: text("usage_json").notNull().default("[]"),
+  everyJson: text("every_json").notNull().default("[]"),
+  startJson: text("start_json").notNull().default("[]"),
   imageUrl: text("image_url"),
   expiryDate: text("expiry_date"),
   notes: text("notes"),
   intakeRemindersEnabled: integer("intake_reminders_enabled", { mode: "boolean" }).notNull().default(false),
-	dismissedUntil: text("dismissed_until"), // ISO date string (e.g. "2026-01-23") - all past doses until this date are dismissed
   updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
 });
 
@@ -56,10 +46,7 @@ export const medications = sqliteTable("medications", {
 // =============================================================================
 export const userSettings = sqliteTable("user_settings", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-	userId: integer("user_id")
-		.notNull()
-		.unique()
-		.references(() => users.id, { onDelete: "cascade" }),
+  userId: integer("user_id").notNull().unique().references(() => users.id, { onDelete: "cascade" }),
   // Email notifications
   emailEnabled: integer("email_enabled", { mode: "boolean" }).notNull().default(false),
   notificationEmail: text("notification_email"),
@@ -81,23 +68,14 @@ export const userSettings = sqliteTable("user_settings", {
   lowStockDays: integer("low_stock_days").notNull().default(30),
   normalStockDays: integer("normal_stock_days").notNull().default(90),
   highStockDays: integer("high_stock_days").notNull().default(180),
-	expiryWarningDays: integer("expiry_warning_days").notNull().default(90),
   // UI preferences
   language: text("language", { length: 10 }).notNull().default("en"),
   // Stock calculation mode: "automatic" (schedule-based) or "manual" (only marked doses)
   stockCalculationMode: text("stock_calculation_mode", { length: 20 }).notNull().default("automatic"),
-	// Whether shared schedule links show stock status (Critical/Low/Normal) to intake users
-	shareStockStatus: integer("share_stock_status", { mode: "boolean" }).notNull().default(true),
-	// Last notification tracking (intake reminders)
+  // Last notification tracking
   lastAutoEmailSent: text("last_auto_email_sent"),
   lastNotificationType: text("last_notification_type"),
   lastNotificationChannel: text("last_notification_channel"),
-	lastReminderMedName: text("last_reminder_med_name"),
-	lastReminderTakenBy: text("last_reminder_taken_by"),
-	// Last stock reminder tracking (separate from intake)
-	lastStockReminderSent: text("last_stock_reminder_sent"),
-	lastStockReminderChannel: text("last_stock_reminder_channel"),
-	lastStockReminderMedNames: text("last_stock_reminder_med_names"),
   // Timestamps
   updatedAt: integer("updated_at", { mode: "timestamp" }).notNull().default(sql`CURRENT_TIMESTAMP`),
 });
@@ -107,9 +85,7 @@ export const userSettings = sqliteTable("user_settings", {
 // =============================================================================
 export const refreshTokens = sqliteTable("refresh_tokens", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-	userId: integer("user_id")
-		.notNull()
-		.references(() => users.id, { onDelete: "cascade" }),
+  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
   tokenId: text("token_id", { length: 255 }).notNull().unique(),
   expiresAt: integer("expires_at", { mode: "timestamp" }).notNull(),
   rotatedAt: integer("rotated_at", { mode: "timestamp" }),
@@ -122,9 +98,7 @@ export const refreshTokens = sqliteTable("refresh_tokens", {
 // =============================================================================
 export const shareTokens = sqliteTable("share_tokens", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-	userId: integer("user_id")
-		.notNull()
-		.references(() => users.id, { onDelete: "cascade" }),
+  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
   token: text("token", { length: 64 }).notNull().unique(),
   takenBy: text("taken_by", { length: 100 }).notNull(),
   scheduleDays: integer("schedule_days").notNull().default(30),
@@ -137,27 +111,8 @@ export const shareTokens = sqliteTable("share_tokens", {
 // =============================================================================
 export const doseTracking = sqliteTable("dose_tracking", {
   id: integer("id").primaryKey({ autoIncrement: true }),
-	userId: integer("user_id")
-		.notNull()
-		.references(() => users.id, { onDelete: "cascade" }),
+  userId: integer("user_id").notNull().references(() => users.id, { onDelete: "cascade" }),
   doseId: text("dose_id", { length: 255 }).notNull(), // e.g. "med-5-1-86400000-1735200000000"
   takenAt: integer("taken_at", { mode: "timestamp" }).notNull().default(sql`(strftime('%s','now'))`),
   markedBy: text("marked_by", { length: 100 }), // null = user, "Daniel" = via share link
-	dismissed: integer("dismissed", { mode: "boolean" }).notNull().default(false), // true = missed dose acknowledged without taking
-});
-
-// =============================================================================
-// Refill History - Tracks when medication stock was refilled
-// =============================================================================
-export const refillHistory = sqliteTable("refill_history", {
-	id: integer("id").primaryKey({ autoIncrement: true }),
-	medicationId: integer("medication_id")
-		.notNull()
-		.references(() => medications.id, { onDelete: "cascade" }),
-	userId: integer("user_id")
-		.notNull()
-		.references(() => users.id, { onDelete: "cascade" }),
-	packsAdded: integer("packs_added").notNull().default(0),
-	loosePillsAdded: integer("loose_pills_added").notNull().default(0),
-	refillDate: integer("refill_date", { mode: "timestamp" }).notNull().default(sql`(strftime('%s','now'))`),
 });

backend/src/i18n/translations.ts

@@ -1,92 +1,21 @@
 // Backend translations for notifications
 export type Language = "en" | "de";
 
-/**
- * Map timezone to region code (ISO 3166-1 alpha-2).
- * This allows combining app language with regional formatting.
- */
-const TIMEZONE_TO_REGION: Record<string, string> = {
-	// Europe
-	"Europe/Berlin": "DE",
-	"Europe/Vienna": "AT",
-	"Europe/Zurich": "CH",
-	"Europe/London": "GB",
-	"Europe/Dublin": "IE",
-	"Europe/Paris": "FR",
-	"Europe/Madrid": "ES",
-	"Europe/Rome": "IT",
-	"Europe/Amsterdam": "NL",
-	"Europe/Brussels": "BE",
-	"Europe/Warsaw": "PL",
-	"Europe/Prague": "CZ",
-	"Europe/Stockholm": "SE",
-	"Europe/Oslo": "NO",
-	"Europe/Copenhagen": "DK",
-	"Europe/Helsinki": "FI",
-	"Europe/Athens": "GR",
-	"Europe/Lisbon": "PT",
-	"Europe/Moscow": "RU",
-	"Europe/Kiev": "UA",
-	"Europe/Kyiv": "UA",
-	"Europe/Budapest": "HU",
-	"Europe/Bucharest": "RO",
-	// Americas
-	"America/New_York": "US",
-	"America/Chicago": "US",
-	"America/Denver": "US",
-	"America/Los_Angeles": "US",
-	"America/Phoenix": "US",
-	"America/Toronto": "CA",
-	"America/Vancouver": "CA",
-	"America/Mexico_City": "MX",
-	"America/Sao_Paulo": "BR",
-	"America/Buenos_Aires": "AR",
-	// Asia/Pacific
-	"Asia/Tokyo": "JP",
-	"Asia/Shanghai": "CN",
-	"Asia/Hong_Kong": "HK",
-	"Asia/Singapore": "SG",
-	"Asia/Seoul": "KR",
-	"Asia/Dubai": "AE",
-	"Asia/Kolkata": "IN",
-	"Australia/Sydney": "AU",
-	"Australia/Melbourne": "AU",
-	"Pacific/Auckland": "NZ",
-};
-
-/**
- * Get region code from TZ environment variable.
- */
-function getRegionFromTimezone(): string | undefined {
-	const tz = process.env.TZ;
-	if (!tz) return undefined;
-	return TIMEZONE_TO_REGION[tz];
-}
-
 type TranslationKeys = {
-	// Stock reminder (shared across email + push)
+  // Stock reminder email
   stockReminder: {
     subject: string;
     title: string;
     description: string;
-		descriptionEmpty: string;
-		descriptionMixed: string;
     alertSingle: string;
     alertMultiple: string;
-		alertEmptySingle: string;
-		alertEmptyMultiple: string;
-		alertLowSingle: string;
-		alertLowMultiple: string;
-		alertLowStockSingle: string;
-		alertLowStockMultiple: string;
-		descriptionLow: string;
     tableHeaders: {
       medication: string;
       pills: string;
       days: string;
       runsOut: string;
     };
-		now: string;
+    footer: string;
     repeatDailyNote: string;
   };
   // Intake reminder email
@@ -103,6 +32,7 @@ type TranslationKeys = {
     };
     pills: string;
     takenBy: string;
+    footer: string;
   };
   // Push notifications
   push: {
@@ -115,68 +45,35 @@ type TranslationKeys = {
     repeatDailyNote: string;
     empty: string;
     low: string;
-		critical: string;
-		lowStock: string;
     reorderNow: string;
     emptySection: string;
     lowSection: string;
-		criticalSection: string;
-		lowStockSection: string;
-	};
-	// Demand calculator email
-	demandCalculator: {
-		subject: string;
-		title: string;
-		description: string;
-		summaryOutOfStock: string;
-		summaryAllOk: string;
-		tableHeaders: {
-			medication: string;
-			usage: string;
-			needed: string;
-			available: string;
-			status: string;
-		};
-		statusEnough: string;
-		statusEmpty: string;
   };
   // Common
   common: {
     pill: string;
     pills: string;
-		blister: string;
-		blisters: string;
     day: string;
     days: string;
     soon: string;
-		footer: string;
   };
 };
 
 const translations: Record<Language, TranslationKeys> = {
   en: {
     stockReminder: {
-			subject: "MedAssist-ng Auto-Reminder: {count} Medication{s} Running Critically Low",
+      subject: "MedAssist-ng Auto-Reminder: {count} Medication{s} Running Low",
       title: "⚠️ MedAssist-ng - Automatic Reorder Reminder",
-			description: "The following medications are running critically low and need to be reordered:",
-			descriptionEmpty: "The following medications are empty and need to be reordered immediately:",
-			descriptionMixed: "The following medications need to be reordered:",
-			alertSingle: "⚠️ 1 medication running critically low!",
-			alertMultiple: "⚠️ {count} medications running critically low!",
-			alertEmptySingle: "🚨 1 medication empty - reorder immediately!",
-			alertEmptyMultiple: "🚨 {count} medications empty - reorder immediately!",
-			alertLowSingle: "⚠️ 1 medication running critically low",
-			alertLowMultiple: "⚠️ {count} medications running critically low",
-			alertLowStockSingle: "⚠️ 1 medication running low",
-			alertLowStockMultiple: "⚠️ {count} medications running low",
-			descriptionLow: "The following medications are running low and should be reordered soon:",
+      description: "The following medications are running low and need to be reordered:",
+      alertSingle: "⚠️ 1 medication running low!",
+      alertMultiple: "⚠️ {count} medications running low!",
       tableHeaders: {
         medication: "Medication",
         pills: "Pills",
         days: "Days",
         runsOut: "Runs Out",
       },
-			now: "NOW",
+      footer: "🤖 Automatic reminder from MedAssist-ng",
       repeatDailyNote: "You are receiving this daily reminder because 'Repeat Daily' is enabled in settings.",
     },
     intakeReminder: {
@@ -192,77 +89,45 @@ const translations: Record<Language, TranslationKeys> = {
       },
       pills: "pills",
       takenBy: "for {name}",
+      footer: "🤖 Automatic reminder from MedAssist-ng",
     },
     push: {
-			stockTitle: "MedAssist-ng: 1 Medication Running Critically Low",
-			stockTitleMultiple: "MedAssist-ng: {count} Medications Running Critically Low",
-			intakeTitle: "💊 Reminder: Medication intake in {minutes} min",
+      stockTitle: "MedAssist-ng: 1 Medication Running Low",
+      stockTitleMultiple: "MedAssist-ng: {count} Medications Running Low",
+      intakeTitle: "💊 Medication Reminder in {minutes} min",
       pillsLeft: "{count} pills",
       daysLeft: "{count} days left",
       pillsAt: "{count} pills at {time}",
       repeatDailyNote: "(Daily reminder enabled)",
       empty: "Empty",
-			low: "Critical",
-			critical: "Critical",
-			lowStock: "Low",
+      low: "Low",
       reorderNow: "Reorder Now!",
-			emptySection: "Empty (reorder immediately)",
-			lowSection: "Running critically low",
-			criticalSection: "Running critically low",
-			lowStockSection: "Running low",
-		},
-		demandCalculator: {
-			subject: "MedAssist-ng - Supply Overview ({from} - {until})",
-			title: "MedAssist-ng - Demand Calculator",
-			description: "Supply overview from {from} to {until}",
-			summaryOutOfStock: "⚠️ {count} medication{s} will be out of stock during this period.",
-			summaryAllOk: "✓ All medications have sufficient supply for this period.",
-			tableHeaders: {
-				medication: "Medication",
-				usage: "Usage",
-				needed: "Blisters needed",
-				available: "Available",
-				status: "Status",
-			},
-			statusEnough: "✓ Enough",
-			statusEmpty: "✗ Empty",
+      emptySection: "EMPTY (reorder immediately)",
+      lowSection: "RUNNING LOW (reorder soon)",
     },
     common: {
       pill: "pill",
       pills: "pills",
-			blister: "blister",
-			blisters: "blisters",
       day: "day",
       days: "days",
       soon: "soon",
-			footer: "🤖 Sent from MedAssist-ng",
     },
   },
   de: {
     stockReminder: {
-			subject: "MedAssist-ng Auto-Erinnerung: {count} Medikament{e} kritisch niedrig",
+      subject: "MedAssist-ng Auto-Erinnerung: {count} Medikament{e} wird knapp",
       title: "⚠️ MedAssist-ng - Automatische Nachbestell-Erinnerung",
-			description: "Die folgenden Medikamente sind kritisch niedrig und sollten nachbestellt werden:",
-			descriptionEmpty: "Die folgenden Medikamente sind leer und müssen sofort nachbestellt werden:",
-			descriptionMixed: "Die folgenden Medikamente müssen nachbestellt werden:",
-			alertSingle: "⚠️ 1 Medikament kritisch niedrig!",
-			alertMultiple: "⚠️ {count} Medikamente kritisch niedrig!",
-			alertEmptySingle: "🚨 1 Medikament leer - sofort nachbestellen!",
-			alertEmptyMultiple: "🚨 {count} Medikamente leer - sofort nachbestellen!",
-			alertLowSingle: "⚠️ 1 Medikament kritisch niedrig",
-			alertLowMultiple: "⚠️ {count} Medikamente kritisch niedrig",
-			alertLowStockSingle: "⚠️ 1 Medikament niedrig",
-			alertLowStockMultiple: "⚠️ {count} Medikamente niedrig",
-			descriptionLow: "Die folgenden Medikamente werden knapp und sollten bald nachbestellt werden:",
+      description: "Die folgenden Medikamente gehen zur Neige und sollten nachbestellt werden:",
+      alertSingle: "⚠️ 1 Medikament wird knapp!",
+      alertMultiple: "⚠️ {count} Medikamente werden knapp!",
       tableHeaders: {
         medication: "Medikament",
         pills: "Tabletten",
         days: "Tage",
         runsOut: "Aufgebraucht",
       },
-			now: "JETZT",
-			repeatDailyNote:
-				"Sie erhalten diese tägliche Erinnerung, weil 'Täglich wiederholen' in den Einstellungen aktiviert ist.",
+      footer: "🤖 Automatische Erinnerung von MedAssist-ng",
+      repeatDailyNote: "Sie erhalten diese tägliche Erinnerung, weil 'Täglich wiederholen' in den Einstellungen aktiviert ist.",
     },
     intakeReminder: {
       subject: "MedAssist-ng: Einnahme-Erinnerung - {medications}",
@@ -277,50 +142,28 @@ const translations: Record<Language, TranslationKeys> = {
       },
       pills: "Tabletten",
       takenBy: "für {name}",
+      footer: "🤖 Automatische Erinnerung von MedAssist-ng",
     },
     push: {
-			stockTitle: "MedAssist-ng: 1 Medikament kritisch niedrig",
-			stockTitleMultiple: "MedAssist-ng: {count} Medikamente kritisch niedrig",
-			intakeTitle: "💊 Erinnerung: Medikamenteneinnahme in {minutes} Min.",
+      stockTitle: "MedAssist-ng: 1 Medikament wird knapp",
+      stockTitleMultiple: "MedAssist-ng: {count} Medikamente werden knapp",
+      intakeTitle: "💊 Einnahme-Erinnerung in {minutes} Min.",
       pillsLeft: "{count} Tabletten",
       daysLeft: "{count} Tage übrig",
       pillsAt: "{count} Tabletten um {time}",
       repeatDailyNote: "(Tägliche Erinnerung aktiviert)",
       empty: "Leer",
-			low: "Kritisch",
-			critical: "Kritisch",
-			lowStock: "Niedrig",
+      low: "Knapp",
       reorderNow: "Jetzt nachbestellen!",
-			emptySection: "Leer (sofort nachbestellen)",
-			lowSection: "Kritisch niedrig",
-			criticalSection: "Kritisch niedrig",
-			lowStockSection: "Niedrig",
-		},
-		demandCalculator: {
-			subject: "MedAssist-ng - Bestandsübersicht ({from} - {until})",
-			title: "MedAssist-ng - Bedarfsrechner",
-			description: "Bestandsübersicht von {from} bis {until}",
-			summaryOutOfStock: "⚠️ {count} Medikament{e} wird im Zeitraum nicht ausreichen.",
-			summaryAllOk: "✓ Alle Medikamente reichen für diesen Zeitraum.",
-			tableHeaders: {
-				medication: "Medikament",
-				usage: "Verbrauch",
-				needed: "Blister benötigt",
-				available: "Verfügbar",
-				status: "Status",
-			},
-			statusEnough: "✓ Ausreichend",
-			statusEmpty: "✗ Leer",
+      emptySection: "LEER (sofort nachbestellen)",
+      lowSection: "WIRD KNAPP (bald nachbestellen)",
     },
     common: {
       pill: "Tablette",
       pills: "Tabletten",
-			blister: "Blister",
-			blisters: "Blister",
       day: "Tag",
       days: "Tage",
       soon: "bald",
-			footer: "🤖 Gesendet von MedAssist-ng",
     },
   },
 };
@@ -338,58 +181,13 @@ export function t(template: string, params: Record<string, string | number> = {}
   return result;
 }
 
-/**
- * Get locale for formatting based on language and timezone region.
- * Combines language (en/de) with region from timezone (DE/US/etc.)
- * Example: lang=en + TZ=Europe/Berlin → en-DE (English text, German format = 24h time)
- */
+// Get date locale for toLocaleDateString
 export function getDateLocale(language: Language): string {
-	const region = getRegionFromTimezone();
-
-	if (region) {
-		return `${language}-${region}`;
-	}
-
-	// Fallback: use language default
   switch (language) {
     case "de":
       return "de-DE";
+    case "en":
     default:
       return "en-US";
   }
 }
-
-/**
- * Get the app URL from the first CORS_ORIGINS entry.
- * Falls back to empty string if not set.
- */
-export function getAppUrl(): string {
-	const origins = process.env.CORS_ORIGINS || "";
-	return origins.split(",")[0]?.trim() || "";
-}
-
-/**
- * Get the unified footer as HTML with MedAssist-ng as a link to the instance.
- * @param variant - 'planner' uses the Medication Planner footer text
- */
-export function getFooterHtml(language: Language): string {
-	const tr = getTranslations(language);
-	const appUrl = getAppUrl();
-	const appName = appUrl
-		? `<a href="${appUrl}" style="color: #6b7280; text-decoration: underline;">MedAssist-ng</a>`
-		: "MedAssist-ng";
-	return tr.common.footer.replace("MedAssist-ng", appName);
-}
-
-/**
- * Get the unified footer as plain text.
- * @param variant - 'planner' uses the Medication Planner footer text
- */
-export function getFooterPlain(language: Language): string {
-	const tr = getTranslations(language);
-	const appUrl = getAppUrl();
-	if (appUrl) {
-		return `${tr.common.footer} (${appUrl})`;
-	}
-	return tr.common.footer;
-}

backend/src/index.ts

@@ -1,47 +1,44 @@
-import { existsSync } from "node:fs";
-import { resolve } from "node:path";
-import cookie from "@fastify/cookie";
-import cors from "@fastify/cors";
+import Fastify, { FastifyInstance } from "fastify";
 import helmet from "@fastify/helmet";
-import jwt from "@fastify/jwt";
-import fastifyMultipart from "@fastify/multipart";
+import cors from "@fastify/cors";
 import rateLimit from "@fastify/rate-limit";
 import sensible from "@fastify/sensible";
+import cookie from "@fastify/cookie";
+import jwt from "@fastify/jwt";
+import fastifyMultipart from "@fastify/multipart";
 import fastifyStatic from "@fastify/static";
-import Fastify, { type FastifyInstance } from "fastify";
-import { migrationsReady } from "./db/client.js";
-import { getDataDir } from "./db/db-utils.js";
+import { resolve } from "path";
+import { existsSync } from "fs";
 import { env } from "./plugins/env.js";
-import { authRoutes } from "./routes/auth.js";
-import { doseRoutes } from "./routes/doses.js";
-import { exportRoutes } from "./routes/export.js";
+import { migrationsReady } from "./db/client.js";
 import { healthRoutes } from "./routes/health.js";
-import { medicationRoutes } from "./routes/medications.js";
+import { authRoutes } from "./routes/auth.js";
 import { oidcRoutes } from "./routes/oidc.js";
-import { plannerRoutes } from "./routes/planner.js";
-import { refillRoutes } from "./routes/refills.js";
+import { medicationRoutes } from "./routes/medications.js";
 import { settingsRoutes } from "./routes/settings.js";
+import { plannerRoutes } from "./routes/planner.js";
 import { shareRoutes } from "./routes/share.js";
-import { startIntakeReminderScheduler } from "./services/intake-reminder-scheduler.js";
+import { doseRoutes } from "./routes/doses.js";
 import { startReminderScheduler } from "./services/reminder-scheduler.js";
+import { startIntakeReminderScheduler } from "./services/intake-reminder-scheduler.js";
 
 // Re-export utilities from server-config for external use
 export {
-	buildAppConfig,
+  parseCorsOrigins,
   buildBaseCookieOptions,
   buildRefreshCookieOptions,
+  buildAppConfig,
   ensureImagesDirectory,
   getJwtConfig,
-	parseCorsOrigins,
 } from "./utils/server-config.js";
 
 import {
-	buildAppConfig,
+  parseCorsOrigins,
   buildBaseCookieOptions,
   buildRefreshCookieOptions,
+  buildAppConfig,
   ensureImagesDirectory,
   getJwtConfig,
-	parseCorsOrigins,
 } from "./utils/server-config.js";
 
 /** Create and configure Fastify app (without starting) */
@@ -67,7 +64,7 @@ export async function createApp(options?: {
     accessTtlMinutes: options?.accessTtlMinutes ?? 15,
     refreshTtlDays: options?.refreshTtlDays ?? 7,
     isProduction: options?.isProduction ?? false,
-		imagesDir: options?.imagesDir ?? resolve(getDataDir(), "images"),
+    imagesDir: options?.imagesDir ?? resolve(process.cwd(), "data/images"),
   };
 
   const app = Fastify({
@@ -89,7 +86,7 @@ export async function createApp(options?: {
   await app.register(sensible);
   await app.register(helmet);
   await app.register(cors, { origin: opts.corsOrigins, credentials: true });
-	await app.register(rateLimit, { max: 300, timeWindow: "1 minute" });
+  await app.register(rateLimit, { max: 100, timeWindow: "1 minute" });
   await app.register(cookie, { secret: opts.cookieSecret });
 
   // JWT plugin
@@ -116,8 +113,6 @@ export async function createApp(options?: {
   await app.register(plannerRoutes);
   await app.register(shareRoutes);
   await app.register(doseRoutes);
-	await app.register(exportRoutes);
-	await app.register(refillRoutes);
 
   return app;
 }
@@ -126,11 +121,9 @@ export async function createApp(options?: {
 // Server initialization (runs on import)
 // =============================================================================
 
-import { log } from "./utils/logger.js";
-
 // Wait for database migrations before anything else
 await migrationsReady;
-log.info("[DB] Migrations complete, starting server...");
+console.log("[DB] Migrations complete, starting server...");
 
 // Ensure images directory exists
 const imagesDir = ensureImagesDirectory();
@@ -188,8 +181,6 @@ await app.register(settingsRoutes);
 await app.register(plannerRoutes);
 await app.register(shareRoutes);
 await app.register(doseRoutes);
-await app.register(exportRoutes);
-await app.register(refillRoutes);
 
 const start = async () => {
   try {
@@ -199,14 +190,12 @@ const start = async () => {
     // Start the automatic reminder scheduler
     startReminderScheduler({
       info: (msg) => app.log.info(msg),
-			debug: (msg) => app.log.debug(msg),
       error: (msg) => app.log.error(msg),
     });
     
     // Start the intake reminder scheduler (checks every minute)
     startIntakeReminderScheduler({
       info: (msg) => app.log.info(msg),
-			debug: (msg) => app.log.debug(msg),
       error: (msg) => app.log.error(msg),
     });
   } catch (err) {

backend/src/plugins/auth.ts

@@ -1,8 +1,8 @@
-import { count, eq, sql } from "drizzle-orm";
-import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { FastifyInstance, FastifyRequest, FastifyReply } from "fastify";
+import { env } from "./env.js";
 import { db } from "../db/client.js";
 import { users } from "../db/schema.js";
-import { env } from "./env.js";
+import { sql, count, eq } from "drizzle-orm";
 
 // =============================================================================
 // Anonymous User - Used when AUTH_ENABLED=false
@@ -37,6 +37,7 @@ export async function getAnonymousUserId(): Promise<number> {
   `);
 
   anonymousUserVerified = true;
+  console.log(`Created anonymous user with fixed ID ${ANONYMOUS_USER_ID} for no-auth mode`);
   
   return ANONYMOUS_USER_ID;
 }
@@ -86,7 +87,7 @@ export interface RequestUser {
 /**
  * Optional auth - verifies JWT if present, but doesn't require it
  */
-export async function optionalAuth(request: FastifyRequest, _reply: FastifyReply) {
+export async function optionalAuth(request: FastifyRequest, reply: FastifyReply) {
   if (!env.AUTH_ENABLED) {
     return;
   }
@@ -99,7 +100,7 @@ export async function optionalAuth(request: FastifyRequest, _reply: FastifyReply
   try {
     const decoded = await request.jwtVerify<{ sub: number; username: string }>();
     const [user] = await db.select().from(users).where(sql`${users.id} = ${decoded.sub}`);
-		if (user?.isActive) {
+    if (user && user.isActive) {
       request.user = {
         id: user.id,
         username: user.username,

backend/src/plugins/env.ts

@@ -1,17 +1,11 @@
-import { existsSync } from "node:fs";
-import dotenv from "dotenv";
 import { z } from "zod";
+import dotenv from "dotenv";
 
-// Load .env: try cwd first, then parent dir (for local dev running from backend/)
-const envPath = process.env.DOTENV_PATH || (existsSync(".env") ? ".env" : "../.env");
-dotenv.config({ path: envPath });
+dotenv.config({ path: process.env.DOTENV_PATH || ".env" });
 
 const EnvSchema = z.object({
   NODE_ENV: z.enum(["development", "production", "test"]).default("production"),
-	PORT: z
-		.string()
-		.transform((v) => parseInt(v, 10))
-		.default("3000"),
+  PORT: z.string().transform((v) => parseInt(v, 10)).default("3000"),
   CORS_ORIGINS: z.string().default("http://localhost:5173,http://localhost:4173"),
   LOG_LEVEL: z.string().default("info"),
   
@@ -19,48 +13,31 @@ const EnvSchema = z.object({
   // Auth Configuration
   // ==========================================================================
   // Master switch: Enable/disable authentication (default: disabled for easy setup)
-	AUTH_ENABLED: z
-		.string()
-		.transform((v) => v === "true")
-		.default("false"),
+  AUTH_ENABLED: z.string().transform((v) => v === "true").default("false"),
   // Allow new user registrations (auto-enabled if no users exist)
-	REGISTRATION_ENABLED: z
-		.string()
-		.transform((v) => v === "true")
-		.default("false"),
+  REGISTRATION_ENABLED: z.string().transform((v) => v === "true").default("false"),
   // Disable local auth when using SSO only
 
+  
   // JWT Secrets - only required when AUTH_ENABLED=true
   JWT_SECRET: z.string().min(10).optional(),
   REFRESH_SECRET: z.string().min(10).optional(),
   COOKIE_SECRET: z.string().min(10).optional(),
   
   // Token TTL settings
-	ACCESS_TOKEN_TTL_MINUTES: z
-		.string()
-		.transform((v) => parseInt(v, 10))
-		.default("15"),
-	REFRESH_TOKEN_TTL_DAYS: z
-		.string()
-		.transform((v) => parseInt(v, 10))
-		.default("7"),
+  ACCESS_TOKEN_TTL_MINUTES: z.string().transform((v) => parseInt(v, 10)).default("15"),
+  REFRESH_TOKEN_TTL_DAYS: z.string().transform((v) => parseInt(v, 10)).default("7"),
 
   // ==========================================================================
   // OIDC SSO Configuration (Pocket ID, Authelia, etc.)
   // ==========================================================================
-	OIDC_ENABLED: z
-		.string()
-		.transform((v) => v === "true")
-		.default("false"),
+  OIDC_ENABLED: z.string().transform((v) => v === "true").default("false"),
   OIDC_ISSUER_URL: z.string().url().optional(),  // e.g., https://auth.example.com
   OIDC_CLIENT_ID: z.string().optional(),
   OIDC_CLIENT_SECRET: z.string().optional(),
   OIDC_REDIRECT_URI: z.string().url().optional(),  // e.g., https://medassist.example.com/api/auth/oidc/callback
   OIDC_SCOPES: z.string().default("openid profile email"),
-	OIDC_AUTO_CREATE_USERS: z
-		.string()
-		.transform((v) => v === "true")
-		.default("true"),
+  OIDC_AUTO_CREATE_USERS: z.string().transform((v) => v === "true").default("true"),
   OIDC_USERNAME_CLAIM: z.string().default("preferred_username"),  // or 'email', 'sub'
   OIDC_PROVIDER_NAME: z.string().default("SSO"),  // Display name for UI button
 });

backend/src/routes/auth.ts

@@ -1,11 +1,11 @@
-import { randomBytes } from "node:crypto";
-import argon2 from "argon2";
-import { eq } from "drizzle-orm";
-import type { FastifyInstance } from "fastify";
+import { FastifyInstance } from "fastify";
 import { z } from "zod";
+import argon2 from "argon2";
+import { randomBytes } from "crypto";
 import { db } from "../db/client.js";
-import { getDataDir } from "../db/db-utils.js";
-import { refreshTokens, users } from "../db/schema.js";
+import { users, refreshTokens } from "../db/schema.js";
+import { eq } from "drizzle-orm";
+import { env } from "../plugins/env.js";
 import { getAuthState, requireAuth } from "../plugins/auth.js";
 import type { AuthUser } from "../types/fastify.js";
 
@@ -51,13 +51,11 @@ const sensitiveRateLimitConfig = {
 // Validation Schemas
 // =============================================================================
 const registerSchema = z.object({
-	username: z
-		.string()
+  username: z.string()
     .min(3, "Username must be at least 3 characters")
     .max(50, "Username must be at most 50 characters")
     .regex(/^[a-zA-Z0-9_-]+$/, "Username can only contain letters, numbers, underscores, and hyphens"),
-	password: z
-		.string()
+  password: z.string()
     .min(8, "Password must be at least 8 characters")
     .max(128, "Password must be at most 128 characters"),
 });
@@ -70,8 +68,7 @@ const loginSchema = z.object({
 
 const updateProfileSchema = z.object({
   currentPassword: z.string().optional(),
-	newPassword: z
-		.string()
+  newPassword: z.string()
     .min(8, "Password must be at least 8 characters")
     .max(128, "Password must be at most 128 characters")
     .optional(),
@@ -87,21 +84,17 @@ export async function authRoutes(app: FastifyInstance) {
 
   // ---------------------------------------------------------------------------
   // GET /auth/state - Public auth state (needed before login)
-	// Exempt from rate limit - lightweight state check called frequently
   // ---------------------------------------------------------------------------
-	app.get("/auth/state", { config: { rateLimit: false } }, async () => {
+  app.get("/auth/state", async () => {
     return getAuthState();
   });
 
   // ---------------------------------------------------------------------------
   // POST /auth/register - User registration
   // ---------------------------------------------------------------------------
-	app.post<{ Body: z.infer<typeof registerSchema> }>(
-		"/auth/register",
-		{
+  app.post<{ Body: z.infer<typeof registerSchema> }>("/auth/register", {
     config: { rateLimit: sensitiveRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     // Check auth state
     const state = await getAuthState();
     
@@ -122,7 +115,7 @@ export async function authRoutes(app: FastifyInstance) {
     if (!parsed.success) {
       return reply.status(400).send({ 
         error: parsed.error.errors[0]?.message ?? "Invalid input",
-					code: "VALIDATION_ERROR",
+        code: "VALIDATION_ERROR" 
       });
     }
 
@@ -138,14 +131,11 @@ export async function authRoutes(app: FastifyInstance) {
     const passwordHash = await argon2.hash(password, ARGON2_OPTIONS);
 
     // Create user
-			const [newUser] = await db
-				.insert(users)
-				.values({
+    const [newUser] = await db.insert(users).values({
       username,
       passwordHash,
       authProvider: "local",
-				})
-				.returning();
+    }).returning();
 
     app.log.info(`User registered: ${username}`);
 
@@ -157,18 +147,14 @@ export async function authRoutes(app: FastifyInstance) {
       },
       message: "Account created",
     });
-		}
-	);
+  });
 
   // ---------------------------------------------------------------------------
   // POST /auth/login - User login
   // ---------------------------------------------------------------------------
-	app.post<{ Body: z.infer<typeof loginSchema> }>(
-		"/auth/login",
-		{
+  app.post<{ Body: z.infer<typeof loginSchema> }>("/auth/login", {
     config: { rateLimit: sensitiveRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     const state = await getAuthState();
     
     if (!state.authEnabled) {
@@ -183,7 +169,7 @@ export async function authRoutes(app: FastifyInstance) {
     if (!parsed.success) {
       return reply.status(400).send({ 
         error: "Invalid credentials",
-					code: "VALIDATION_ERROR",
+        code: "VALIDATION_ERROR" 
       });
     }
 
@@ -218,7 +204,9 @@ export async function authRoutes(app: FastifyInstance) {
     }
 
     // Update last login
-			await db.update(users).set({ lastLoginAt: new Date(), updatedAt: new Date() }).where(eq(users.id, user.id));
+    await db.update(users)
+      .set({ lastLoginAt: new Date(), updatedAt: new Date() })
+      .where(eq(users.id, user.id));
 
     // Generate tokens
     const accessToken = app.jwt.sign(
@@ -261,18 +249,14 @@ export async function authRoutes(app: FastifyInstance) {
           avatarUrl: user.avatarUrl,
         },
       });
-		}
-	);
+  });
 
   // ---------------------------------------------------------------------------
   // POST /auth/refresh - Refresh access token
   // ---------------------------------------------------------------------------
-	app.post(
-		"/auth/refresh",
-		{
+  app.post("/auth/refresh", {
     config: { rateLimit: authRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     const refreshTokenCookie = request.cookies.refresh_token;
     if (!refreshTokenCookie) {
       return reply.status(401).send({ error: "No refresh token", code: "NO_REFRESH_TOKEN" });
@@ -280,12 +264,14 @@ export async function authRoutes(app: FastifyInstance) {
 
     try {
       // Verify refresh token
-				const decoded = app.jwt.verify<{ sub: number; jti: string }>(refreshTokenCookie, {
-					key: app.config.refreshSecret,
-				});
+      const decoded = app.jwt.verify<{ sub: number; jti: string }>(
+        refreshTokenCookie,
+        { key: app.config.refreshSecret }
+      );
 
       // Check if token exists and is valid
-				const [token] = await db.select().from(refreshTokens).where(eq(refreshTokens.tokenId, decoded.jti));
+      const [token] = await db.select().from(refreshTokens)
+        .where(eq(refreshTokens.tokenId, decoded.jti));
 
       if (!token || token.revoked || token.expiresAt < new Date()) {
         return reply.status(401).send({ error: "Invalid refresh token", code: "INVALID_REFRESH_TOKEN" });
@@ -298,8 +284,7 @@ export async function authRoutes(app: FastifyInstance) {
       }
 
       // Rotate refresh token (revoke old, create new)
-				await db
-					.update(refreshTokens)
+      await db.update(refreshTokens)
         .set({ revoked: true, rotatedAt: new Date() })
         .where(eq(refreshTokens.id, token.id));
 
@@ -327,29 +312,31 @@ export async function authRoutes(app: FastifyInstance) {
         .setCookie("access_token", newAccessToken, app.config.cookieOptions)
         .setCookie("refresh_token", newRefreshToken, app.config.refreshCookieOptions)
         .send({ ok: true });
+
     } catch {
       return reply.status(401).send({ error: "Invalid refresh token", code: "INVALID_REFRESH_TOKEN" });
     }
-		}
-	);
+  });
 
   // ---------------------------------------------------------------------------
   // POST /auth/logout - Logout (revoke refresh token)
   // ---------------------------------------------------------------------------
-	app.post(
-		"/auth/logout",
-		{
+  app.post("/auth/logout", {
     config: { rateLimit: authRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     const refreshTokenCookie = request.cookies.refresh_token;
     
     if (refreshTokenCookie) {
       try {
-					const decoded = app.jwt.verify<{ jti: string }>(refreshTokenCookie, { key: app.config.refreshSecret });
+        const decoded = app.jwt.verify<{ jti: string }>(
+          refreshTokenCookie,
+          { key: app.config.refreshSecret }
+        );
         
         // Revoke the refresh token
-					await db.update(refreshTokens).set({ revoked: true }).where(eq(refreshTokens.tokenId, decoded.jti));
+        await db.update(refreshTokens)
+          .set({ revoked: true })
+          .where(eq(refreshTokens.tokenId, decoded.jti));
       } catch {
         // Invalid token, ignore
       }
@@ -359,8 +346,7 @@ export async function authRoutes(app: FastifyInstance) {
       .clearCookie("access_token", app.config.cookieOptions)
       .clearCookie("refresh_token", app.config.refreshCookieOptions)
       .send({ ok: true });
-		}
-	);
+  });
 
   // ---------------------------------------------------------------------------
   // GET /auth/me - Get current user profile
@@ -389,13 +375,10 @@ export async function authRoutes(app: FastifyInstance) {
   // ---------------------------------------------------------------------------
   // PUT /auth/me - Update current user profile
   // ---------------------------------------------------------------------------
-	app.put<{ Body: z.infer<typeof updateProfileSchema> }>(
-		"/auth/me",
-		{
+  app.put<{ Body: z.infer<typeof updateProfileSchema> }>("/auth/me", { 
     preHandler: requireAuth,
     config: { rateLimit: authRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     const authUser = request.user as unknown as AuthUser | null;
     if (!authUser) {
       return reply.status(401).send({ error: "Not authenticated" });
@@ -405,7 +388,7 @@ export async function authRoutes(app: FastifyInstance) {
     if (!parsed.success) {
       return reply.status(400).send({ 
         error: parsed.error.errors[0]?.message ?? "Invalid input",
-					code: "VALIDATION_ERROR",
+        code: "VALIDATION_ERROR" 
       });
     }
 
@@ -441,19 +424,15 @@ export async function authRoutes(app: FastifyInstance) {
     await db.update(users).set(updates).where(eq(users.id, user.id));
 
     return { ok: true, message: "Profile updated" };
-		}
-	);
+  });
 
   // ---------------------------------------------------------------------------
   // POST /auth/avatar - Upload user avatar
   // ---------------------------------------------------------------------------
-	app.post(
-		"/auth/avatar",
-		{
+  app.post("/auth/avatar", { 
     preHandler: requireAuth,
     config: { rateLimit: authRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     const authUser = request.user as unknown as AuthUser | null;
     if (!authUser) {
       return reply.status(401).send({ error: "Not authenticated" });
@@ -475,9 +454,9 @@ export async function authRoutes(app: FastifyInstance) {
     const filename = `avatar_${authUser.id}_${Date.now()}.${ext}`;
     
     // Save file
-			const fs = await import("node:fs/promises");
-			const path = await import("node:path");
-			const imagesDir = path.join(getDataDir(), "images");
+    const fs = await import("fs/promises");
+    const path = await import("path");
+    const imagesDir = path.join(process.cwd(), "data", "images");
     await fs.mkdir(imagesDir, { recursive: true });
     
     const buffer = await data.toBuffer();
@@ -497,19 +476,15 @@ export async function authRoutes(app: FastifyInstance) {
     await db.update(users).set({ avatarUrl: filename, updatedAt: new Date() }).where(eq(users.id, authUser.id));
 
     return { ok: true, avatarUrl: filename };
-		}
-	);
+  });
 
   // ---------------------------------------------------------------------------
   // DELETE /auth/avatar - Delete user avatar
   // ---------------------------------------------------------------------------
-	app.delete(
-		"/auth/avatar",
-		{
+  app.delete("/auth/avatar", { 
     preHandler: requireAuth,
     config: { rateLimit: authRateLimitConfig },
-		},
-		async (request, reply) => {
+  }, async (request, reply) => {
     const authUser = request.user as unknown as AuthUser | null;
     if (!authUser) {
       return reply.status(401).send({ error: "Not authenticated" });
@@ -521,10 +496,10 @@ export async function authRoutes(app: FastifyInstance) {
     }
 
     // Delete file
-			const fs = await import("node:fs/promises");
-			const path = await import("node:path");
+    const fs = await import("fs/promises");
+    const path = await import("path");
     try {
-				await fs.unlink(path.join(getDataDir(), "images", user.avatarUrl));
+      await fs.unlink(path.join(process.cwd(), "data", "images", user.avatarUrl));
     } catch {
       // Ignore if file doesn't exist
     }
@@ -533,46 +508,5 @@ export async function authRoutes(app: FastifyInstance) {
     await db.update(users).set({ avatarUrl: null, updatedAt: new Date() }).where(eq(users.id, authUser.id));
 
     return { ok: true };
-		}
-	);
-
-	// ---------------------------------------------------------------------------
-	// DELETE /auth/me - Delete user account and all data
-	// ---------------------------------------------------------------------------
-	app.delete(
-		"/auth/me",
-		{
-			preHandler: requireAuth,
-			config: { rateLimit: sensitiveRateLimitConfig },
-		},
-		async (request, reply) => {
-			const authUser = request.user as unknown as AuthUser | null;
-			if (!authUser) {
-				return reply.status(401).send({ error: "Not authenticated" });
-			}
-
-			// Delete avatar file if exists
-			const [user] = await db.select().from(users).where(eq(users.id, authUser.id));
-			if (user?.avatarUrl) {
-				const fs = await import("node:fs/promises");
-				const path = await import("node:path");
-				try {
-					await fs.unlink(path.join(getDataDir(), "images", user.avatarUrl));
-				} catch {
-					// Ignore if file doesn't exist
-				}
-			}
-
-			// Delete user - cascade delete handles all related data
-			await db.delete(users).where(eq(users.id, authUser.id));
-
-			app.log.info(`User deleted account: ${authUser.username} (ID: ${authUser.id})`);
-
-			// Clear auth cookies
-			return reply
-				.clearCookie("access_token", app.config.cookieOptions)
-				.clearCookie("refresh_token", app.config.refreshCookieOptions)
-				.send({ ok: true, message: "Account deleted" });
-		}
-	);
+  });
 }

backend/src/routes/doses.ts

@@ -1,9 +1,9 @@
-import { and, eq } from "drizzle-orm";
-import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { FastifyInstance } from "fastify";
 import { z } from "zod";
 import { db } from "../db/client.js";
 import { doseTracking, shareTokens } from "../db/schema.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
+import { eq, and } from "drizzle-orm";
+import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
 
@@ -18,13 +18,9 @@ const shareDoseSchema = z.object({
   doseId: z.string().min(1, "doseId is required"),
 });
 
-const dismissDosesSchema = z.object({
-	doseIds: z.array(z.string().min(1)).min(1, "At least one doseId is required"),
-});
-
 // Helper to get user ID from request
 // Returns anonymous user ID when auth is disabled
-async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
+async function getUserId(request: any, reply: any): Promise<number> {
   // If auth is disabled, use the anonymous user
   if (!env.AUTH_ENABLED) {
     return getAnonymousUserId();
@@ -45,21 +41,26 @@ export async function doseRoutes(app: FastifyInstance) {
   // ---------------------------------------------------------------------------
   // GET /doses/taken - PROTECTED: Get all taken doses for the user
   // ---------------------------------------------------------------------------
-	app.get("/doses/taken", { preHandler: requireAuth }, async (request, reply) => {
+  app.get(
+    "/doses/taken",
+    { preHandler: requireAuth },
+    async (request, reply) => {
       const userId = await getUserId(request, reply);
 
       // Get all taken doses for this user (no time limit)
-		const doses = await db.select().from(doseTracking).where(eq(doseTracking.userId, userId));
+      const doses = await db.select()
+        .from(doseTracking)
+        .where(eq(doseTracking.userId, userId));
 
       return {
         doses: doses.map((d) => ({
           doseId: d.doseId,
           takenAt: d.takenAt?.getTime() ?? Date.now(),
           markedBy: d.markedBy,
-				dismissed: d.dismissed ?? false,
         })),
       };
-	});
+    }
+  );
 
   // ---------------------------------------------------------------------------
   // POST /doses/taken - PROTECTED: Mark a dose as taken
@@ -80,10 +81,14 @@ export async function doseRoutes(app: FastifyInstance) {
       const { doseId } = parsed.data;
 
       // Check if already marked
-			const [existing] = await db
-				.select()
+      const [existing] = await db.select()
         .from(doseTracking)
-				.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
+        .where(
+          and(
+            eq(doseTracking.userId, userId),
+            eq(doseTracking.doseId, doseId)
+          )
+        );
 
       if (existing) {
         return { success: true, message: "Already marked" };
@@ -111,106 +116,23 @@ export async function doseRoutes(app: FastifyInstance) {
 
       const { doseId } = request.params;
 
-			// Check if this dose was dismissed
-			const [existing] = await db
-				.select()
-				.from(doseTracking)
-				.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
-
-			if (existing?.dismissed) {
-				// Already dismissed - keep the record as-is
-				// The dose stays dismissed, we just acknowledge the undo request
-			} else {
-				// Not dismissed - delete the record entirely
-				await db.delete(doseTracking).where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
-			}
+      await db.delete(doseTracking).where(
+        and(
+          eq(doseTracking.userId, userId),
+          eq(doseTracking.doseId, doseId)
+        )
+      );
 
       return { success: true };
     }
   );
 
-	// ---------------------------------------------------------------------------
-	// POST /doses/dismiss - PROTECTED: Dismiss missed doses without deducting stock
-	// ---------------------------------------------------------------------------
-	app.post<{ Body: z.infer<typeof dismissDosesSchema> }>(
-		"/doses/dismiss",
-		{ preHandler: requireAuth },
-		async (request, reply) => {
-			const userId = await getUserId(request, reply);
-
-			const parsed = dismissDosesSchema.safeParse(request.body);
-			if (!parsed.success) {
-				return reply.status(400).send({
-					error: parsed.error.errors[0]?.message ?? "Invalid input",
-				});
-			}
-
-			const { doseIds } = parsed.data;
-
-			// Insert dismissed records for each dose that doesn't exist yet
-			let dismissedCount = 0;
-			for (const doseId of doseIds) {
-				// Check if already exists (taken or dismissed)
-				const [existing] = await db
-					.select()
-					.from(doseTracking)
-					.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
-
-				if (existing) {
-					// Already exists - update to dismissed if not already
-					if (!existing.dismissed) {
-						await db
-							.update(doseTracking)
-							.set({ dismissed: true })
-							.where(and(eq(doseTracking.userId, userId), eq(doseTracking.doseId, doseId)));
-						dismissedCount++;
-					}
-				} else {
-					// Create new dismissed record
-					await db.insert(doseTracking).values({
-						userId,
-						doseId,
-						markedBy: null,
-						dismissed: true,
-					});
-					dismissedCount++;
-				}
-			}
-
-			return { success: true, dismissedCount };
-		}
-	);
-
-	// ---------------------------------------------------------------------------
-	// DELETE /doses/dismiss - PROTECTED: Clear all dismissed doses (un-dismiss)
-	// ---------------------------------------------------------------------------
-	app.delete("/doses/dismiss", { preHandler: requireAuth }, async (request, reply) => {
-		const userId = await getUserId(request, reply);
-
-		// Delete all dismissed-only records (not taken ones)
-		// For taken+dismissed, just remove the dismissed flag
-		const dismissed = await db
-			.select()
-			.from(doseTracking)
-			.where(and(eq(doseTracking.userId, userId), eq(doseTracking.dismissed, true)));
-
-		for (const d of dismissed) {
-			if (d.markedBy !== null || d.takenAt) {
-				// This was also marked as taken - just remove dismissed flag
-				await db.update(doseTracking).set({ dismissed: false }).where(eq(doseTracking.id, d.id));
-			} else {
-				// This was only dismissed - delete it
-				await db.delete(doseTracking).where(eq(doseTracking.id, d.id));
-			}
-		}
-
-		return { success: true, clearedCount: dismissed.length };
-	});
-
   // ---------------------------------------------------------------------------
   // GET /share/:token/doses - PUBLIC: Get taken doses for a share link
   // ---------------------------------------------------------------------------
-	app.get<{ Params: { token: string } }>("/share/:token/doses", async (request, reply) => {
+  app.get<{ Params: { token: string } }>(
+    "/share/:token/doses",
+    async (request, reply) => {
       const { token } = request.params;
 
       // Find share token
@@ -220,17 +142,19 @@ export async function doseRoutes(app: FastifyInstance) {
       }
 
       // Get all taken doses for this user (no time limit)
-		const doses = await db.select().from(doseTracking).where(eq(doseTracking.userId, share.userId));
+      const doses = await db.select()
+        .from(doseTracking)
+        .where(eq(doseTracking.userId, share.userId));
 
       return {
         doses: doses.map((d) => ({
           doseId: d.doseId,
           takenAt: d.takenAt?.getTime() ?? Date.now(),
           markedBy: d.markedBy,
-				dismissed: d.dismissed ?? false,
         })),
       };
-	});
+    }
+  );
 
   // ---------------------------------------------------------------------------
   // POST /share/:token/doses - PUBLIC: Mark a dose as taken via share link
@@ -256,10 +180,14 @@ export async function doseRoutes(app: FastifyInstance) {
       }
 
       // Check if already marked
-			const [existing] = await db
-				.select()
+      const [existing] = await db.select()
         .from(doseTracking)
-				.where(and(eq(doseTracking.userId, share.userId), eq(doseTracking.doseId, doseId)));
+        .where(
+          and(
+            eq(doseTracking.userId, share.userId),
+            eq(doseTracking.doseId, doseId)
+          )
+        );
 
       if (existing) {
         return { success: true, message: "Already marked" };
@@ -279,7 +207,9 @@ export async function doseRoutes(app: FastifyInstance) {
   // ---------------------------------------------------------------------------
   // DELETE /share/:token/doses/:doseId - PUBLIC: Unmark a dose via share link
   // ---------------------------------------------------------------------------
-	app.delete<{ Params: { token: string; doseId: string } }>("/share/:token/doses/:doseId", async (request, reply) => {
+  app.delete<{ Params: { token: string; doseId: string } }>(
+    "/share/:token/doses/:doseId",
+    async (request, reply) => {
       const { token, doseId } = request.params;
 
       // Find share token
@@ -288,19 +218,14 @@ export async function doseRoutes(app: FastifyInstance) {
         return reply.notFound("Share link not found");
       }
 
-		// Check if this dose was dismissed
-		const [existing] = await db
-			.select()
-			.from(doseTracking)
-			.where(and(eq(doseTracking.userId, share.userId), eq(doseTracking.doseId, doseId)));
-
-		if (existing?.dismissed) {
-			// Already dismissed - keep the record as-is
-		} else {
-			// Not dismissed - delete the record entirely
-			await db.delete(doseTracking).where(and(eq(doseTracking.userId, share.userId), eq(doseTracking.doseId, doseId)));
-		}
+      await db.delete(doseTracking).where(
+        and(
+          eq(doseTracking.userId, share.userId),
+          eq(doseTracking.doseId, doseId)
+        )
+      );
 
       return { success: true };
-	});
+    }
+  );
 }

backend/src/routes/export.ts

@@ -1,597 +0,0 @@
-import { randomBytes } from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { extname, resolve } from "node:path";
-import { eq } from "drizzle-orm";
-import type { FastifyInstance } from "fastify";
-import { z } from "zod";
-import { db } from "../db/client.js";
-import { getDataDir } from "../db/db-utils.js";
-import { doseTracking, medications, shareTokens, userSettings } from "../db/schema.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
-import { env } from "../plugins/env.js";
-import type { AuthUser } from "../types/fastify.js";
-import { parseIntakesJson, parseTakenByJson } from "../utils/scheduler-utils.js";
-
-const IMAGES_DIR = resolve(getDataDir(), "images");
-
-// =============================================================================
-// Export Format Version (bump this when format changes)
-// =============================================================================
-const EXPORT_VERSION = "1.0";
-
-// =============================================================================
-// Zod Schemas for Import Validation
-// =============================================================================
-
-const scheduleSchema = z.object({
-	usage: z.number().nonnegative(),
-	every: z.number().int().min(1),
-	start: z.string(), // ISO datetime string
-	remind: z.boolean().optional().default(false),
-	takenBy: z.string().nullable().optional(), // Per-intake takenBy (new field)
-});
-
-const inventorySchema = z.object({
-	packCount: z.number().int().min(0).default(1),
-	blistersPerPack: z.number().int().min(1).default(1),
-	pillsPerBlister: z.number().int().min(1).default(1),
-	looseTablets: z.number().int().min(0).default(0),
-	stockAdjustment: z.number().int().default(0), // Manual stock correction
-	packageType: z.enum(["blister", "bottle"]).default("blister"),
-});
-
-const medicationExportSchema = z.object({
-	_exportId: z.string(),
-	name: z.string().min(1),
-	genericName: z.string().nullable().optional(),
-	takenBy: z.array(z.string()).default([]),
-	inventory: inventorySchema,
-	pillWeightMg: z.number().int().nullable().optional(),
-	doseUnit: z.enum(["mg", "g", "mcg", "ml", "IU", "units", "drops", "puffs"]).default("mg"),
-	schedules: z.array(scheduleSchema).default([]),
-	expiryDate: z.string().nullable().optional(),
-	notes: z.string().nullable().optional(),
-	intakeRemindersEnabled: z.boolean().default(false),
-	image: z.string().nullable().optional(), // base64 data URL or null
-	lastStockCorrectionAt: z.string().nullable().optional(), // ISO datetime of last stock correction
-});
-
-const doseHistorySchema = z.object({
-	medicationRef: z.string(), // References _exportId
-	scheduleIndex: z.number().int().min(0),
-	scheduledTime: z.string(), // ISO datetime
-	takenAt: z.string(), // ISO datetime
-	markedBy: z.string().nullable().optional(),
-	dismissed: z.boolean().default(false),
-	takenByPerson: z.string().nullable().optional(), // Person suffix from dose ID (e.g., "Daniel")
-});
-
-const shareLinkSchema = z.object({
-	takenBy: z.string().min(1),
-	scheduleDays: z.number().int().min(1).default(30),
-	expiresAt: z.string().nullable().optional(), // ISO datetime
-	regenerateToken: z.boolean().default(true),
-});
-
-const settingsExportSchema = z
-	.object({
-		// Email notifications
-		emailEnabled: z.boolean().default(false),
-		notificationEmail: z.string().nullable().optional(),
-		emailStockReminders: z.boolean().default(true),
-		emailIntakeReminders: z.boolean().default(true),
-		// Push notifications
-		shoutrrrEnabled: z.boolean().optional(),
-		shoutrrrUrl: z.string().nullable().optional(),
-		shoutrrrStockReminders: z.boolean().default(true),
-		shoutrrrIntakeReminders: z.boolean().default(true),
-		// Reminder settings
-		reminderDaysBefore: z.number().int().default(7),
-		repeatDailyReminders: z.boolean().default(false),
-		skipRemindersForTakenDoses: z.boolean().default(false),
-		repeatRemindersEnabled: z.boolean().default(false),
-		reminderRepeatIntervalMinutes: z.number().int().default(30),
-		maxNaggingReminders: z.number().int().default(5),
-		// Stock thresholds
-		lowStockDays: z.number().int().default(30),
-		normalStockDays: z.number().int().default(90),
-		highStockDays: z.number().int().default(180),
-		// UI preferences
-		language: z.string().default("en"),
-		stockCalculationMode: z.enum(["automatic", "manual"]).default("automatic"),
-	})
-	.optional();
-
-const importDataSchema = z.object({
-	version: z.string(),
-	exportedAt: z.string(),
-	includeSensitiveData: z.boolean().default(false),
-	medications: z.array(medicationExportSchema).default([]),
-	doseHistory: z.array(doseHistorySchema).default([]),
-	settings: settingsExportSchema,
-	shareLinks: z.array(shareLinkSchema).default([]),
-});
-
-// =============================================================================
-// Helper Functions
-// =============================================================================
-
-// Helper to get user ID from request
-async function getUserId(request: any, reply: any): Promise<number> {
-	if (!env.AUTH_ENABLED) {
-		return getAnonymousUserId();
-	}
-
-	const authUser = request.user as unknown as AuthUser | null;
-	if (!authUser) {
-		reply.status(401).send({ error: "Not authenticated" });
-		throw new Error("AUTH_REQUIRED");
-	}
-	return authUser.id;
-}
-
-// Parse intakes from DB format to export format (with per-intake takenBy)
-function parseIntakesForExport(
-	row: typeof medications.$inferSelect
-): Array<{ usage: number; every: number; start: string; remind: boolean; takenBy: string | null }> {
-	// Use the new parseIntakesJson which falls back to legacy format
-	const intakes = parseIntakesJson(
-		row.intakesJson,
-		{ usageJson: row.usageJson, everyJson: row.everyJson, startJson: row.startJson },
-		row.intakeRemindersEnabled ?? false
-	);
-
-	return intakes.map((intake) => ({
-		usage: intake.usage,
-		every: intake.every,
-		start: intake.start,
-		remind: intake.intakeRemindersEnabled,
-		takenBy: intake.takenBy, // Per-intake takenBy
-	}));
-}
-
-// Read image file and convert to base64 data URL
-function imageToBase64(imageUrl: string | null): string | null {
-	if (!imageUrl) return null;
-	const imagePath = resolve(IMAGES_DIR, imageUrl);
-	if (!existsSync(imagePath)) return null;
-
-	try {
-		const imageBuffer = readFileSync(imagePath);
-		const ext = extname(imageUrl).toLowerCase();
-		const mimeTypes: Record<string, string> = {
-			".jpg": "image/jpeg",
-			".jpeg": "image/jpeg",
-			".png": "image/png",
-			".webp": "image/webp",
-			".gif": "image/gif",
-		};
-		const mimeType = mimeTypes[ext] || "image/jpeg";
-		return `data:${mimeType};base64,${imageBuffer.toString("base64")}`;
-	} catch {
-		return null;
-	}
-}
-
-// Save base64 image to file and return filename
-function base64ToImage(base64: string, medicationId: number): string | null {
-	if (!base64 || !base64.startsWith("data:")) return null;
-
-	try {
-		// Parse data URL: "data:image/jpeg;base64,/9j/4AAQ..."
-		const matches = base64.match(/^data:image\/(\w+);base64,(.+)$/);
-		if (!matches) return null;
-
-		const ext = matches[1] === "jpeg" ? "jpg" : matches[1];
-		const data = matches[2];
-		const buffer = Buffer.from(data, "base64");
-
-		const filename = `med-${medicationId}-${Date.now()}.${ext}`;
-		const filepath = resolve(IMAGES_DIR, filename);
-
-		// Ensure images directory exists
-		if (!existsSync(IMAGES_DIR)) {
-			mkdirSync(IMAGES_DIR, { recursive: true });
-		}
-
-		writeFileSync(filepath, buffer);
-		return filename;
-	} catch {
-		return null;
-	}
-}
-
-// Parse dose ID to extract medication ID and timestamp
-// Format: "{medicationId}-{blisterIndex}-{timestampMs}" or "{medicationId}-{blisterIndex}-{timestampMs}-{person}"
-function parseDoseId(
-	doseId: string
-): { medicationId: number; blisterIndex: number; timestampMs: number; person: string | null } | null {
-	const parts = doseId.split("-");
-	if (parts.length < 3) return null;
-
-	const medicationId = parseInt(parts[0], 10);
-	const blisterIndex = parseInt(parts[1], 10);
-	const timestampMs = parseInt(parts[2], 10);
-
-	if (Number.isNaN(medicationId) || Number.isNaN(blisterIndex) || Number.isNaN(timestampMs)) return null;
-
-	// Check if there's a person suffix (4th part onwards, could be multi-part name)
-	const person = parts.length > 3 ? parts.slice(3).join("-") : null;
-
-	return { medicationId, blisterIndex, timestampMs, person };
-}
-
-// Build dose ID from parts (with optional person suffix)
-function buildDoseId(medicationId: number, blisterIndex: number, timestampMs: number, person?: string | null): string {
-	const base = `${medicationId}-${blisterIndex}-${timestampMs}`;
-	return person ? `${base}-${person}` : base;
-}
-
-// =============================================================================
-// Export Routes
-// =============================================================================
-export async function exportRoutes(app: FastifyInstance) {
-	// All export routes require auth
-	app.addHook("preHandler", requireAuth);
-
-	// ---------------------------------------------------------------------------
-	// GET /export - Export all user data
-	// ---------------------------------------------------------------------------
-	app.get<{ Querystring: { includeSensitive?: string; includeImages?: string } }>("/export", async (request, reply) => {
-		const userId = await getUserId(request, reply);
-		const includeSensitive = request.query.includeSensitive === "true";
-		const includeImages = request.query.includeImages !== "false"; // Default to true
-
-		// 1. Load all medications
-		const meds = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
-
-		// Build medication ID to export ID mapping
-		const medIdToExportId = new Map<number, string>();
-		const exportMedications = meds.map((med, index) => {
-			const exportId = `med-${index + 1}`;
-			medIdToExportId.set(med.id, exportId);
-
-			// Safely convert lastStockCorrectionAt to ISO string
-			let lastStockCorrectionAtIso: string | null = null;
-			if (med.lastStockCorrectionAt) {
-				try {
-					if (med.lastStockCorrectionAt instanceof Date && !Number.isNaN(med.lastStockCorrectionAt.getTime())) {
-						lastStockCorrectionAtIso = med.lastStockCorrectionAt.toISOString();
-					} else if (typeof med.lastStockCorrectionAt === "number" || typeof med.lastStockCorrectionAt === "string") {
-						const d = new Date(med.lastStockCorrectionAt);
-						lastStockCorrectionAtIso = !Number.isNaN(d.getTime()) ? d.toISOString() : null;
-					}
-				} catch {
-					lastStockCorrectionAtIso = null;
-				}
-			}
-
-			return {
-				_exportId: exportId,
-				name: med.name,
-				genericName: med.genericName,
-				takenBy: parseTakenByJson(med.takenByJson),
-				inventory: {
-					packCount: med.packCount ?? 1,
-					blistersPerPack: med.blistersPerPack ?? 1,
-					pillsPerBlister: med.pillsPerBlister ?? 1,
-					looseTablets: med.looseTablets ?? 0,
-					stockAdjustment: med.stockAdjustment ?? 0,
-					packageType: med.packageType ?? "blister",
-				},
-				pillWeightMg: med.pillWeightMg,
-				doseUnit: med.doseUnit ?? "mg",
-				schedules: parseIntakesForExport(med),
-				expiryDate: med.expiryDate,
-				notes: med.notes,
-				intakeRemindersEnabled: med.intakeRemindersEnabled ?? false,
-				image: includeImages ? imageToBase64(med.imageUrl) : null,
-				lastStockCorrectionAt: lastStockCorrectionAtIso,
-			};
-		});
-
-		// 2. Load all dose tracking entries
-		const doses = await db.select().from(doseTracking).where(eq(doseTracking.userId, userId));
-
-		const exportDoseHistory = doses
-			.map((dose) => {
-				const parsed = parseDoseId(dose.doseId);
-				if (!parsed) return null;
-
-				const exportId = medIdToExportId.get(parsed.medicationId);
-				if (!exportId) return null; // Orphaned dose, skip
-
-				// Safely convert takenAt to ISO string
-				let takenAtIso: string;
-				try {
-					if (dose.takenAt instanceof Date && !Number.isNaN(dose.takenAt.getTime())) {
-						takenAtIso = dose.takenAt.toISOString();
-					} else if (typeof dose.takenAt === "number" || typeof dose.takenAt === "string") {
-						const d = new Date(dose.takenAt);
-						takenAtIso = !Number.isNaN(d.getTime()) ? d.toISOString() : new Date().toISOString();
-					} else {
-						takenAtIso = new Date().toISOString();
-					}
-				} catch {
-					takenAtIso = new Date().toISOString();
-				}
-
-				// Safely convert scheduled time
-				let scheduledTimeIso: string;
-				try {
-					const d = new Date(parsed.timestampMs);
-					scheduledTimeIso = !Number.isNaN(d.getTime()) ? d.toISOString() : new Date().toISOString();
-				} catch {
-					scheduledTimeIso = new Date().toISOString();
-				}
-
-				return {
-					medicationRef: exportId,
-					scheduleIndex: parsed.blisterIndex,
-					scheduledTime: scheduledTimeIso,
-					takenAt: takenAtIso,
-					markedBy: dose.markedBy,
-					dismissed: dose.dismissed ?? false,
-					takenByPerson: parsed.person,
-				};
-			})
-			.filter((d): d is NonNullable<typeof d> => d !== null);
-
-		// 3. Load user settings
-		const [settings] = await db.select().from(userSettings).where(eq(userSettings.userId, userId));
-
-		const exportSettings = settings
-			? {
-					emailEnabled: settings.emailEnabled,
-					notificationEmail: settings.notificationEmail,
-					emailStockReminders: settings.emailStockReminders,
-					emailIntakeReminders: settings.emailIntakeReminders,
-					// Only include sensitive data if requested
-					shoutrrrEnabled: includeSensitive ? settings.shoutrrrEnabled : undefined,
-					shoutrrrUrl: includeSensitive ? settings.shoutrrrUrl : undefined,
-					shoutrrrStockReminders: settings.shoutrrrStockReminders,
-					shoutrrrIntakeReminders: settings.shoutrrrIntakeReminders,
-					reminderDaysBefore: settings.reminderDaysBefore,
-					repeatDailyReminders: settings.repeatDailyReminders,
-					skipRemindersForTakenDoses: settings.skipRemindersForTakenDoses,
-					repeatRemindersEnabled: settings.repeatRemindersEnabled,
-					reminderRepeatIntervalMinutes: settings.reminderRepeatIntervalMinutes,
-					maxNaggingReminders: settings.maxNaggingReminders,
-					lowStockDays: settings.lowStockDays,
-					normalStockDays: settings.normalStockDays,
-					highStockDays: settings.highStockDays,
-					language: settings.language,
-					stockCalculationMode: settings.stockCalculationMode,
-				}
-			: undefined;
-
-		// 4. Load share links
-		const shares = await db.select().from(shareTokens).where(eq(shareTokens.userId, userId));
-
-		const exportShareLinks = shares.map((share) => {
-			// Safely convert expiresAt to ISO string
-			let expiresAtIso: string | null = null;
-			if (share.expiresAt) {
-				try {
-					if (share.expiresAt instanceof Date && !Number.isNaN(share.expiresAt.getTime())) {
-						expiresAtIso = share.expiresAt.toISOString();
-					} else if (typeof share.expiresAt === "number" || typeof share.expiresAt === "string") {
-						const d = new Date(share.expiresAt);
-						expiresAtIso = !Number.isNaN(d.getTime()) ? d.toISOString() : null;
-					}
-				} catch {
-					expiresAtIso = null;
-				}
-			}
-
-			return {
-				takenBy: share.takenBy,
-				scheduleDays: share.scheduleDays,
-				expiresAt: expiresAtIso,
-				regenerateToken: true, // Always regenerate tokens on import for security
-			};
-		});
-
-		// Build export object
-		const exportData = {
-			version: EXPORT_VERSION,
-			exportedAt: new Date().toISOString(),
-			includeSensitiveData: includeSensitive,
-			medications: exportMedications,
-			doseHistory: exportDoseHistory,
-			settings: exportSettings,
-			shareLinks: exportShareLinks,
-		};
-
-		// Set download headers
-		const filename = `medassist-export-${new Date().toISOString().split("T")[0]}.json`;
-		reply.header("Content-Type", "application/json");
-		reply.header("Content-Disposition", `attachment; filename="${filename}"`);
-
-		return exportData;
-	});
-
-	// ---------------------------------------------------------------------------
-	// POST /import - Import user data (replaces all existing data!)
-	// ---------------------------------------------------------------------------
-	app.post(
-		"/import",
-		{
-			config: {
-				// Increase body limit to 50MB to handle exports with base64 images
-				rawBody: true,
-			},
-			bodyLimit: 50 * 1024 * 1024, // 50 MB
-		},
-		async (request, reply) => {
-			const userId = await getUserId(request, reply);
-
-			// 1. Parse and validate import data
-			const parsed = importDataSchema.safeParse(request.body);
-			if (!parsed.success) {
-				return reply.status(400).send({
-					error: "Invalid import data format",
-					details: parsed.error.format(),
-				});
-			}
-
-			const importData = parsed.data;
-
-			// 2. Delete all existing user data (in correct order to respect foreign keys)
-			// Note: CASCADE delete should handle this, but let's be explicit
-
-			// First, delete images for existing medications
-			const existingMeds = await db.select().from(medications).where(eq(medications.userId, userId));
-			for (const med of existingMeds) {
-				if (med.imageUrl) {
-					const imagePath = resolve(IMAGES_DIR, med.imageUrl);
-					if (existsSync(imagePath)) {
-						try {
-							unlinkSync(imagePath);
-						} catch {
-							/* ignore */
-						}
-					}
-				}
-			}
-
-			// Delete in order: doses, share tokens, medications, settings
-			await db.delete(doseTracking).where(eq(doseTracking.userId, userId));
-			await db.delete(shareTokens).where(eq(shareTokens.userId, userId));
-			await db.delete(medications).where(eq(medications.userId, userId));
-			await db.delete(userSettings).where(eq(userSettings.userId, userId));
-
-			// 3. Import medications and build ID mapping
-			const exportIdToNewId = new Map<string, number>();
-
-			for (const med of importData.medications) {
-				// Convert schedules to both legacy and new formats
-				const usageJson = JSON.stringify(med.schedules.map((s) => s.usage));
-				const everyJson = JSON.stringify(med.schedules.map((s) => s.every));
-				const startJson = JSON.stringify(med.schedules.map((s) => s.start));
-				const takenByJson = JSON.stringify(med.takenBy);
-
-				// Build intakesJson array (new unified format with per-intake takenBy)
-				const intakesJson = JSON.stringify(
-					med.schedules.map((s) => ({
-						usage: s.usage,
-						every: s.every,
-						start: s.start,
-						takenBy: s.takenBy || null,
-						intakeRemindersEnabled: s.remind ?? false,
-					}))
-				);
-
-				// Check if any schedule has remind enabled
-				const intakeRemindersEnabled = med.schedules.some((s) => s.remind) || med.intakeRemindersEnabled;
-
-				const [inserted] = await db
-					.insert(medications)
-					.values({
-						userId,
-						name: med.name,
-						genericName: med.genericName || null,
-						takenByJson,
-						packageType: med.inventory.packageType ?? "blister",
-						packCount: med.inventory.packCount,
-						blistersPerPack: med.inventory.blistersPerPack,
-						pillsPerBlister: med.inventory.pillsPerBlister,
-						looseTablets: med.inventory.looseTablets,
-						stockAdjustment: med.inventory.stockAdjustment ?? 0,
-						lastStockCorrectionAt: med.lastStockCorrectionAt ? new Date(med.lastStockCorrectionAt) : null,
-						pillWeightMg: med.pillWeightMg || null,
-						doseUnit: med.doseUnit ?? "mg",
-						intakesJson,
-						usageJson,
-						everyJson,
-						startJson,
-						expiryDate: med.expiryDate || null,
-						notes: med.notes || null,
-						intakeRemindersEnabled,
-						imageUrl: null, // Will be set after image is saved
-					})
-					.returning();
-
-				// Save mapping
-				exportIdToNewId.set(med._exportId, inserted.id);
-
-				// Save image if present
-				if (med.image) {
-					const imageUrl = base64ToImage(med.image, inserted.id);
-					if (imageUrl) {
-						await db.update(medications).set({ imageUrl }).where(eq(medications.id, inserted.id));
-					}
-				}
-			}
-
-			// 4. Import dose history with remapped medication IDs
-			for (const dose of importData.doseHistory) {
-				const newMedId = exportIdToNewId.get(dose.medicationRef);
-				if (!newMedId) continue; // Skip orphaned doses
-
-				// Convert ISO timestamp back to milliseconds for dose ID
-				const timestampMs = new Date(dose.scheduledTime).getTime();
-				// Rebuild dose ID with optional person suffix
-				const doseId = buildDoseId(newMedId, dose.scheduleIndex, timestampMs, dose.takenByPerson);
-
-				await db.insert(doseTracking).values({
-					userId,
-					doseId,
-					takenAt: new Date(dose.takenAt),
-					markedBy: dose.markedBy || null,
-					dismissed: dose.dismissed ?? false,
-				});
-			}
-
-			// 5. Import settings
-			if (importData.settings) {
-				await db.insert(userSettings).values({
-					userId,
-					emailEnabled: importData.settings.emailEnabled ?? false,
-					notificationEmail: importData.settings.notificationEmail || null,
-					emailStockReminders: importData.settings.emailStockReminders ?? true,
-					emailIntakeReminders: importData.settings.emailIntakeReminders ?? true,
-					shoutrrrEnabled: importData.settings.shoutrrrEnabled ?? false,
-					shoutrrrUrl: importData.settings.shoutrrrUrl || null,
-					shoutrrrStockReminders: importData.settings.shoutrrrStockReminders ?? true,
-					shoutrrrIntakeReminders: importData.settings.shoutrrrIntakeReminders ?? true,
-					reminderDaysBefore: importData.settings.reminderDaysBefore ?? 7,
-					repeatDailyReminders: importData.settings.repeatDailyReminders ?? false,
-					skipRemindersForTakenDoses: importData.settings.skipRemindersForTakenDoses ?? false,
-					repeatRemindersEnabled: importData.settings.repeatRemindersEnabled ?? false,
-					reminderRepeatIntervalMinutes: importData.settings.reminderRepeatIntervalMinutes ?? 30,
-					maxNaggingReminders: importData.settings.maxNaggingReminders ?? 5,
-					lowStockDays: importData.settings.lowStockDays ?? 30,
-					normalStockDays: importData.settings.normalStockDays ?? 90,
-					highStockDays: importData.settings.highStockDays ?? 180,
-					language: importData.settings.language ?? "en",
-					stockCalculationMode: importData.settings.stockCalculationMode ?? "automatic",
-				});
-			}
-
-			// 6. Import share links (with new tokens)
-			for (const share of importData.shareLinks) {
-				// Always generate new token for security
-				const token = randomBytes(8).toString("hex");
-
-				await db.insert(shareTokens).values({
-					userId,
-					token,
-					takenBy: share.takenBy,
-					scheduleDays: share.scheduleDays,
-					expiresAt: share.expiresAt ? new Date(share.expiresAt) : null,
-				});
-			}
-
-			return {
-				success: true,
-				imported: {
-					medications: importData.medications.length,
-					doseHistory: importData.doseHistory.length,
-					settings: importData.settings ? 1 : 0,
-					shareLinks: importData.shareLinks.length,
-				},
-			};
-		}
-	);
-}

backend/src/routes/health.ts

@@ -1,19 +1,8 @@
-import { readFileSync } from "node:fs";
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
-import type { FastifyInstance } from "fastify";
-
-// Read version from package.json at startup
-const __dirname = dirname(fileURLToPath(import.meta.url));
-const packageJsonPath = resolve(__dirname, "../../package.json");
-const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf-8"));
-const backendVersion = packageJson.version || "unknown";
+import { FastifyInstance } from "fastify";
 
 export async function healthRoutes(app: FastifyInstance) {
-	// Exempt from rate limit - lightweight health check
-	app.get("/health", { config: { rateLimit: false } }, async () => ({
+  app.get("/health", async () => ({
     status: "ok",
-		version: backendVersion,
     smtpConfigured: Boolean(process.env.SMTP_HOST),
     shoutrrrConfigured: Boolean(process.env.SHOUTRRR_URL),
   }));

backend/src/routes/medications.ts

@@ -1,59 +1,67 @@
-import { createWriteStream, existsSync, unlinkSync } from "node:fs";
-import { extname, resolve } from "node:path";
-import { pipeline } from "node:stream/promises";
-import { and, eq, like } from "drizzle-orm";
-import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { FastifyInstance } from "fastify";
 import { z } from "zod";
 import { db } from "../db/client.js";
-import { getDataDir } from "../db/db-utils.js";
-import { doseTracking, medications } from "../db/schema.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
+import { medications, doseTracking } from "../db/schema.js";
+import { eq, and, like, sql } from "drizzle-orm";
+import { createWriteStream, existsSync, unlinkSync } from "fs";
+import { resolve, extname } from "path";
+import { pipeline } from "stream/promises";
+import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
-import { type Intake, parseIntakesJson, parseLocalDateTime, parseTakenByJson } from "../utils/scheduler-utils.js";
 
-const IMAGES_DIR = resolve(getDataDir(), "images");
+const IMAGES_DIR = resolve(process.cwd(), "data/images");
 
-// New intake schema with per-intake takenBy
-const intakeSchema = z.object({
-	usage: z.number().nonnegative(),
-	every: z.number().int().min(1),
-	start: z.string().datetime({ local: true }),
-	takenBy: z.string().trim().max(100).nullable().optional(), // Person for this specific intake
-	intakeRemindersEnabled: z.boolean().default(false), // Per-intake reminder setting
-});
-
-// Legacy blister schema (for backward compatibility during transition)
 const blisterSchema = z.object({
   usage: z.number().nonnegative(),
   every: z.number().int().min(1),
-	start: z.string().datetime({ local: true }),
+  start: z.string().datetime(),
 });
 
-const packageTypeSchema = z.enum(["blister", "bottle"]).default("blister");
-const doseUnitSchema = z.enum(["mg", "g", "mcg", "ml", "IU", "units", "drops", "puffs"]).default("mg");
-
-const medicationSchema = z
-	.object({
+const medicationSchema = z.object({
   name: z.string().trim().min(1).max(100),
   genericName: z.string().trim().max(100).nullable().optional(),
-		takenBy: z.array(z.string().trim().max(100)).default([]), // Medication-level takenBy (fallback)
-		packageType: packageTypeSchema,
+  takenBy: z.array(z.string().trim().max(100)).default([]), // Array of person names
   packCount: z.number().int().min(0).default(1),
   blistersPerPack: z.number().int().min(1).default(1),
   pillsPerBlister: z.number().int().min(1).default(1),
-		totalPills: z.number().int().min(1).nullable().optional(), // For bottle type: total capacity
   looseTablets: z.number().int().min(0).default(0),
-		pillWeightMg: z.number().nonnegative().nullable().optional(),
-		doseUnit: doseUnitSchema,
+  pillWeightMg: z.number().int().min(1).nullable().optional(),
   expiryDate: z.string().nullable().optional(),
   notes: z.string().max(2000).nullable().optional(),
-		intakeRemindersEnabled: z.boolean().default(false), // Medication-level (deprecated, kept for backward compat)
-		// Accept either new intakes format or legacy blisters format
-		intakes: z.array(intakeSchema).min(1).max(12).optional(),
-		blisters: z.array(blisterSchema).min(1).max(12).optional(), // Legacy format
-	})
-	.refine((data) => data.intakes || data.blisters, { message: "Either 'intakes' or 'blisters' must be provided" });
+  intakeRemindersEnabled: z.boolean().default(false),
+  blisters: z.array(blisterSchema).min(1).max(12),
+});
+
+function zipBlisters(usage: number[], every: number[], start: string[]) {
+  const len = Math.min(usage.length, every.length, start.length);
+  const blisters: Array<{ usage: number; every: number; start: string }> = [];
+  for (let i = 0; i < len; i++) {
+    blisters.push({ usage: usage[i], every: every[i], start: start[i] });
+  }
+  return blisters;
+}
+
+function parseBlisters(row: typeof medications.$inferSelect) {
+  try {
+    const usage = JSON.parse(row.usageJson) as number[];
+    const every = JSON.parse(row.everyJson) as number[];
+    const start = JSON.parse(row.startJson) as string[];
+    return zipBlisters(usage, every, start);
+  } catch (err) {
+    return [];
+  }
+}
+
+function parseTakenByJson(takenByJson: string | null | undefined): string[] {
+  if (!takenByJson) return [];
+  try {
+    const parsed = JSON.parse(takenByJson);
+    return Array.isArray(parsed) ? parsed.filter((s: unknown) => typeof s === "string" && s.trim()) : [];
+  } catch {
+    return [];
+  }
+}
 
 export async function medicationRoutes(app: FastifyInstance) {
   // All medication routes require auth
@@ -61,7 +69,7 @@ export async function medicationRoutes(app: FastifyInstance) {
 
   // Helper to get user ID from request
   // Returns anonymous user ID when auth is disabled
-	async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
+  async function getUserId(request: any, reply: any): Promise<number> {
     // If auth is disabled, use the anonymous user
     if (!env.AUTH_ENABLED) {
       return getAnonymousUserId();
@@ -79,40 +87,23 @@ export async function medicationRoutes(app: FastifyInstance) {
   app.get("/medications", async (request, reply) => {
     const userId = await getUserId(request, reply);
     const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
-		return rows.map((row) => {
-			// Parse intakes from new format, falling back to legacy
-			const intakes = parseIntakesJson(
-				row.intakesJson,
-				{ usageJson: row.usageJson, everyJson: row.everyJson, startJson: row.startJson },
-				row.intakeRemindersEnabled ?? false
-			);
-
-			return {
+    return rows.map((row) => ({
       id: row.id,
       name: row.name,
       genericName: row.genericName,
       takenBy: parseTakenByJson(row.takenByJson),
-				packageType: row.packageType ?? "blister",
       packCount: row.packCount ?? 1,
       blistersPerPack: row.blistersPerPack ?? 1,
       pillsPerBlister: row.pillsPerBlister ?? 1,
-				totalPills: row.totalPills ?? null,
       looseTablets: row.looseTablets ?? 0,
-				stockAdjustment: row.stockAdjustment ?? 0,
-				lastStockCorrectionAt: row.lastStockCorrectionAt?.toISOString() ?? null,
       pillWeightMg: row.pillWeightMg,
-				doseUnit: row.doseUnit ?? "mg",
-				intakes, // New unified format with per-intake takenBy
-				// Legacy blisters format (for backward compat with frontend during transition)
-				blisters: intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start })),
+      blisters: parseBlisters(row),
       imageUrl: row.imageUrl,
       expiryDate: row.expiryDate,
       notes: row.notes,
       intakeRemindersEnabled: row.intakeRemindersEnabled ?? false,
-				dismissedUntil: row.dismissedUntil ?? null,
       updatedAt: row.updatedAt,
-			};
-		});
+    }));
   });
 
   app.post("/medications", async (req, reply) => {
@@ -120,54 +111,10 @@ export async function medicationRoutes(app: FastifyInstance) {
     if (!parsed.success) return reply.status(400).send(parsed.error.format());
 
     const userId = await getUserId(req, reply);
-		const {
-			name,
-			genericName,
-			takenBy,
-			packageType,
-			packCount,
-			blistersPerPack,
-			pillsPerBlister,
-			totalPills,
-			looseTablets,
-			pillWeightMg,
-			doseUnit,
-			expiryDate,
-			notes,
-			intakeRemindersEnabled,
-			intakes: inputIntakes,
-			blisters: inputBlisters,
-		} = parsed.data;
-
-		// Convert to unified intakes format
-		let intakes: Intake[];
-		if (inputIntakes) {
-			// New format with per-intake takenBy
-			intakes = inputIntakes.map((i) => ({
-				usage: i.usage,
-				every: i.every,
-				start: i.start,
-				takenBy: i.takenBy || null,
-				intakeRemindersEnabled: i.intakeRemindersEnabled ?? false,
-			}));
-		} else if (inputBlisters) {
-			// Legacy format - convert to new format
-			intakes = inputBlisters.map((b) => ({
-				usage: b.usage,
-				every: b.every,
-				start: b.start,
-				takenBy: null, // No per-intake takenBy from legacy
-				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
-			}));
-		} else {
-			return reply.status(400).send({ error: "Either 'intakes' or 'blisters' must be provided" });
-		}
-
-		// Store both formats for backward compatibility
-		const intakesJson = JSON.stringify(intakes);
-		const usageJson = JSON.stringify(intakes.map((s) => s.usage));
-		const everyJson = JSON.stringify(intakes.map((s) => s.every));
-		const startJson = JSON.stringify(intakes.map((s) => s.start));
+    const { name, genericName, takenBy, packCount, blistersPerPack, pillsPerBlister, looseTablets, pillWeightMg, expiryDate, notes, intakeRemindersEnabled, blisters } = parsed.data;
+    const usageJson = JSON.stringify(blisters.map((s) => s.usage));
+    const everyJson = JSON.stringify(blisters.map((s) => s.every));
+    const startJson = JSON.stringify(blisters.map((s) => s.start));
     const takenByJson = JSON.stringify(takenBy || []);
 
     const [inserted] = await db
@@ -177,18 +124,14 @@ export async function medicationRoutes(app: FastifyInstance) {
         name,
         genericName: genericName || null,
         takenByJson,
-				packageType: packageType ?? "blister",
         packCount,
         blistersPerPack,
         pillsPerBlister,
-				totalPills: totalPills || null,
         looseTablets,
         pillWeightMg: pillWeightMg || null,
-				doseUnit: doseUnit ?? "mg",
         expiryDate: expiryDate || null,
         notes: notes || null,
         intakeRemindersEnabled: intakeRemindersEnabled ?? false,
-				intakesJson,
         usageJson,
         everyJson,
         startJson,
@@ -200,18 +143,12 @@ export async function medicationRoutes(app: FastifyInstance) {
       name: inserted.name,
       genericName: inserted.genericName,
       takenBy: parseTakenByJson(inserted.takenByJson),
-			packageType: inserted.packageType ?? "blister",
       packCount: inserted.packCount,
       blistersPerPack: inserted.blistersPerPack,
       pillsPerBlister: inserted.pillsPerBlister,
-			totalPills: inserted.totalPills ?? null,
       looseTablets: inserted.looseTablets,
-			stockAdjustment: inserted.stockAdjustment ?? 0,
-			lastStockCorrectionAt: inserted.lastStockCorrectionAt?.toISOString() ?? null,
       pillWeightMg: inserted.pillWeightMg,
-			doseUnit: inserted.doseUnit ?? "mg",
-			intakes,
-			blisters: intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start })),
+      blisters,
       imageUrl: inserted.imageUrl,
       expiryDate: inserted.expiryDate,
       notes: inserted.notes,
@@ -229,238 +166,77 @@ export async function medicationRoutes(app: FastifyInstance) {
     const userId = await getUserId(req, reply);
     
     // Verify ownership
-		const [existing] = await db
-			.select()
-			.from(medications)
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
     if (!existing) return reply.notFound();
 
-		const {
-			name,
-			genericName,
-			takenBy,
-			packageType,
-			packCount,
-			blistersPerPack,
-			pillsPerBlister,
-			totalPills,
-			looseTablets,
-			pillWeightMg,
-			doseUnit,
-			expiryDate,
-			notes,
-			intakeRemindersEnabled,
-			intakes: inputIntakes,
-			blisters: inputBlisters,
-		} = parsed.data;
-
-		// Convert to unified intakes format
-		let intakes: Intake[];
-		if (inputIntakes) {
-			// New format with per-intake takenBy
-			intakes = inputIntakes.map((i) => ({
-				usage: i.usage,
-				every: i.every,
-				start: i.start,
-				takenBy: i.takenBy || null,
-				intakeRemindersEnabled: i.intakeRemindersEnabled ?? false,
-			}));
-		} else if (inputBlisters) {
-			// Legacy format - convert to new format
-			intakes = inputBlisters.map((b) => ({
-				usage: b.usage,
-				every: b.every,
-				start: b.start,
-				takenBy: null, // No per-intake takenBy from legacy
-				intakeRemindersEnabled: intakeRemindersEnabled ?? false,
-			}));
-		} else {
-			return reply.status(400).send({ error: "Either 'intakes' or 'blisters' must be provided" });
-		}
-
-		// Store both formats for backward compatibility
-		const intakesJson = JSON.stringify(intakes);
-		const usageJson = JSON.stringify(intakes.map((s) => s.usage));
-		const everyJson = JSON.stringify(intakes.map((s) => s.every));
-		const startJson = JSON.stringify(intakes.map((s) => s.start));
+    const { name, genericName, takenBy, packCount, blistersPerPack, pillsPerBlister, looseTablets, pillWeightMg, expiryDate, notes, intakeRemindersEnabled, blisters } = parsed.data;
+    const usageJson = JSON.stringify(blisters.map((s) => s.usage));
+    const everyJson = JSON.stringify(blisters.map((s) => s.every));
+    const startJson = JSON.stringify(blisters.map((s) => s.start));
     const takenByJson = JSON.stringify(takenBy || []);
 
-		// If stock-defining fields changed, reset stockAdjustment so the new
-		// base stock reflects actual inventory.  This prevents the old
-		// correction offset from skewing the total after an edit.
-		const stockFieldsChanged =
-			existing.packCount !== packCount ||
-			existing.blistersPerPack !== blistersPerPack ||
-			existing.pillsPerBlister !== pillsPerBlister ||
-			(existing.looseTablets ?? 0) !== (looseTablets ?? 0);
-
-		const stockResetFields = stockFieldsChanged ? { stockAdjustment: 0, lastStockCorrectionAt: new Date() } : {};
-
     const result = await db
       .update(medications)
       .set({
         name,
         genericName: genericName || null,
         takenByJson,
-				packageType: packageType ?? "blister",
         packCount,
         blistersPerPack,
         pillsPerBlister,
-				totalPills: totalPills || null,
         looseTablets,
         pillWeightMg: pillWeightMg || null,
-				doseUnit: doseUnit ?? "mg",
         expiryDate: expiryDate || null,
         notes: notes || null,
         intakeRemindersEnabled: intakeRemindersEnabled ?? false,
-				intakesJson,
         usageJson,
         everyJson,
         startJson,
         updatedAt: new Date(),
-				...stockResetFields,
       })
       .where(and(eq(medications.id, idNum), eq(medications.userId, userId)))
       .returning();
 
     if (!result.length) return reply.notFound();
 
-		// ---------------------------------------------------------------
-		// Migrate dose tracking IDs when intake schedule changes
-		// ---------------------------------------------------------------
-		// Parse old intakes from the existing medication row
-		const oldIntakes = parseIntakesJson(
-			existing.intakesJson,
-			{ usageJson: existing.usageJson, everyJson: existing.everyJson, startJson: existing.startJson },
-			existing.intakeRemindersEnabled
-		);
+    // Clean up dose tracking entries that are before the earliest start date
+    // This ensures consistency when the user changes the start date
+    const earliestStart = Math.min(...blisters.map(b => new Date(b.start).getTime()));
+    if (!Number.isNaN(earliestStart)) {
+      // Get all dose tracking entries for this medication and filter out invalid ones
+      const allDoses = await db.select().from(doseTracking)
+        .where(and(
+          eq(doseTracking.userId, userId),
+          like(doseTracking.doseId, `${idNum}-%`)
+        ));
       
-		// Get all dose tracking entries for this medication
-		const allDoses = await db
-			.select()
-			.from(doseTracking)
-			.where(and(eq(doseTracking.userId, userId), like(doseTracking.doseId, `${idNum}-%`)));
-
-		if (allDoses.length > 0) {
-			// Build migration map: for each intake index, map old dateOnlyMs → new dateOnlyMs
-			const now = new Date();
-			const migrationEnd = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-			const MS_PER_DAY = 86_400_000;
-
-			for (let idx = 0; idx < Math.max(oldIntakes.length, intakes.length); idx++) {
-				const oldIntake = oldIntakes[idx];
-				const newIntake = intakes[idx];
-
-				// Skip if this intake index doesn't exist in both old and new
-				if (!oldIntake || !newIntake) continue;
-
-				const oldStart = parseLocalDateTime(oldIntake.start);
-				const newStart = parseLocalDateTime(newIntake.start);
-				const oldEvery = oldIntake.every;
-				const newEvery = newIntake.every;
-
-				// Check if start date or interval changed (time-of-day changes don't matter for dateOnlyMs)
-				const oldStartDateOnly = new Date(oldStart.getFullYear(), oldStart.getMonth(), oldStart.getDate()).getTime();
-				const newStartDateOnly = new Date(newStart.getFullYear(), newStart.getMonth(), newStart.getDate()).getTime();
-
-				if (oldStartDateOnly === newStartDateOnly && oldEvery === newEvery) {
-					continue; // No schedule change that affects dose IDs
-				}
-
-				// Build set of new valid dateOnlyMs values for this intake
-				const newDates = new Set<number>();
-				for (let d = new Date(newStart); d <= migrationEnd; d.setDate(d.getDate() + newEvery)) {
-					newDates.add(new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime());
-				}
-
-				// Build set of old dateOnlyMs values with mapping to nearest new date
-				const oldToNewMap = new Map<number, number>();
-				for (let d = new Date(oldStart); d <= migrationEnd; d.setDate(d.getDate() + oldEvery)) {
-					const oldDateMs = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
-					// Find the closest new date within ±(newEvery/2) days
-					const halfInterval = (newEvery * MS_PER_DAY) / 2;
-					let bestMatch: number | null = null;
-					let bestDist = Infinity;
-					for (const newDateMs of newDates) {
-						const dist = Math.abs(newDateMs - oldDateMs);
-						if (dist < bestDist && dist <= halfInterval) {
-							bestDist = dist;
-							bestMatch = newDateMs;
-						}
-					}
-					if (bestMatch !== null && bestMatch !== oldDateMs) {
-						oldToNewMap.set(oldDateMs, bestMatch);
-						// Remove matched new date to prevent double-mapping
-						newDates.delete(bestMatch);
-					}
-				}
-
-				// Apply migrations to dose tracking entries
-				if (oldToNewMap.size > 0) {
-					const prefix = `${idNum}-${idx}-`;
-					const dosesToMigrate = allDoses.filter((d) => d.doseId.startsWith(prefix));
-
-					for (const dose of dosesToMigrate) {
-						const parts = dose.doseId.split("-");
-						if (parts.length >= 3) {
-							const oldTimestamp = parseInt(parts[2], 10);
-							const newTimestamp = oldToNewMap.get(oldTimestamp);
-							if (newTimestamp !== undefined) {
-								// Replace the timestamp in the dose ID, keeping any person suffix
-								const newDoseId = `${idNum}-${idx}-${newTimestamp}${parts.length > 3 ? `-${parts.slice(3).join("-")}` : ""}`;
-								await db.update(doseTracking).set({ doseId: newDoseId }).where(eq(doseTracking.id, dose.id));
-							}
-						}
-					}
-				}
-			}
-
-			// Also clean up dose tracking entries before the earliest new start date
-			const earliestStartDate = intakes.reduce((min, b) => {
-				const d = parseLocalDateTime(b.start);
-				// Use date-only (midnight) to match dose ID format
-				const dateOnly = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime();
-				return dateOnly < min ? dateOnly : min;
-			}, Infinity);
-			if (!Number.isNaN(earliestStartDate)) {
-				// Re-fetch after possible migrations
-				const updatedDoses = await db
-					.select()
-					.from(doseTracking)
-					.where(and(eq(doseTracking.userId, userId), like(doseTracking.doseId, `${idNum}-%`)));
-
-				const dosesToDelete = updatedDoses.filter((dose) => {
+      // Find doses with timestamps before the earliest start date
+      const dosesToDelete = allDoses.filter(dose => {
         const parts = dose.doseId.split("-");
         if (parts.length >= 3) {
           const timestamp = parseInt(parts[2], 10);
-						return !Number.isNaN(timestamp) && timestamp < earliestStartDate;
+          return !Number.isNaN(timestamp) && timestamp < earliestStart;
         }
         return false;
       });
       
+      // Delete invalid doses
       for (const dose of dosesToDelete) {
         await db.delete(doseTracking).where(eq(doseTracking.id, dose.id));
       }
     }
-		}
 
     return {
       id: result[0].id,
       name: result[0].name,
       genericName: result[0].genericName,
       takenBy: parseTakenByJson(result[0].takenByJson),
-			packageType: result[0].packageType ?? "blister",
       packCount: result[0].packCount,
       blistersPerPack: result[0].blistersPerPack,
       pillsPerBlister: result[0].pillsPerBlister,
-			totalPills: result[0].totalPills ?? null,
       looseTablets: result[0].looseTablets,
-			stockAdjustment: result[0].stockAdjustment ?? 0,
-			lastStockCorrectionAt: result[0].lastStockCorrectionAt?.toISOString() ?? null,
       pillWeightMg: result[0].pillWeightMg,
-			doseUnit: result[0].doseUnit ?? "mg",
-			intakes,
-			blisters: intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start })),
+      blisters,
       imageUrl: result[0].imageUrl,
       expiryDate: result[0].expiryDate,
       notes: result[0].notes,
@@ -469,47 +245,6 @@ export async function medicationRoutes(app: FastifyInstance) {
     };
   });
 
-	// Stock correction endpoint - only updates stockAdjustment, preserves looseTablets
-	// Also sets lastStockCorrectionAt so consumed doses before this point don't count
-	app.patch<{ Params: { id: string }; Body: { stockAdjustment: number } }>(
-		"/medications/:id/stock-adjustment",
-		async (req, reply) => {
-			const idNum = Number(req.params.id);
-			if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
-
-			const userId = await getUserId(req, reply);
-
-			// Verify ownership
-			const [existing] = await db
-				.select()
-				.from(medications)
-				.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
-			if (!existing) return reply.notFound();
-
-			const { stockAdjustment } = req.body as { stockAdjustment: number };
-			if (typeof stockAdjustment !== "number") return reply.badRequest("stockAdjustment must be a number");
-
-			const result = await db
-				.update(medications)
-				.set({
-					stockAdjustment,
-					lastStockCorrectionAt: new Date(), // Mark when correction was made
-					updatedAt: new Date(),
-				})
-				.where(and(eq(medications.id, idNum), eq(medications.userId, userId)))
-				.returning();
-
-			if (!result.length) return reply.notFound();
-
-			return {
-				id: result[0].id,
-				stockAdjustment: result[0].stockAdjustment ?? 0,
-				lastStockCorrectionAt: result[0].lastStockCorrectionAt?.toISOString() ?? null,
-				updatedAt: result[0].updatedAt,
-			};
-		}
-	);
-
   app.delete<{ Params: { id: string } }>("/medications/:id", async (req, reply) => {
     const idNum = Number(req.params.id);
     if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
@@ -517,10 +252,7 @@ export async function medicationRoutes(app: FastifyInstance) {
     const userId = await getUserId(req, reply);
 
     // Delete associated image if exists (with ownership check)
-		const [existing] = await db
-			.select()
-			.from(medications)
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
     if (!existing) return reply.notFound();
     
     if (existing.imageUrl) {
@@ -528,10 +260,7 @@ export async function medicationRoutes(app: FastifyInstance) {
       if (existsSync(imagePath)) unlinkSync(imagePath);
     }
 
-		const deleted = await db
-			.delete(medications)
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)))
-			.returning();
+    const deleted = await db.delete(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId))).returning();
     if (!deleted.length) return reply.notFound();
     return reply.status(204).send();
   });
@@ -542,10 +271,7 @@ export async function medicationRoutes(app: FastifyInstance) {
     if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
 
     const userId = await getUserId(req, reply);
-		const [existing] = await db
-			.select()
-			.from(medications)
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
     if (!existing) return reply.notFound();
 
     const data = await req.file();
@@ -568,10 +294,7 @@ export async function medicationRoutes(app: FastifyInstance) {
       if (existsSync(oldPath)) unlinkSync(oldPath);
     }
 
-		await db
-			.update(medications)
-			.set({ imageUrl: filename, updatedAt: new Date() })
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+    await db.update(medications).set({ imageUrl: filename, updatedAt: new Date() }).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
 
     return { success: true, imageUrl: filename };
   });
@@ -582,10 +305,7 @@ export async function medicationRoutes(app: FastifyInstance) {
     if (Number.isNaN(idNum)) return reply.badRequest("Invalid id");
 
     const userId = await getUserId(req, reply);
-		const [existing] = await db
-			.select()
-			.from(medications)
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+    const [existing] = await db.select().from(medications).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
     if (!existing) return reply.notFound();
 
     if (existing.imageUrl) {
@@ -593,22 +313,15 @@ export async function medicationRoutes(app: FastifyInstance) {
       if (existsSync(filepath)) unlinkSync(filepath);
     }
 
-		await db
-			.update(medications)
-			.set({ imageUrl: null, updatedAt: new Date() })
-			.where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
+    await db.update(medications).set({ imageUrl: null, updatedAt: new Date() }).where(and(eq(medications.id, idNum), eq(medications.userId, userId)));
     return reply.status(204).send();
   });
 
   app.post("/medications/usage", async (req, reply) => {
-		const schema = z.object({
-			startDate: z.string().datetime(),
-			endDate: z.string().datetime(),
-			includeUntilStart: z.boolean().optional().default(false),
-		});
+    const schema = z.object({ startDate: z.string().datetime(), endDate: z.string().datetime() });
     const parsed = schema.safeParse(req.body);
     if (!parsed.success) return reply.status(400).send(parsed.error.format());
-		const { startDate, endDate, includeUntilStart } = parsed.data;
+    const { startDate, endDate } = parsed.data;
     const start = new Date(startDate);
     const end = new Date(endDate);
     if (Number.isNaN(start.getTime()) || Number.isNaN(end.getTime()) || end <= start) {
@@ -617,255 +330,69 @@ export async function medicationRoutes(app: FastifyInstance) {
 
     const userId = await getUserId(req, reply);
     const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
-
-		// Get all taken doses for this user to calculate actual consumption
-		const takenDoses = await db
-			.select()
-			.from(doseTracking)
-			.where(and(eq(doseTracking.userId, userId), eq(doseTracking.dismissed, false)));
-
-		// Create a map of medication ID to taken dose count
-		const takenDosesMap = new Map<number, { blisterIdx: number; usage: number }[]>();
-		takenDoses.forEach((dose) => {
-			const parts = dose.doseId.split("-");
-			if (parts.length >= 3) {
-				const medId = parseInt(parts[0], 10);
-				const blisterIdx = parseInt(parts[1], 10);
-				if (!Number.isNaN(medId) && !Number.isNaN(blisterIdx)) {
-					if (!takenDosesMap.has(medId)) {
-						takenDosesMap.set(medId, []);
-					}
-					takenDosesMap.get(medId)!.push({ blisterIdx, usage: 0 }); // usage filled later
-				}
-			}
-		});
-
-		// Use current time as the reference point for "available" stock
     const now = new Date();
     
     const payload = rows.map((row) => {
-			// Parse intakes from new format, falling back to legacy
-			const intakes = parseIntakesJson(
-				row.intakesJson,
-				{ usageJson: row.usageJson, everyJson: row.everyJson, startJson: row.startJson },
-				row.intakeRemindersEnabled ?? false
-			);
-			const blisters = intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start }));
+      const blisters = parseBlisters(row);
+      const usageTotal = calculateUsageInRange(blisters, start, end);
       const pillsPerBlister = row.pillsPerBlister ?? 1;
       const packCount = row.packCount ?? 1;
       const blistersPerPack = row.blistersPerPack ?? 1;
       const looseTablets = row.looseTablets ?? 0;
-			const stockAdjustment = row.stockAdjustment ?? 0;
-			const packageType = row.packageType ?? "blister";
+      const originalTotalPills = packCount * blistersPerPack * pillsPerBlister + looseTablets;
 
-			// For bottle type, looseTablets IS the current stock (no blister math)
-			const originalTotalPills =
-				packageType === "bottle"
-					? looseTablets + stockAdjustment
-					: packCount * blistersPerPack * pillsPerBlister + looseTablets + stockAdjustment;
-
-			// Calculate consumption based on ACTUAL taken doses from dose_tracking
-			// This ensures Planner shows the same "current stock" as the Dashboard/Modal
-			// Use the same logic as frontend: generate expected doses and check which are marked
-			const stockCorrectionCutoff = row.lastStockCorrectionAt ? new Date(row.lastStockCorrectionAt).getTime() : 0;
-
-			// Build a Set of taken dose IDs for quick lookup
-			const takenDoseIds = new Set(
-				takenDoses
-					.filter((dose) => {
-						const parts = dose.doseId.split("-");
-						return parts.length >= 3 && parseInt(parts[0], 10) === row.id;
-					})
-					.map((dose) => dose.doseId)
-			);
-
-			// Count consumed pills by generating expected doses and checking if they're taken
+      // Calculate consumption up to now (same logic as frontend)
       let consumedUntilNow = 0;
+      blisters.forEach((blister) => {
+        const blisterStart = new Date(blister.start);
+        if (Number.isNaN(blisterStart.getTime()) || blisterStart > now) return;
         const msPerDay = 86400000;
-
-			blisters.forEach((blister, blisterIdx) => {
-				const blisterStart = parseLocalDateTime(blister.start);
-				if (Number.isNaN(blisterStart.getTime())) return;
-
         const period = Math.max(1, blister.every) * msPerDay;
-
-				// After a stock correction, start counting from the NEXT scheduled
-				// dose, because the user's pill count already reflects all
-				// consumption up to the correction time.
-				let effectiveStart: number;
-				if (stockCorrectionCutoff > 0 && stockCorrectionCutoff >= blisterStart.getTime()) {
-					effectiveStart = stockCorrectionCutoff + period;
-				} else {
-					effectiveStart = blisterStart.getTime();
-				}
-				if (effectiveStart > now.getTime()) return;
-
-				const occurrences = Math.floor((now.getTime() - effectiveStart) / period) + 1;
-
-				// Get the people for this intake (from intakes array or medication takenBy)
-				const takenByJson = row.takenByJson ? JSON.parse(row.takenByJson) : [];
-				const intake = intakes[blisterIdx];
-				const intakePerson = intake?.takenBy;
-				const peopleForThisIntake: (string | null)[] = intakePerson
-					? [intakePerson]
-					: takenByJson.length > 0
-						? takenByJson
-						: [null];
-
-				// Generate expected dose IDs and check if they're taken
-				for (let i = 0; i < occurrences; i++) {
-					const doseDate = new Date(effectiveStart + i * period);
-					const dateOnlyMs = new Date(doseDate.getFullYear(), doseDate.getMonth(), doseDate.getDate()).getTime();
-					const baseDoseId = `${row.id}-${blisterIdx}-${dateOnlyMs}`;
-
-					// Check if each person has taken this dose
-					for (const person of peopleForThisIntake) {
-						const doseId = person ? `${baseDoseId}-${person}` : baseDoseId;
-						if (takenDoseIds.has(doseId)) {
-							consumedUntilNow += blister.usage;
-						}
-					}
-				}
+        const occurrences = Math.floor((now.getTime() - blisterStart.getTime()) / period) + 1;
+        consumedUntilNow += occurrences * blister.usage;
       });
       
-			const currentStock = Math.max(0, originalTotalPills - consumedUntilNow);
-
-			// Calculate usage for the planning period
-			// Always use the user-selected start date for the usage calculation.
-			// Using max(now, start) would cause asymmetric counting when now falls
-			// between morning and evening doses on the start day (e.g., morning dose
-			// skipped but evening counted), leading to confusing off-by-one results.
-			// The stock already reflects consumed doses, so no double-counting occurs.
-			// When includeUntilStart is true, calculate from now to end (useful for trip planning)
-			const effectivePlannerStart = includeUntilStart ? now : start;
-			const usageTotal = calculateUsageInRange(blisters, effectivePlannerStart, end);
-
+      const currentPills = Math.max(0, originalTotalPills - consumedUntilNow);
       const blistersNeeded = pillsPerBlister > 0 ? Math.ceil(usageTotal / pillsPerBlister) : 0;
       
-			// Calculate AVAILABLE = stock AFTER the planned period (currentStock - usageTotal)
-			const availableAfterPeriod = Math.max(0, currentStock - usageTotal);
-
-			let fullBlisters: number;
-			let loosePills: number;
-
-			if (packageType === "bottle") {
-				// Bottle type: no blisters, everything is loose pills
-				fullBlisters = 0;
-				loosePills = availableAfterPeriod;
-			} else {
-				// Blister type: calculate stock breakdown
-				// Consumption order: loose pills first, then from blisters
-				const totalConsumedByEnd = originalTotalPills - availableAfterPeriod;
-				const looseConsumedByEnd = Math.min(totalConsumedByEnd, looseTablets);
-				const loosePillsRemaining = Math.max(0, looseTablets - looseConsumedByEnd);
-				const blisterPillsConsumed = totalConsumedByEnd - looseConsumedByEnd;
+      // Calculate current stock using realistic consumption order (loose first, then blisters)
+      const consumed = originalTotalPills - currentPills;
+      const looseConsumed = Math.min(consumed, looseTablets);
+      const loosePillsRemaining = looseTablets - looseConsumed;
+      const blisterPillsConsumed = consumed - looseConsumed;
       const originalBlisterPills = originalTotalPills - looseTablets;
       const blisterPillsRemaining = Math.max(0, originalBlisterPills - blisterPillsConsumed);
       
-				fullBlisters = pillsPerBlister > 0 ? Math.floor(blisterPillsRemaining / pillsPerBlister) : 0;
+      const fullBlisters = pillsPerBlister > 0 ? Math.floor(blisterPillsRemaining / pillsPerBlister) : 0;
       const openBlisterPills = pillsPerBlister > 0 ? blisterPillsRemaining % pillsPerBlister : 0;
-				loosePills = loosePillsRemaining + openBlisterPills; // Combine open blister + remaining loose
-			}
+      const loosePills = loosePillsRemaining + openBlisterPills; // Combine open blister + remaining loose
       
-			const enough = currentStock >= usageTotal;
+      const enough = currentPills >= usageTotal;
       return {
         medicationId: row.id,
         medicationName: row.name,
-				totalPills: currentStock,
+        totalPills: currentPills,
         plannerUsage: usageTotal,
         blisterSize: pillsPerBlister,
         blistersNeeded,
         fullBlisters,
         loosePills,
         enough,
-				packageType,
       };
     });
 
     return payload;
   });
-
-	// ---------------------------------------------------------------------------
-	// POST /medications/dismiss-until - Set dismissedUntil date for multiple medications
-	// This is more robust than storing individual dose IDs (which can change with schedule updates)
-	// ---------------------------------------------------------------------------
-	const dismissUntilSchema = z.object({
-		medicationIds: z.array(z.number().int().positive()).min(1),
-		until: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, "Date must be in YYYY-MM-DD format"),
-	});
-
-	app.post<{ Body: z.infer<typeof dismissUntilSchema> }>("/medications/dismiss-until", async (req, reply) => {
-		const parsed = dismissUntilSchema.safeParse(req.body);
-		if (!parsed.success) {
-			return reply.status(400).send({ error: parsed.error.errors[0]?.message ?? "Invalid input" });
 }
 
-		const userId = await getUserId(req, reply);
-		const { medicationIds, until } = parsed.data;
-
-		// Update dismissedUntil for all specified medications owned by this user
-		let updatedCount = 0;
-		for (const medId of medicationIds) {
-			const result = await db
-				.update(medications)
-				.set({ dismissedUntil: until })
-				.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
-			if (result.rowsAffected > 0) {
-				updatedCount++;
-			}
-		}
-
-		return { success: true, updatedCount };
-	});
-
-	// ---------------------------------------------------------------------------
-	// DELETE /medications/:id/dismiss-until - Clear dismissedUntil for a medication
-	// ---------------------------------------------------------------------------
-	app.delete<{ Params: { id: string } }>("/medications/:id/dismiss-until", async (req, reply) => {
-		const medId = parseInt(req.params.id, 10);
-		if (Number.isNaN(medId)) {
-			return reply.status(400).send({ error: "Invalid medication ID" });
-		}
-
-		const userId = await getUserId(req, reply);
-
-		await db
-			.update(medications)
-			.set({ dismissedUntil: null })
-			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
-
-		return { success: true };
-	});
-}
-
-function calculateUsageInRange(
-	blisters: Array<{ usage: number; every: number; start: string }>,
-	start: Date,
-	end: Date
-) {
+function calculateUsageInRange(blisters: Array<{ usage: number; every: number; start: string }>, start: Date, end: Date) {
   let total = 0;
-	const msPerDay = 86400000;
   blisters.forEach((blister) => {
-		const blisterStart = parseLocalDateTime(blister.start);
+    const blisterStart = new Date(blister.start);
     if (Number.isNaN(blisterStart.getTime())) return;
-
-		const every = Math.max(1, blister.every);
-
-		// Skip ahead to the first occurrence at or after start to avoid
-		// iterating through months/years of past doses
-		const dt = new Date(blisterStart);
-		if (dt < start) {
-			const daysToSkip = Math.floor((start.getTime() - dt.getTime()) / (every * msPerDay));
-			dt.setDate(dt.getDate() + daysToSkip * every);
-			// Fine-tune: advance until we reach or pass start
-			while (dt < start) {
-				dt.setDate(dt.getDate() + every);
-			}
-		}
-
-		// Count occurrences in [start, end)
-		for (; dt < end; dt.setDate(dt.getDate() + every)) {
-			total += blister.usage;
+    // iterate occurrences from blisterStart up to end
+    for (let dt = new Date(blisterStart); dt < end; dt.setDate(dt.getDate() + blister.every)) {
+      if (dt >= start && dt < end) total += blister.usage;
     }
   });
   return Number(total.toFixed(2));

backend/src/routes/oidc.ts

@@ -1,9 +1,9 @@
-import { createHash, randomBytes } from "node:crypto";
-import { eq } from "drizzle-orm";
-import type { FastifyInstance, FastifyReply } from "fastify";
+import { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
 import * as client from "openid-client";
+import { randomBytes, createHash } from "crypto";
 import { db } from "../db/client.js";
-import { refreshTokens, users } from "../db/schema.js";
+import { users, refreshTokens } from "../db/schema.js";
+import { eq, sql } from "drizzle-orm";
 import { env } from "../plugins/env.js";
 
 // =============================================================================
@@ -18,7 +18,11 @@ async function getOIDCConfig(): Promise<client.Configuration> {
     throw new Error("OIDC not configured");
   }
 
-	oidcConfig = await client.discovery(new URL(env.OIDC_ISSUER_URL), env.OIDC_CLIENT_ID, env.OIDC_CLIENT_SECRET);
+  oidcConfig = await client.discovery(
+    new URL(env.OIDC_ISSUER_URL),
+    env.OIDC_CLIENT_ID,
+    env.OIDC_CLIENT_SECRET
+  );
   
   return oidcConfig;
 }
@@ -51,10 +55,10 @@ function getFrontendUrl(): string {
 export async function oidcRoutes(app: FastifyInstance) {
   if (!env.OIDC_ENABLED) {
     // Register a disabled route that returns an error
-		app.get("/auth/oidc/login", async (_request, reply) => {
+    app.get("/auth/oidc/login", async (request, reply) => {
       return reply.status(400).send({ error: "OIDC authentication is not enabled" });
     });
-		app.get("/auth/oidc/callback", async (_request, reply) => {
+    app.get("/auth/oidc/callback", async (request, reply) => {
       return reply.status(400).send({ error: "OIDC authentication is not enabled" });
     });
     return;
@@ -63,7 +67,7 @@ export async function oidcRoutes(app: FastifyInstance) {
   // ---------------------------------------------------------------------------
   // GET /auth/oidc/login - Initiates OIDC flow
   // ---------------------------------------------------------------------------
-	app.get("/auth/oidc/login", async (_request, reply) => {
+  app.get("/auth/oidc/login", async (request, reply) => {
     try {
       const config = await getOIDCConfig();
       
@@ -144,17 +148,13 @@ export async function oidcRoutes(app: FastifyInstance) {
       
       try {
         const config = await getOIDCConfig();
-				const _redirectUri = env.OIDC_REDIRECT_URI!;
+        const redirectUri = env.OIDC_REDIRECT_URI!;
         
         // Exchange code for tokens
-				const tokens = await client.authorizationCodeGrant(
-					config,
-					new URL(request.url, `http://${request.headers.host}`),
-					{
+        const tokens = await client.authorizationCodeGrant(config, new URL(request.url, `http://${request.headers.host}`), {
           pkceCodeVerifier: storedVerifier.value,
           expectedState: state,
-					}
-				);
+        });
         
         // Get user info
         const sub = tokens.claims()?.sub;
@@ -166,8 +166,7 @@ export async function oidcRoutes(app: FastifyInstance) {
         
         // Extract username from configured claim
         const usernameClaim = env.OIDC_USERNAME_CLAIM;
-				const username =
-					(userInfo as any)[usernameClaim] || userInfo.preferred_username || userInfo.email || userInfo.sub;
+        let username = (userInfo as any)[usernameClaim] || userInfo.preferred_username || userInfo.email || userInfo.sub;
         const oidcSubject = userInfo.sub;
         
         if (!username || !oidcSubject) {
@@ -180,14 +179,16 @@ export async function oidcRoutes(app: FastifyInstance) {
         reply.clearCookie("oidc_state", { path: "/" });
         
         // Find or create user
-				const user = await findOrCreateOIDCUser(username, oidcSubject, reply);
+        let user = await findOrCreateOIDCUser(username, oidcSubject, reply);
         
         if (!user) {
           return reply.redirect(`${getFrontendUrl()}/?error=oidc_user_creation_failed`);
         }
         
         // Update last login
-				await db.update(users).set({ lastLoginAt: new Date() }).where(eq(users.id, user.id));
+        await db.update(users)
+          .set({ lastLoginAt: new Date() })
+          .where(eq(users.id, user.id));
         
         // Issue JWT tokens (same as local auth)
         const accessToken = await generateAccessToken(app, user.id, user.username);
@@ -201,15 +202,14 @@ export async function oidcRoutes(app: FastifyInstance) {
         });
         
         // Set cookies (use app's centralized cookie options)
-				request.log.debug(
-					`[OIDC] Setting cookies for user ${user.username}, NODE_ENV=${env.NODE_ENV}, secure=${app.config.cookieOptions.secure}`
-				);
+        console.log(`[OIDC] Setting cookies for user ${user.username}, NODE_ENV=${env.NODE_ENV}, secure=${app.config.cookieOptions.secure}`);
         setAuthCookies(app, reply, accessToken, refreshToken);
         
         // Redirect to frontend dashboard
         // In dev: CORS_ORIGINS contains the frontend URL
         const frontendUrl = env.CORS_ORIGINS.split(",")[0] || "http://localhost:5173";
         return reply.redirect(`${frontendUrl}/dashboard`);
+        
       } catch (err: any) {
         console.error("[OIDC] Callback error:", err);
         return reply.redirect(`${getFrontendUrl()}/?error=oidc_callback_failed`);
@@ -224,29 +224,36 @@ export async function oidcRoutes(app: FastifyInstance) {
 async function findOrCreateOIDCUser(
   username: string, 
   oidcSubject: string,
-	_reply: FastifyReply
+  reply: FastifyReply
 ): Promise<{ id: number; username: string } | null> {
+  
   // First, try to find user by OIDC subject (most reliable)
-	const [existingBySubject] = await db.select().from(users).where(eq(users.oidcSubject, oidcSubject));
+  const [existingBySubject] = await db.select()
+    .from(users)
+    .where(eq(users.oidcSubject, oidcSubject));
   
   if (existingBySubject) {
     return { id: existingBySubject.id, username: existingBySubject.username };
   }
   
   // Check if username already exists (potential collision)
-	const [existingByUsername] = await db.select().from(users).where(eq(users.username, username));
+  const [existingByUsername] = await db.select()
+    .from(users)
+    .where(eq(users.username, username));
   
   if (existingByUsername) {
     // Username collision! Check if it's a local user without OIDC linked
     if (existingByUsername.authProvider === "local" && !existingByUsername.oidcSubject) {
       // Local user exists without SSO - link this OIDC account to existing user
-			await db.update(users).set({ oidcSubject: oidcSubject }).where(eq(users.id, existingByUsername.id));
-			// Linked OIDC to existing local user
+      await db.update(users)
+        .set({ oidcSubject: oidcSubject })
+        .where(eq(users.id, existingByUsername.id));
+      console.log(`[OIDC] Linked OIDC to existing local user: ${username}`);
       return { id: existingByUsername.id, username: existingByUsername.username };
     } else if (existingByUsername.oidcSubject && existingByUsername.oidcSubject !== oidcSubject) {
       // User already has a DIFFERENT OIDC subject - create new user with suffix
       username = `${username}_sso`;
-			// Username collision (different OIDC subject), use suffixed name
+      console.log(`[OIDC] Username collision (different OIDC subject), using: ${username}`);
     }
   }
   
@@ -257,8 +264,7 @@ async function findOrCreateOIDCUser(
   }
   
   // Create new OIDC user
-	const [newUser] = await db
-		.insert(users)
+  const [newUser] = await db.insert(users)
     .values({
       username,
       passwordHash: null,
@@ -268,7 +274,7 @@ async function findOrCreateOIDCUser(
     })
     .returning({ id: users.id, username: users.username });
   
-	// New OIDC user created
+  console.log(`[OIDC] Created new user: ${newUser.username} (ID: ${newUser.id})`);
   return newUser;
 }
 
@@ -276,7 +282,10 @@ async function findOrCreateOIDCUser(
 // JWT Token Generation (reused from auth.ts logic)
 // =============================================================================
 async function generateAccessToken(app: FastifyInstance, userId: number, username: string): Promise<string> {
-	return app.jwt.sign({ sub: userId, username }, { expiresIn: `${env.ACCESS_TOKEN_TTL_MINUTES}m` });
+  return app.jwt.sign(
+    { sub: userId, username },
+    { expiresIn: `${env.ACCESS_TOKEN_TTL_MINUTES}m` }
+  );
 }
 
 async function generateRefreshToken(

backend/src/routes/planner.ts

@@ -1,29 +1,22 @@
-import type { FastifyInstance, FastifyRequest } from "fastify";
+import { FastifyInstance } from "fastify";
 import nodemailer from "nodemailer";
-import {
-	getDateLocale,
-	getFooterHtml,
-	getFooterPlain,
-	getTranslations,
-	type Language,
-	t,
-} from "../i18n/translations.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
-import { env } from "../plugins/env.js";
 import { updateReminderSentTime, updateUserReminderSentTime } from "../services/reminder-scheduler.js";
-import type { AuthUser } from "../types/fastify.js";
 import { loadUserSettings, sendShoutrrrNotification } from "./settings.js";
+import { getDateLocale, getTranslations, t, type Language } from "../i18n/translations.js";
+import type { AuthUser } from "../types/fastify.js";
+import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
+import { env } from "../plugins/env.js";
 
 // Escape HTML to prevent XSS in email templates
 function escapeHtml(text: string): string {
   const htmlEscapes: Record<string, string> = {
-		"&": "&amp;",
-		"<": "&lt;",
-		">": "&gt;",
-		'"': "&quot;",
-		"'": "&#39;",
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#39;',
   };
-	return text.replace(/[&<>"']/g, (char) => htmlEscapes[char] || char);
+  return text.replace(/[&<>"']/g, char => htmlEscapes[char] || char);
 }
 
 type PlannerRow = {
@@ -36,7 +29,6 @@ type PlannerRow = {
   fullBlisters: number;
   loosePills: number;
   enough: boolean;
-	packageType?: string;
 };
 
 type SendEmailBody = {
@@ -52,7 +44,6 @@ type LowStockItem = {
   medsLeft: number;
   daysLeft: number | null;
   depletionDate: string | null;
-	isCritical?: boolean;
 };
 
 type ReminderEmailBody = {
@@ -66,143 +57,91 @@ export async function plannerRoutes(app: FastifyInstance) {
   app.addHook("preHandler", requireAuth);
 
   // Helper to get user ID from request
-	async function getUserId(request: FastifyRequest): Promise<number> {
+  async function getUserId(request: any): Promise<number> {
     if (!env.AUTH_ENABLED) {
       return getAnonymousUserId();
     }
-		const authUser = request.user as unknown as AuthUser | null;
+    const authUser = request.user as AuthUser | null;
     if (!authUser?.id) {
       throw new Error("User not authenticated");
     }
     return authUser.id;
   }
 
-	// Demand calculator notification (supports email and push)
   app.post<{ Body: SendEmailBody }>("/planner/send-email", async (request, reply) => {
     const { email, from, until, rows, language: bodyLanguage } = request.body;
 
-		if (!rows || rows.length === 0) {
-			return reply.status(400).send({ error: "Missing planner data" });
+    if (!email || !rows || rows.length === 0) {
+      return reply.status(400).send({ error: "Missing email or planner data" });
     }
 
-		// Load user settings for notification channels
-		const userId = await getUserId(request);
-		const userSettings = await loadUserSettings(userId);
-		const notificationSettings = {
-			emailEnabled: userSettings.emailEnabled,
-			shoutrrrEnabled: userSettings.shoutrrrEnabled,
-			shoutrrrUrl: userSettings.shoutrrrUrl || "",
-		};
-
-		// Get locale from user settings or use the language passed in the body
-		const language: Language = (userSettings.language as Language) || bodyLanguage || "en";
-		const locale = getDateLocale(language);
-		const tr = getTranslations(language);
-		const dc = tr.demandCalculator;
-
-		// Format dates for display - escape to prevent XSS even though toLocaleDateString should be safe
-		const fromDate = escapeHtml(
-			new Date(from).toLocaleDateString(locale, {
-				year: "numeric",
-				month: "long",
-				day: "numeric",
-			})
-		);
-		const untilDate = escapeHtml(
-			new Date(until).toLocaleDateString(locale, {
-				year: "numeric",
-				month: "long",
-				day: "numeric",
-			})
-		);
-
-		const outOfStockCount = rows.filter((r) => !r.enough).length;
-		const summaryText = outOfStockCount > 0 ? t(dc.summaryOutOfStock, { count: outOfStockCount }) : dc.summaryAllOk;
-
-		// Build plain text (shared between email and push)
-		const plainText = `${dc.title}
-${t(dc.description, { from: fromDate, until: untilDate })}
-
-${summaryText}
-
-${rows
-	.map((r) => {
-		const isBottle = r.packageType === "bottle";
-		const usage = `${r.plannerUsage} ${tr.common.pills}`;
-		const needed = isBottle ? "–" : `${r.blistersNeeded} × ${r.blisterSize}`;
-		const loosePills = Math.round((Number(r.loosePills) || 0) * 10) / 10;
-		const available = isBottle
-			? `${loosePills} ${tr.common.pills}`
-			: `${r.fullBlisters} ${tr.common.blisters}${loosePills > 0 ? ` + ${loosePills} ${tr.common.pills}` : ""}`;
-		const status = r.enough ? dc.statusEnough : dc.statusEmpty;
-		return `${r.medicationName}: ${usage}, ${needed}, ${available} - ${status}`;
-	})
-	.join("\n")}
-
----
-${getFooterPlain(language)}`;
-
-		const results: { email?: boolean; push?: boolean; errors: string[] } = { errors: [] };
-
-		// Send email if enabled
-		if (notificationSettings.emailEnabled && email) {
     const smtpHost = process.env.SMTP_HOST;
     const smtpUser = process.env.SMTP_USER;
     const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS; // Token takes precedence
-			const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+    const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
     const smtpSecure = process.env.SMTP_SECURE === "true";
     const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
-			if (smtpHost && smtpUser) {
+    if (!smtpHost || !smtpUser) {
+      return reply.status(400).send({ error: "SMTP not configured" });
+    }
+
+    // Get locale from user settings or use the language passed in the body
+    let language: Language = bodyLanguage || "en";
+    const authUser = request.user as unknown as AuthUser | null;
+    if (authUser?.id) {
+      const userSettings = await loadUserSettings(authUser.id);
+      language = userSettings.language;
+    }
+    const locale = getDateLocale(language);
+
+    // Format dates for display
+    const fromDate = new Date(from).toLocaleDateString(locale, {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    });
+    const untilDate = new Date(until).toLocaleDateString(locale, {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    });
+
     // Build HTML table with horizontal scroll for mobile
-				// Escape/coerce all user-provided values to prevent XSS
     const tableRows = rows
-					.map((row) => {
-						const safeName = escapeHtml(row.medicationName);
-						const safePlannerUsage = Number(row.plannerUsage) || 0;
-						const safeBlistersNeeded = Number(row.blistersNeeded) || 0;
-						const safeBlisterSize = Number(row.blisterSize) || 0;
-						const safeFullBlisters = Number(row.fullBlisters) || 0;
-						const safeLoosePills = Math.round((Number(row.loosePills) || 0) * 10) / 10;
-						const isBottle = row.packageType === "bottle";
-
-						// "Blisters needed" column: dash for bottles
-						const neededCell = isBottle ? "–" : `${safeBlistersNeeded} × ${safeBlisterSize}`;
-
-						// "Available" column: match frontend format
-						let availableCell: string;
-						if (isBottle) {
-							availableCell = `${safeLoosePills} ${tr.common.pills}`;
-						} else {
-							availableCell = `${safeFullBlisters} ${tr.common.blisters}`;
-							if (safeLoosePills > 0) {
-								availableCell += ` + ${safeLoosePills} ${tr.common.pills}`;
-							}
-						}
-
-						return `
+      .map(
+        (row) => `
         <tr>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${safeName}</td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${safePlannerUsage}</strong> ${tr.common.pills}</td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${neededCell}</td>
-          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${availableCell}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${escapeHtml(row.medicationName)}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${row.totalPills}</strong></td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;"><strong>${row.plannerUsage}</strong></td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.blistersNeeded} × ${row.blisterSize}</td>
+          <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.fullBlisters}${row.loosePills > 0 ? ` (+${row.loosePills})` : ""}</td>
           <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">
             <span style="display: inline-block; padding: 4px 10px; border-radius: 12px; font-size: 12px; font-weight: 600; ${
-							row.enough ? "background: #d1fae5; color: #065f46;" : "background: #fee2e2; color: #991b1b;"
+              row.enough
+                ? "background: #d1fae5; color: #065f46;"
+                : "background: #fee2e2; color: #991b1b;"
             }">
-              ${row.enough ? dc.statusEnough : dc.statusEmpty}
+              ${row.enough ? "✓ OK" : "✗ Out of Stock"}
             </span>
           </td>
         </tr>
-      `;
-					})
+      `
+      )
       .join("");
 
+    const outOfStockCount = rows.filter((r) => !r.enough).length;
+    const summaryText =
+      outOfStockCount > 0
+        ? `⚠️ ${outOfStockCount} medication${outOfStockCount > 1 ? "s" : ""} will be out of stock during this period.`
+        : "✓ All medications have sufficient supply for this period.";
+
     const html = `
       <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
         <div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
-          <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${dc.title}</h2>
-          <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${t(dc.description, { from: `<strong>${fromDate}</strong>`, until: `<strong>${untilDate}</strong>` })}</p>
+          <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">MedAssist-ng - Demand Calculator</h2>
+          <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">Supply overview from <strong>${fromDate}</strong> to <strong>${untilDate}</strong></p>
           
           <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; ${
             outOfStockCount > 0
@@ -218,11 +157,12 @@ ${getFooterPlain(language)}`;
             <table style="width: 100%; border-collapse: collapse; background: white; min-width: 550px;">
               <thead>
                 <tr style="background: #f3f4f6;">
-                  <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.medication}</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.usage}</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.needed}</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.available}</th>
-                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">${dc.tableHeaders.status}</th>
+                  <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Medication</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Stock</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Usage</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Needed</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Available</th>
+                  <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; letter-spacing: 0.05em; white-space: nowrap;">Status</th>
                 </tr>
               </thead>
               <tbody>
@@ -232,11 +172,21 @@ ${getFooterPlain(language)}`;
           </div>
 
           <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
-          <p style="color: #9ca3af; font-size: 11px; margin: 0;">${getFooterHtml(language)}</p>
+          <p style="color: #9ca3af; font-size: 11px; margin: 0;">Sent from MedAssist-ng Medication Planner</p>
         </div>
       </div>
     `;
 
+    const plainText = `MedAssist-ng - Demand Calculator
+Supply overview from ${fromDate} to ${untilDate}
+
+${summaryText}
+
+${rows.map((r) => `${r.medicationName}: ${r.totalPills} pills in stock, ${r.plannerUsage} pills needed, ${r.fullBlisters} blisters available${r.loosePills > 0 ? ` (+${r.loosePills} loose)` : ""} (${r.blistersNeeded} needed) - ${r.enough ? "Enough" : "OUT OF STOCK"}`).join("\n")}
+
+---
+Sent from MedAssist-ng Medication Planner`;
+
     try {
       const transporter = nodemailer.createTransport({
         host: smtpHost,
@@ -251,63 +201,21 @@ ${getFooterPlain(language)}`;
       await transporter.sendMail({
         from: smtpFrom,
         to: email,
-						subject: t(dc.subject, { from: fromDate, until: untilDate }),
+        subject: `MedAssist-ng - Supply Overview (${fromDate} - ${untilDate})`,
         text: plainText,
         html,
       });
 
-					results.email = true;
+      return reply.send({ success: true, message: "Email sent successfully" });
     } catch (error) {
       const errorMessage = error instanceof Error ? error.message : "Unknown error";
-					results.errors.push(`Email: ${errorMessage}`);
-				}
-			}
-		}
-
-		// Send push notification if enabled
-		if (notificationSettings.shoutrrrEnabled && notificationSettings.shoutrrrUrl) {
-			const pushTitle = t(dc.subject, { from: fromDate, until: untilDate });
-			const pushMessage = `${summaryText}\n\n${rows
-				.map((r) => {
-					const usage = `${r.plannerUsage} ${tr.common.pills}`;
-					const status = r.enough ? dc.statusEnough : dc.statusEmpty;
-					return `${r.enough ? "✓" : "✗"} ${r.medicationName}: ${usage} - ${status}`;
-				})
-				.join("\n")}\n\n---\n${getFooterPlain(language)}`;
-
-			try {
-				const pushResult = await sendShoutrrrNotification(notificationSettings.shoutrrrUrl, pushTitle, pushMessage);
-				if (pushResult.success) {
-					results.push = true;
-				} else {
-					results.errors.push(`Push: ${pushResult.error}`);
-				}
-			} catch (error) {
-				const errorMessage = error instanceof Error ? error.message : "Unknown error";
-				results.errors.push(`Push: ${errorMessage}`);
-			}
-		}
-
-		// Build response message
-		const sentChannels: string[] = [];
-		if (results.email) sentChannels.push("email");
-		if (results.push) sentChannels.push("push");
-
-		if (sentChannels.length > 0) {
-			return reply.send({
-				success: true,
-				message: `Notification sent via ${sentChannels.join(" and ")}`,
-			});
-		} else if (results.errors.length > 0) {
-			return reply.status(500).send({ error: results.errors.join("; ") });
-		} else {
-			return reply.status(400).send({ error: "No notification channels configured" });
+      return reply.status(500).send({ error: `Failed to send email: ${errorMessage}` });
     }
   });
 
   // Reminder notification for low stock medications (supports email and push)
   app.post<{ Body: ReminderEmailBody }>("/reminder/send-email", async (request, reply) => {
-		const { email, lowStock } = request.body;
+    const { email, lowStock, language: bodyLanguage } = request.body;
 
     if (!lowStock || lowStock.length === 0) {
       return reply.status(400).send({ error: "Missing low stock data" });
@@ -322,149 +230,92 @@ ${getFooterPlain(language)}`;
       shoutrrrUrl: userSettings.shoutrrrUrl || "",
     };
     
-		// Get translations based on user language
-		const language = (userSettings.language as Language) || "en";
-		const tr = getTranslations(language);
-
     const results: { email?: boolean; push?: boolean; errors: string[] } = { errors: [] };
 
-		// Separate into 3 categories: empty, critical, and low stock
-		const emptyMeds = lowStock.filter((r) => r.medsLeft <= 0);
-		const criticalMeds = lowStock.filter((r) => r.medsLeft > 0 && r.isCritical !== false);
-		const lowStockMeds = lowStock.filter((r) => r.medsLeft > 0 && r.isCritical === false);
-
-		// Build shared notification content (method-agnostic)
-		const titleParts: string[] = [];
-		if (emptyMeds.length > 0) {
-			titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty}`);
-		}
-		if (criticalMeds.length > 0) {
-			titleParts.push(`🚨 ${criticalMeds.length} ${tr.push.critical}`);
-		}
-		if (lowStockMeds.length > 0) {
-			titleParts.push(`⚠️ ${lowStockMeds.length} ${tr.push.lowStock}`);
-		}
-		const notificationTitle = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
-
-		// Build description text
-		let descriptionText: string;
-		if (emptyMeds.length > 0 && (criticalMeds.length > 0 || lowStockMeds.length > 0)) {
-			descriptionText = tr.stockReminder.descriptionMixed;
-		} else if (emptyMeds.length > 0) {
-			descriptionText = tr.stockReminder.descriptionEmpty;
-		} else if (criticalMeds.length > 0) {
-			descriptionText = tr.stockReminder.description;
-		} else {
-			descriptionText = tr.stockReminder.descriptionLow;
-		}
-
-		// Build section-based message (shared between email plain text and push)
-		const messageParts: string[] = [];
-		if (emptyMeds.length > 0) {
-			messageParts.push(`🚨 ${tr.push.emptySection}:`);
-			emptyMeds.forEach((r) => messageParts.push(`  • ${r.name}`));
-		}
-		if (criticalMeds.length > 0) {
-			if (messageParts.length > 0) messageParts.push("");
-			messageParts.push(`🚨 ${tr.push.criticalSection}:`);
-			criticalMeds.forEach((r) =>
-				messageParts.push(
-					`  • ${r.name}: ${t(tr.push.pillsLeft, { count: r.medsLeft })}, ${t(tr.push.daysLeft, { count: r.daysLeft ?? 0 })}`
-				)
-			);
-		}
-		if (lowStockMeds.length > 0) {
-			if (messageParts.length > 0) messageParts.push("");
-			messageParts.push(`⚠️ ${tr.push.lowStockSection}:`);
-			lowStockMeds.forEach((r) =>
-				messageParts.push(
-					`  • ${r.name}: ${t(tr.push.pillsLeft, { count: r.medsLeft })}, ${t(tr.push.daysLeft, { count: r.daysLeft ?? 0 })}`
-				)
-			);
-		}
+    // Separate empty from low stock medications
+    const emptyMeds = lowStock.filter(r => r.medsLeft <= 0);
+    const lowMeds = lowStock.filter(r => r.medsLeft > 0);
 
     // Send email if enabled
     if (notificationSettings.emailEnabled && email) {
       const smtpHost = process.env.SMTP_HOST;
       const smtpUser = process.env.SMTP_USER;
       const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS; // Token takes precedence
-			const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+      const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
       const smtpSecure = process.env.SMTP_SECURE === "true";
       const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
       if (smtpHost && smtpUser) {
-				// Build subject line from shared title parts
-				const subjectText = titleParts.join(", ");
+        // Build subject line based on what we have
+        let subjectText: string;
+        if (emptyMeds.length > 0 && lowMeds.length > 0) {
+          subjectText = `🚨 ${emptyMeds.length} Empty, ⚠️ ${lowMeds.length} Running Low`;
+        } else if (emptyMeds.length > 0) {
+          subjectText = `🚨 ${emptyMeds.length} Medication${emptyMeds.length > 1 ? "s" : ""} Empty`;
+        } else {
+          subjectText = `⚠️ ${lowMeds.length} Medication${lowMeds.length > 1 ? "s" : ""} Running Low`;
+        }
 
-				// Build alert boxes for each category
-				const alertParts: string[] = [];
-
-				if (emptyMeds.length > 0) {
-					const emptyAlert =
-						emptyMeds.length === 1
-							? tr.stockReminder.alertEmptySingle
-							: t(tr.stockReminder.alertEmptyMultiple, { count: emptyMeds.length });
-					alertParts.push(`
+        // Build alert box based on what we have
+        let alertHtml: string;
+        if (emptyMeds.length > 0 && lowMeds.length > 0) {
+          alertHtml = `
             <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fef2f2; border: 1px solid #dc2626;">
               <p style="margin: 0; color: #dc2626; font-weight: 600; font-size: 13px;">
-                ${emptyAlert}
+                🚨 ${emptyMeds.length} medication${emptyMeds.length > 1 ? "s" : ""} EMPTY - reorder immediately!
               </p>
-            </div>`);
-				}
-
-				if (criticalMeds.length > 0) {
-					const criticalAlert =
-						criticalMeds.length === 1
-							? tr.stockReminder.alertLowSingle
-							: t(tr.stockReminder.alertLowMultiple, { count: criticalMeds.length });
-					alertParts.push(`
-            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fff7ed; border: 1px solid #ea580c;">
-              <p style="margin: 0; color: #c2410c; font-weight: 600; font-size: 13px;">
-                ${criticalAlert}
-              </p>
-            </div>`);
-				}
-
-				if (lowStockMeds.length > 0) {
-					const lowAlert =
-						lowStockMeds.length === 1
-							? tr.stockReminder.alertLowStockSingle
-							: t(tr.stockReminder.alertLowStockMultiple, { count: lowStockMeds.length });
-					alertParts.push(`
-            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 12px; background: #fffbeb; border: 1px solid #f59e0b;">
+            </div>
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fffbeb; border: 1px solid #f59e0b;">
               <p style="margin: 0; color: #b45309; font-weight: 500; font-size: 13px;">
-                ${lowAlert}
+                ⚠️ ${lowMeds.length} medication${lowMeds.length > 1 ? "s" : ""} running low - reorder soon
               </p>
-            </div>`);
+            </div>`;
+        } else if (emptyMeds.length > 0) {
+          alertHtml = `
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fef2f2; border: 1px solid #dc2626;">
+              <p style="margin: 0; color: #dc2626; font-weight: 600; font-size: 13px;">
+                🚨 ${emptyMeds.length} medication${emptyMeds.length > 1 ? "s" : ""} EMPTY - reorder immediately!
+              </p>
+            </div>`;
+        } else {
+          alertHtml = `
+            <div style="padding: 10px 14px; border-radius: 8px; margin-bottom: 16px; background: #fffbeb; border: 1px solid #f59e0b;">
+              <p style="margin: 0; color: #b45309; font-weight: 500; font-size: 13px;">
+                ⚠️ ${lowMeds.length} medication${lowMeds.length > 1 ? "s" : ""} running low - reorder soon
+              </p>
+            </div>`;
         }
 
-				const alertHtml = alertParts.join("");
-
         // Build table rows with status indicator
         const buildTableRow = (row: LowStockItem) => {
           const isEmpty = row.medsLeft <= 0;
-					const isCritical = row.isCritical !== false;
-					const statusIcon = isEmpty ? "🚨" : isCritical ? "🚨" : "⚠️";
-					const rowBg = isEmpty ? "#fef2f2" : isCritical ? "#fff7ed" : "white";
-					const safeName = escapeHtml(row.name);
-					const safeMedsLeft = Number(row.medsLeft) || 0;
-					const safeDaysLeft = Number(row.daysLeft) || 0;
-					const safeDepletionDate = row.depletionDate ? escapeHtml(String(row.depletionDate)) : "-";
+          const statusIcon = isEmpty ? "🚨" : "⚠️";
+          const rowBg = isEmpty ? "#fef2f2" : "white";
           return `
           <tr style="background: ${rowBg};">
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${statusIcon} ${safeName}</td>
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${safeMedsLeft}</strong></td>
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${safeDaysLeft}</td>
-            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${isEmpty ? `<strong>${tr.stockReminder.now}</strong>` : safeDepletionDate}</td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; white-space: nowrap;">${statusIcon} ${escapeHtml(row.name)}</td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap; ${isEmpty ? "color: #dc2626; font-weight: 600;" : ""}"><strong>${row.medsLeft}</strong></td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${row.daysLeft ?? 0}</td>
+            <td style="padding: 10px 12px; border-bottom: 1px solid #e5e7eb; text-align: center; white-space: nowrap;">${isEmpty ? "<strong>NOW</strong>" : (row.depletionDate ?? "-")}</td>
           </tr>`;
         };
         
         const tableRows = lowStock.map(buildTableRow).join("");
 
+        // Build description text
+        let descriptionText: string;
+        if (emptyMeds.length > 0 && lowMeds.length > 0) {
+          descriptionText = "The following medications need to be reordered:";
+        } else if (emptyMeds.length > 0) {
+          descriptionText = "The following medications are EMPTY and need to be reordered immediately:";
+        } else {
+          descriptionText = "The following medications are running low and need to be reordered:";
+        }
+
         const html = `
           <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
             <div style="background: white; border-radius: 12px; padding: 16px; box-shadow: 0 1px 3px rgba(0,0,0,0.1);">
-              <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emptyMeds.length > 0 ? "🚨" : "⚠️"} MedAssist-ng - ${tr.push.reorderNow}</h2>
+              <h2 style="color: #1f2937; margin: 0 0 8px; font-size: 18px;">${emptyMeds.length > 0 ? "🚨" : "⚠️"} MedAssist-ng - Reorder Reminder</h2>
               <p style="color: #6b7280; margin: 0 0 16px; font-size: 13px;">${descriptionText}</p>
               
               ${alertHtml}
@@ -473,10 +324,10 @@ ${getFooterPlain(language)}`;
                 <table style="width: 100%; border-collapse: collapse; background: white; min-width: 400px;">
                   <thead>
                     <tr style="background: #f3f4f6;">
-                      <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.medication}</th>
-                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.pills}</th>
-                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.days}</th>
-                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">${tr.stockReminder.tableHeaders.runsOut}</th>
+                      <th style="padding: 10px 12px; text-align: left; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Medication</th>
+                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Pills</th>
+                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Days</th>
+                      <th style="padding: 10px 12px; text-align: center; font-size: 11px; text-transform: uppercase; color: #6b7280; white-space: nowrap;">Runs Out</th>
                     </tr>
                   </thead>
                   <tbody>
@@ -486,12 +337,33 @@ ${getFooterPlain(language)}`;
               </div>
 
               <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
-              <p style="color: #9ca3af; font-size: 11px; margin: 0;">${getFooterHtml(language)}</p>
+              <p style="color: #9ca3af; font-size: 11px; margin: 0;">Sent from MedAssist-ng Medication Planner</p>
             </div>
           </div>
         `;
 
-				const plainText = `MedAssist-ng - ${tr.push.reorderNow}\n\n${messageParts.join("\n")}\n\n---\n${getFooterPlain(language)}`;
+        // Build plain text with sections
+        let plainTextContent: string;
+        if (emptyMeds.length > 0 && lowMeds.length > 0) {
+          plainTextContent = `🚨 EMPTY (reorder immediately):
+${emptyMeds.map((r) => `  • ${r.name}`).join("\n")}
+
+⚠️ RUNNING LOW (reorder soon):
+${lowMeds.map((r) => `  • ${r.name}: ${r.medsLeft} pills left, ${r.daysLeft ?? 0} days remaining`).join("\n")}`;
+        } else if (emptyMeds.length > 0) {
+          plainTextContent = `🚨 EMPTY (reorder immediately):
+${emptyMeds.map((r) => `  • ${r.name}`).join("\n")}`;
+        } else {
+          plainTextContent = `⚠️ Running low:
+${lowMeds.map((r) => `  • ${r.name}: ${r.medsLeft} pills left, ${r.daysLeft ?? 0} days remaining, runs out ${r.depletionDate ?? "soon"}`).join("\n")}`;
+        }
+
+        const plainText = `MedAssist-ng - Reorder Reminder
+
+${plainTextContent}
+
+---
+Sent from MedAssist-ng Medication Planner`;
 
         try {
           const transporter = nodemailer.createTransport({
@@ -522,10 +394,34 @@ ${getFooterPlain(language)}`;
 
     // Send push notification if enabled
     if (notificationSettings.shoutrrrEnabled && notificationSettings.shoutrrrUrl) {
-			const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
+      // Get translations based on user language (default to 'en')
+      const tr = getTranslations((userSettings.language as Language) || "en");
+      
+      // Build clear title
+      const titleParts: string[] = [];
+      if (emptyMeds.length > 0) {
+        titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty}`);
+      }
+      if (lowMeds.length > 0) {
+        titleParts.push(`⚠️ ${lowMeds.length} ${tr.push.low}`);
+      }
+      const title = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow}`;
+      
+      // Build clear message with sections
+      const messageParts: string[] = [];
+      if (emptyMeds.length > 0) {
+        messageParts.push(`🚨 ${tr.push.emptySection}:`);
+        emptyMeds.forEach(r => messageParts.push(`  • ${r.name}`));
+      }
+      if (lowMeds.length > 0) {
+        if (emptyMeds.length > 0) messageParts.push("");
+        messageParts.push(`⚠️ ${tr.push.lowSection}:`);
+        lowMeds.forEach(r => messageParts.push(`  • ${r.name}: ${t(tr.push.pillsLeft, { count: r.medsLeft })}, ${t(tr.push.daysLeft, { count: r.daysLeft ?? 0 })}`));
+      }
+      const message = messageParts.join("\n");
 
       try {
-				const pushResult = await sendShoutrrrNotification(notificationSettings.shoutrrrUrl, notificationTitle, message);
+        const pushResult = await sendShoutrrrNotification(notificationSettings.shoutrrrUrl, title, message);
         if (pushResult.success) {
           results.push = true;
         } else {
@@ -543,9 +439,7 @@ ${getFooterPlain(language)}`;
       updateReminderSentTime("stock", channel);
       
       // Also update user settings in database so frontend can display the info
-			const firstMed = lowStock[0];
-			const medNames = lowStock.length > 1 ? `${firstMed.name} (+${lowStock.length - 1})` : firstMed?.name;
-			await updateUserReminderSentTime(userId, "stock", channel, medNames);
+      await updateUserReminderSentTime(userId, "stock", channel);
     }
 
     // Build response message
@@ -556,7 +450,7 @@ ${getFooterPlain(language)}`;
     if (sentChannels.length > 0) {
       return reply.send({ 
         success: true, 
-				message: `Reminder sent via ${sentChannels.join(" and ")}`,
+        message: `Reminder sent via ${sentChannels.join(" and ")}` 
       });
     } else if (results.errors.length > 0) {
       return reply.status(500).send({ error: results.errors.join("; ") });

backend/src/routes/refills.ts

@@ -1,138 +0,0 @@
-import { and, desc, eq } from "drizzle-orm";
-import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
-import { z } from "zod";
-import { db } from "../db/client.js";
-import { medications, refillHistory } from "../db/schema.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
-import { env } from "../plugins/env.js";
-import type { AuthUser } from "../types/fastify.js";
-
-const refillSchema = z
-	.object({
-		packsAdded: z.number().int().min(0).default(0),
-		loosePillsAdded: z.number().int().min(0).default(0),
-	})
-	.refine((data) => data.packsAdded > 0 || data.loosePillsAdded > 0, {
-		message: "Must add at least one pack or some loose pills",
-	});
-
-export async function refillRoutes(app: FastifyInstance) {
-	// All refill routes require auth
-	app.addHook("preHandler", requireAuth);
-
-	// Helper to get user ID from request
-	async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
-		if (!env.AUTH_ENABLED) {
-			return getAnonymousUserId();
-		}
-		const authUser = request.user as unknown as AuthUser | null;
-		if (!authUser) {
-			reply.status(401).send({ error: "User not authenticated", code: "AUTH_REQUIRED" });
-			throw new Error("AUTH_REQUIRED");
-		}
-		return authUser.id;
-	}
-
-	// POST /medications/:id/refill - Add stock to medication
-	app.post<{ Params: { id: string } }>("/medications/:id/refill", async (req, reply) => {
-		const parsed = refillSchema.safeParse(req.body);
-		if (!parsed.success) return reply.status(400).send(parsed.error.format());
-
-		const medId = Number(req.params.id);
-		if (Number.isNaN(medId)) return reply.badRequest("Invalid medication id");
-
-		const userId = await getUserId(req, reply);
-
-		// Verify ownership
-		const [med] = await db
-			.select()
-			.from(medications)
-			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
-		if (!med) return reply.notFound("Medication not found");
-
-		const { packsAdded, loosePillsAdded } = parsed.data;
-
-		// Update medication stock
-		const newPackCount = med.packCount + packsAdded;
-		const newLooseTablets = med.looseTablets + loosePillsAdded;
-
-		await db
-			.update(medications)
-			.set({
-				packCount: newPackCount,
-				looseTablets: newLooseTablets,
-				stockAdjustment: 0, // Reset offset since we're adding to base stock
-				lastStockCorrectionAt: new Date(), // Reset consumed counter to now
-				updatedAt: new Date(),
-			})
-			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
-
-		// Create refill history entry
-		const [refill] = await db
-			.insert(refillHistory)
-			.values({
-				medicationId: medId,
-				userId,
-				packsAdded,
-				loosePillsAdded,
-			})
-			.returning();
-
-		// Calculate pills added for response (packageType-aware)
-		const isBottle = (med.packageType ?? "blister") === "bottle";
-		const pillsPerPack = isBottle ? 0 : med.blistersPerPack * med.pillsPerBlister;
-		const totalPillsAdded = isBottle ? loosePillsAdded : packsAdded * pillsPerPack + loosePillsAdded;
-		const newTotalPills = isBottle
-			? newLooseTablets + (med.stockAdjustment ?? 0)
-			: newPackCount * pillsPerPack + newLooseTablets + (med.stockAdjustment ?? 0);
-
-		return {
-			success: true,
-			refill: {
-				id: refill.id,
-				packsAdded,
-				loosePillsAdded,
-				totalPillsAdded,
-				refillDate: refill.refillDate,
-			},
-			newStock: {
-				packCount: newPackCount,
-				looseTablets: newLooseTablets,
-				totalPills: newTotalPills,
-			},
-		};
-	});
-
-	// GET /medications/:id/refills - Get refill history for a medication
-	app.get<{ Params: { id: string } }>("/medications/:id/refills", async (req, reply) => {
-		const medId = Number(req.params.id);
-		if (Number.isNaN(medId)) return reply.badRequest("Invalid medication id");
-
-		const userId = await getUserId(req, reply);
-
-		// Verify ownership
-		const [med] = await db
-			.select()
-			.from(medications)
-			.where(and(eq(medications.id, medId), eq(medications.userId, userId)));
-		if (!med) return reply.notFound("Medication not found");
-
-		// Get refill history, newest first
-		const refills = await db
-			.select()
-			.from(refillHistory)
-			.where(eq(refillHistory.medicationId, medId))
-			.orderBy(desc(refillHistory.refillDate));
-
-		const isBottle = (med.packageType ?? "blister") === "bottle";
-		const pillsPerPack = isBottle ? 0 : med.blistersPerPack * med.pillsPerBlister;
-
-		return refills.map((r) => ({
-			id: r.id,
-			packsAdded: r.packsAdded,
-			loosePillsAdded: r.loosePillsAdded,
-			totalPillsAdded: isBottle ? r.loosePillsAdded : r.packsAdded * pillsPerPack + r.loosePillsAdded,
-			refillDate: r.refillDate,
-		}));
-	});
-}

backend/src/routes/settings.ts

@@ -1,12 +1,12 @@
-import { eq } from "drizzle-orm";
-import type { FastifyInstance } from "fastify";
+import { FastifyInstance } from "fastify";
 import nodemailer from "nodemailer";
 import { db } from "../db/client.js";
 import { userSettings } from "../db/schema.js";
-import type { Language } from "../i18n/translations.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
+import { eq } from "drizzle-orm";
+import { requireAuth, getAnonymousUserId } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
+import type { Language } from "../i18n/translations.js";
 
 // Exported type for use in schedulers
 export type UserSettings = {
@@ -30,15 +30,9 @@ export type UserSettings = {
   highStockDays: number;
   language: Language;
   stockCalculationMode: "automatic" | "manual";
-	shareStockStatus: boolean;
   lastAutoEmailSent: string | null;
   lastNotificationType: string | null;
   lastNotificationChannel: string | null;
-	lastReminderMedName: string | null;
-	lastReminderTakenBy: string | null;
-	lastStockReminderSent: string | null;
-	lastStockReminderChannel: string | null;
-	lastStockReminderMedNames: string | null;
 };
 
 type SettingsBody = {
@@ -61,7 +55,6 @@ type SettingsBody = {
   maxNaggingReminders: number;
   language: string;
   stockCalculationMode: "automatic" | "manual";
-	shareStockStatus: boolean;
 };
 
 type TestEmailBody = {
@@ -84,7 +77,7 @@ function envInt(key: string, defaultVal: number): number {
   const val = process.env[key];
   if (val === undefined) return defaultVal;
   const parsed = parseInt(val, 10);
-	return Number.isNaN(parsed) ? defaultVal : parsed;
+  return isNaN(parsed) ? defaultVal : parsed;
 }
 
 // Default settings for new users - read from ENV with fallbacks
@@ -109,15 +102,9 @@ function getDefaultSettings() {
     highStockDays: envInt("DEFAULT_HIGH_STOCK_DAYS", 180),
     language: (process.env.DEFAULT_LANGUAGE as "en" | "de") || "en",
     stockCalculationMode: (process.env.DEFAULT_STOCK_CALCULATION_MODE as "automatic" | "manual") || "automatic",
-		shareStockStatus: envBool("DEFAULT_SHARE_STOCK_STATUS", true),
     lastAutoEmailSent: null,
     lastNotificationType: null,
     lastNotificationChannel: null,
-		lastReminderMedName: null,
-		lastReminderTakenBy: null,
-		lastStockReminderSent: null,
-		lastStockReminderChannel: null,
-		lastStockReminderMedNames: null,
   };
 }
 
@@ -127,13 +114,10 @@ async function getOrCreateUserSettings(userId: number) {
   
   if (!settings) {
     // Create default settings for user (using ENV defaults)
-		[settings] = await db
-			.insert(userSettings)
-			.values({
+    [settings] = await db.insert(userSettings).values({
       userId,
       ...getDefaultSettings(),
-			})
-			.returning();
+    }).returning();
   }
   
   return settings;
@@ -163,22 +147,16 @@ export async function loadUserSettings(userId: number): Promise<UserSettings> {
     highStockDays: settings.highStockDays,
     language: settings.language as Language,
     stockCalculationMode: (settings.stockCalculationMode as "automatic" | "manual") ?? "automatic",
-		shareStockStatus: settings.shareStockStatus ?? true,
     lastAutoEmailSent: settings.lastAutoEmailSent,
     lastNotificationType: settings.lastNotificationType,
     lastNotificationChannel: settings.lastNotificationChannel,
-		lastReminderMedName: settings.lastReminderMedName ?? null,
-		lastReminderTakenBy: settings.lastReminderTakenBy ?? null,
-		lastStockReminderSent: settings.lastStockReminderSent ?? null,
-		lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
-		lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
   };
 }
 
 // Get all users with settings for scheduler
 export async function getAllUserSettings(): Promise<UserSettings[]> {
   const allSettings = await db.select().from(userSettings);
-	return allSettings.map((settings) => ({
+  return allSettings.map(settings => ({
     userId: settings.userId,
     emailEnabled: settings.emailEnabled,
     notificationEmail: settings.notificationEmail,
@@ -199,15 +177,9 @@ export async function getAllUserSettings(): Promise<UserSettings[]> {
     highStockDays: settings.highStockDays,
     language: settings.language as Language,
     stockCalculationMode: (settings.stockCalculationMode as "automatic" | "manual") ?? "automatic",
-		shareStockStatus: settings.shareStockStatus ?? true,
     lastAutoEmailSent: settings.lastAutoEmailSent,
     lastNotificationType: settings.lastNotificationType,
     lastNotificationChannel: settings.lastNotificationChannel,
-		lastReminderMedName: settings.lastReminderMedName ?? null,
-		lastReminderTakenBy: settings.lastReminderTakenBy ?? null,
-		lastStockReminderSent: settings.lastStockReminderSent ?? null,
-		lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
-		lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
   }));
 }
 
@@ -258,10 +230,9 @@ export async function settingsRoutes(app: FastifyInstance) {
       maxNaggingReminders: settings.maxNaggingReminders ?? 5,
       language: settings.language,
       stockCalculationMode: settings.stockCalculationMode ?? "automatic",
-			shareStockStatus: settings.shareStockStatus ?? true,
       // SMTP settings (from .env - shared/server-configured)
       smtpHost: process.env.SMTP_HOST ?? "",
-			smtpPort: parseInt(process.env.SMTP_PORT ?? "587", 10),
+      smtpPort: parseInt(process.env.SMTP_PORT ?? "587"),
       smtpUser: process.env.SMTP_USER ?? "",
       smtpFrom: process.env.SMTP_FROM ?? "",
       smtpSecure: process.env.SMTP_SECURE === "true",
@@ -270,12 +241,6 @@ export async function settingsRoutes(app: FastifyInstance) {
       lastAutoEmailSent: settings.lastAutoEmailSent,
       lastNotificationType: settings.lastNotificationType,
       lastNotificationChannel: settings.lastNotificationChannel,
-			lastReminderMedName: settings.lastReminderMedName ?? null,
-			lastReminderTakenBy: settings.lastReminderTakenBy ?? null,
-			// Stock reminder tracking (separate from intake)
-			lastStockReminderSent: settings.lastStockReminderSent ?? null,
-			lastStockReminderChannel: settings.lastStockReminderChannel ?? null,
-			lastStockReminderMedNames: settings.lastStockReminderMedNames ?? null,
       // Server settings (from .env, read-only)
       expiryWarningDays: parseInt(process.env.EXPIRY_WARNING_DAYS ?? "30", 10),
     });
@@ -318,12 +283,13 @@ export async function settingsRoutes(app: FastifyInstance) {
       highStockDays: body.highStockDays ?? 180,
       language: body.language ?? "en",
       stockCalculationMode: body.stockCalculationMode ?? "automatic",
-			shareStockStatus: body.shareStockStatus ?? true,
       updatedAt: new Date(),
     };
 
     if (existingSettings.length > 0) {
-			await db.update(userSettings).set(settingsData).where(eq(userSettings.userId, userId));
+      await db.update(userSettings)
+        .set(settingsData)
+        .where(eq(userSettings.userId, userId));
     } else {
       await db.insert(userSettings).values({
         userId: userId,
@@ -341,7 +307,7 @@ export async function settingsRoutes(app: FastifyInstance) {
     const smtpHost = process.env.SMTP_HOST;
     const smtpUser = process.env.SMTP_USER;
     const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS;
-		const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+    const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
     const smtpSecure = process.env.SMTP_SECURE === "true";
     const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
@@ -392,11 +358,7 @@ export async function settingsRoutes(app: FastifyInstance) {
     }
 
     try {
-			const result = await sendShoutrrrNotification(
-				url,
-				"MedAssist-ng Test",
-				"This is a test notification from MedAssist-ng. If you received this, your notification configuration is working correctly!"
-			);
+      const result = await sendShoutrrrNotification(url, "MedAssist-ng Test", "This is a test notification from MedAssist-ng. If you received this, your notification configuration is working correctly!");
       
       if (result.success) {
         return reply.send({ success: true, message: "Test notification sent successfully" });
@@ -410,29 +372,27 @@ export async function settingsRoutes(app: FastifyInstance) {
   });
 }
 
-// Validate and sanitize URL to prevent SSRF attacks
-// Returns a reconstructed URL from validated components to break taint tracking
-function sanitizeNotificationUrl(
-	urlStr: string
-): { url: string; isNtfy: boolean; auth?: { user: string; pass: string } } | { error: string } {
+// Validate URL to prevent SSRF attacks
+function isAllowedNotificationUrl(urlStr: string): { allowed: boolean; error?: string } {
   try {
-		// Convert ntfy:// to https:// for parsing, track if it was ntfy
-		const isNtfy = urlStr.startsWith("ntfy://");
-		const normalizedUrl = isNtfy ? urlStr.replace("ntfy://", "https://") : urlStr;
+    // Convert ntfy:// to https:// for parsing
+    const normalizedUrl = urlStr.startsWith("ntfy://") 
+      ? urlStr.replace("ntfy://", "https://") 
+      : urlStr;
     
     const parsed = new URL(normalizedUrl);
     
     // Only allow http and https protocols
-		if (!["http:", "https:"].includes(parsed.protocol)) {
-			return { error: "Only HTTP/HTTPS protocols are allowed" };
+    if (!['http:', 'https:'].includes(parsed.protocol)) {
+      return { allowed: false, error: "Only HTTP/HTTPS protocols are allowed" };
     }
     
     // Block private/internal IP addresses
     const hostname = parsed.hostname.toLowerCase();
     
     // Block localhost
-		if (hostname === "localhost" || hostname === "127.0.0.1" || hostname === "::1") {
-			return { error: "Localhost URLs are not allowed" };
+    if (hostname === 'localhost' || hostname === '127.0.0.1' || hostname === '::1') {
+      return { allowed: false, error: "Localhost URLs are not allowed" };
     }
     
     // Block private IP ranges (basic check)
@@ -440,127 +400,66 @@ function sanitizeNotificationUrl(
     if (ipMatch) {
       const [, a, b] = ipMatch.map(Number);
       // 10.x.x.x, 172.16-31.x.x, 192.168.x.x, 169.254.x.x (link-local)
-			if (
-				a === 10 ||
-				a === 127 ||
-				(a === 172 && b >= 16 && b <= 31) ||
-				(a === 192 && b === 168) ||
-				(a === 169 && b === 254)
-			) {
-				return { error: "Private IP addresses are not allowed" };
+      if (a === 10 || a === 127 || (a === 172 && b >= 16 && b <= 31) || 
+          (a === 192 && b === 168) || (a === 169 && b === 254)) {
+        return { allowed: false, error: "Private IP addresses are not allowed" };
       }
     }
     
     // Block common internal hostnames
-		if (
-			hostname.endsWith(".local") ||
-			hostname.endsWith(".internal") ||
-			hostname.endsWith(".lan") ||
-			hostname === "metadata.google.internal"
-		) {
-			return { error: "Internal hostnames are not allowed" };
+    if (hostname.endsWith('.local') || hostname.endsWith('.internal') || 
+        hostname.endsWith('.lan') || hostname === 'metadata.google.internal') {
+      return { allowed: false, error: "Internal hostnames are not allowed" };
     }
     
-		// Reconstruct URL from validated components - this breaks taint tracking
-		// because we're building a new string from validated parts, not passing through user input
-		const reconstructedUrl = `${parsed.protocol}//${parsed.host}${parsed.pathname}${parsed.search}`;
-
-		// Extract auth credentials separately for ntfy (they're in the URL but not in host)
-		const auth =
-			isNtfy && parsed.username && parsed.password ? { user: parsed.username, pass: parsed.password } : undefined;
-
-		return { url: reconstructedUrl, isNtfy, auth };
+    return { allowed: true };
   } catch {
-		return { error: "Invalid URL format" };
+    return { allowed: false, error: "Invalid URL format" };
   }
 }
 
 // Send notification via Shoutrrr-compatible URL (supports ntfy, Discord, Telegram, etc.)
-export async function sendShoutrrrNotification(
-	urlStr: string,
-	title: string,
-	message: string
-): Promise<{ success: boolean; error?: string }> {
+export async function sendShoutrrrNotification(urlStr: string, title: string, message: string): Promise<{ success: boolean; error?: string }> {
   try {
-		// Validate and sanitize URL to prevent SSRF - this reconstructs the URL
-		// from validated components, breaking taint tracking
-		const validation = sanitizeNotificationUrl(urlStr);
-		if ("error" in validation) {
+    // Validate URL to prevent SSRF
+    const validation = isAllowedNotificationUrl(urlStr);
+    if (!validation.allowed) {
       return { success: false, error: validation.error };
     }
     
-		// Use ONLY the reconstructed URL from validation - never the original urlStr
-		const { url: sanitizedUrl, isNtfy, auth } = validation;
-
     let targetUrl: string;
-		const method = "POST";
+    let method = "POST";
     let headers: Record<string, string> = {};
     let body: string | undefined;
 
     // Remove emojis from title for header compatibility
-		const cleanTitle = title
-			.replace(
-				/[\u{1F300}-\u{1F9FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]|[\u{FE00}-\u{FE0F}]|[\u{2000}-\u{206F}]|⚠|️/gu,
-				""
-			)
-			.trim();
+    const cleanTitle = title.replace(/[\u{1F300}-\u{1F9FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]|[\u{FE00}-\u{FE0F}]|[\u{2000}-\u{206F}]|⚠|️/gu, "").trim();
 
-		// Determine notification type based on URL hostname
-		// Use JSON format only for known webhook services that require it
-		// Use proper URL parsing to prevent bypass attacks (e.g., evil.com?hooks.slack.com)
-		let isJsonWebhook = false;
-		try {
-			const parsedUrl = new URL(sanitizedUrl);
-			const hostname = parsedUrl.hostname.toLowerCase();
-			const pathname = parsedUrl.pathname.toLowerCase();
-
-			isJsonWebhook =
-				// Discord webhooks
-				((hostname === "discord.com" || hostname === "discordapp.com") && pathname.startsWith("/api/webhooks")) ||
-				// Slack webhooks
-				hostname === "hooks.slack.com" ||
-				hostname.endsWith(".hooks.slack.com") ||
-				// Telegram API
-				hostname === "api.telegram.org" ||
-				// Gotify (can be self-hosted, so check if "gotify" is in hostname)
-				hostname.includes("gotify");
-		} catch {
-			// If URL parsing fails, default to ntfy-style
-			isJsonWebhook = false;
-		}
-
-		// Default to ntfy-style (plain text with Title header) for all other HTTP URLs
-		// This works for ntfy, Apprise, and most simple push services
-		if (!isJsonWebhook) {
-			targetUrl = sanitizedUrl;
-			headers = { Title: cleanTitle, Tags: "pill" };
+    if (urlStr.startsWith("ntfy://")) {
+      const parsed = new URL(urlStr.replace("ntfy://", "https://"));
+      targetUrl = `https://${parsed.host}${parsed.pathname}`;
+      headers = { "Title": cleanTitle, "Tags": "pill" };
       body = message;
       
-			// Add auth if present (extracted during sanitization)
-			if (auth) {
-				headers.Authorization = `Basic ${Buffer.from(`${auth.user}:${auth.pass}`).toString("base64")}`;
+      if (parsed.username && parsed.password) {
+        headers["Authorization"] = "Basic " + Buffer.from(`${parsed.username}:${parsed.password}`).toString("base64");
       }
-		} else if (sanitizedUrl.startsWith("http://") || sanitizedUrl.startsWith("https://")) {
-			targetUrl = sanitizedUrl;
+    } else if (urlStr.startsWith("https://ntfy.") || urlStr.includes("ntfy.sh") || urlStr.includes("/ntfy/")) {
+      targetUrl = urlStr;
+      headers = { "Title": cleanTitle, "Tags": "pill" };
+      body = message;
+    } else if (urlStr.startsWith("http://") || urlStr.startsWith("https://")) {
+      targetUrl = urlStr;
       headers = { "Content-Type": "application/json" };
       body = JSON.stringify({ title, message, text: `${title}\n\n${message}` });
     } else {
       return { success: false, error: "Unsupported URL format. Use ntfy:// or https:// URL" };
     }
 
-		// SSRF protection: targetUrl is reconstructed from sanitizeNotificationUrl() which validates:
-		// - Only http/https protocols allowed
-		// - Blocks localhost (localhost, 127.0.0.1, ::1)
-		// - Blocks private IPs (10.x.x.x, 172.16-31.x.x, 192.168.x.x, 169.254.x.x)
-		// - Blocks internal hostnames (.local, .internal, .lan, metadata.google.internal)
-		// - redirect: "error" prevents redirect-based bypass attacks
-		// This is an intentional feature: users configure their own external notification services
-		// lgtm [js/request-forgery]
     const response = await fetch(targetUrl, {
       method,
       headers,
       body,
-			redirect: "error", // Don't follow redirects that could bypass validation
     });
 
     if (response.ok) {
@@ -574,3 +473,4 @@ export async function sendShoutrrrNotification(
     return { success: false, error: errorMessage };
   }
 }
+

backend/src/routes/share.ts

@@ -1,18 +1,12 @@
-import { randomBytes } from "node:crypto";
-import { eq } from "drizzle-orm";
-import type { FastifyInstance, FastifyReply, FastifyRequest } from "fastify";
+import { FastifyInstance } from "fastify";
 import { z } from "zod";
+import { randomBytes } from "crypto";
 import { db } from "../db/client.js";
 import { medications, shareTokens, userSettings, users } from "../db/schema.js";
-import { getAnonymousUserId, requireAuth } from "../plugins/auth.js";
+import { eq, and, sql } from "drizzle-orm";
+import { requireAuth, optionalAuth, getAnonymousUserId } from "../plugins/auth.js";
 import { env } from "../plugins/env.js";
 import type { AuthUser } from "../types/fastify.js";
-import {
-	getAllTakenByForMedication,
-	parseIntakesJson,
-	parseTakenByJson,
-	personTakesMedication,
-} from "../utils/scheduler-utils.js";
 
 // Share token validity: 1 year in milliseconds
 const SHARE_TOKEN_VALIDITY_MS = 365 * 24 * 60 * 60 * 1000;
@@ -27,7 +21,7 @@ const createShareSchema = z.object({
 
 // Helper to get user ID from request
 // Returns anonymous user ID when auth is disabled
-async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<number> {
+async function getUserId(request: any, reply: any): Promise<number> {
   // If auth is disabled, use the anonymous user
   if (!env.AUTH_ENABLED) {
     return getAnonymousUserId();
@@ -41,6 +35,17 @@ async function getUserId(request: FastifyRequest, reply: FastifyReply): Promise<
   return authUser.id;
 }
 
+// Helper to parse takenByJson
+function parseTakenByJson(takenByJson: string | null | undefined): string[] {
+  if (!takenByJson) return [];
+  try {
+    const parsed = JSON.parse(takenByJson);
+    return Array.isArray(parsed) ? parsed.filter((s: unknown) => typeof s === "string" && s.trim()) : [];
+  } catch {
+    return [];
+  }
+}
+
 // =============================================================================
 // Share Routes
 // =============================================================================
@@ -56,7 +61,7 @@ export async function shareRoutes(app: FastifyInstance) {
     if (!share) {
       return reply.status(404).send({ 
         error: "Share link not found",
-				code: "NOT_FOUND",
+        code: "NOT_FOUND"
       });
     }
 
@@ -83,60 +88,45 @@ export async function shareRoutes(app: FastifyInstance) {
     // Use SQLite JSON function to check if takenBy is in the array
     const allMeds = await db.select().from(medications).where(eq(medications.userId, share.userId));
     
-		// Filter medications where takenBy matches either medication-level OR any intake-level takenBy
+    // Filter medications where takenByJson array contains the share.takenBy value
     const meds = allMeds.filter((med) => {
       const takenByArray = parseTakenByJson(med.takenByJson);
-			const intakes = parseIntakesJson(
-				med.intakesJson,
-				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
-				med.intakeRemindersEnabled ?? false
-			);
-			return personTakesMedication(share.takenBy, takenByArray, intakes);
+      return takenByArray.includes(share.takenBy);
     });
 
     // Parse blisters and build schedule data
     const medicationsWithBlisters = meds.map((med) => {
-			// Parse intakes from new format, falling back to legacy
-			const intakes = parseIntakesJson(
-				med.intakesJson,
-				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
-				med.intakeRemindersEnabled ?? false
-			);
-
-			// Convert to legacy blisters format for backward compat
-			const blisters = intakes.map((i) => ({
-				usage: i.usage,
-				every: i.every,
-				start: i.start,
+      let blisters: { usage: number; every: number; start: string }[] = [];
+      try {
+        const usageArr = JSON.parse(med.usageJson || "[]");
+        const everyArr = JSON.parse(med.everyJson || "[]");
+        const startArr = JSON.parse(med.startJson || "[]");
+        blisters = usageArr.map((usage: number, i: number) => ({
+          usage,
+          every: everyArr[i] ?? 1,
+          start: startArr[i] ?? new Date().toISOString(),
         }));
+      } catch {
+        blisters = [];
+      }
 
       // Parse takenBy JSON array
       const takenByArray = parseTakenByJson(med.takenByJson);
 
-			const totalPills =
-				(med.packageType ?? "blister") === "bottle"
-					? med.looseTablets + (med.stockAdjustment ?? 0)
-					: med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets + (med.stockAdjustment ?? 0);
+      const totalPills = med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets;
       return {
         id: med.id,
         name: med.name,
         genericName: med.genericName,
         pillWeightMg: med.pillWeightMg,
-				doseUnit: med.doseUnit ?? "mg",
         imageUrl: med.imageUrl,
         totalPills,
-				packageType: med.packageType ?? "blister",
         packCount: med.packCount,
         blistersPerPack: med.blistersPerPack,
         looseTablets: med.looseTablets,
         pillsPerBlister: med.pillsPerBlister,
         takenBy: takenByArray,
-				intakes, // New unified format with per-intake takenBy
-				blisters, // Legacy format for backward compat
-				dismissedUntil: med.dismissedUntil,
-				updatedAt: med.updatedAt, // For filtering out doses from previous schedule configurations
-				lastStockCorrectionAt: med.lastStockCorrectionAt?.getTime() ?? null,
-				stockAdjustment: med.stockAdjustment ?? 0,
+        blisters,
       };
     });
 
@@ -147,13 +137,7 @@ export async function shareRoutes(app: FastifyInstance) {
       medications: medicationsWithBlisters,
       stockThresholds: {
         lowStockDays: settings?.lowStockDays ?? 30,
-				normalStockDays: settings?.normalStockDays ?? 60,
-				highStockDays: settings?.highStockDays ?? 90,
-				reminderDaysBefore: settings?.reminderDaysBefore ?? 7,
-				expiryWarningDays: settings?.expiryWarningDays ?? 90,
       },
-			stockCalculationMode: (settings?.stockCalculationMode as "automatic" | "manual") ?? "automatic",
-			shareStockStatus: settings?.shareStockStatus ?? true,
     };
   });
 
@@ -176,16 +160,11 @@ export async function shareRoutes(app: FastifyInstance) {
 
       const { takenBy, scheduleDays } = parsed.data;
 
-			// Check if user has medications for this takenBy (search in both medication-level and intake-level)
+      // Check if user has medications for this takenBy (search in JSON array)
       const allMeds = await db.select().from(medications).where(eq(medications.userId, userId));
       const medsForPerson = allMeds.filter((med) => {
         const takenByArray = parseTakenByJson(med.takenByJson);
-				const intakes = parseIntakesJson(
-					med.intakesJson,
-					{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
-					med.intakeRemindersEnabled ?? false
-				);
-				return personTakesMedication(takenBy, takenByArray, intakes);
+        return takenByArray.includes(takenBy);
       });
 
       if (medsForPerson.length === 0) {
@@ -221,37 +200,27 @@ export async function shareRoutes(app: FastifyInstance) {
   // ---------------------------------------------------------------------------
   // GET /share/people - PROTECTED: Get list of unique takenBy values
   // ---------------------------------------------------------------------------
-	app.get("/share/people", { preHandler: requireAuth }, async (request, reply) => {
+  app.get(
+    "/share/people",
+    { preHandler: requireAuth },
+    async (request, reply) => {
       const userId = await getUserId(request, reply);
 
-		// Get all unique takenBy values for this user (from both medication-level and intake-level)
-		const meds = await db
-			.select({
-				takenByJson: medications.takenByJson,
-				intakesJson: medications.intakesJson,
-				usageJson: medications.usageJson,
-				everyJson: medications.everyJson,
-				startJson: medications.startJson,
-				intakeRemindersEnabled: medications.intakeRemindersEnabled,
-			})
+      // Get all unique takenBy values for this user (from JSON arrays)
+      const meds = await db.select({ takenByJson: medications.takenByJson })
         .from(medications)
         .where(eq(medications.userId, userId));
 
-		// Collect all unique person names from medication-level AND intake-level takenBy
+      // Collect all unique person names from all takenByJson arrays
       const allPeople = new Set<string>();
       for (const med of meds) {
         const takenByArray = parseTakenByJson(med.takenByJson);
-			const intakes = parseIntakesJson(
-				med.intakesJson,
-				{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
-				med.intakeRemindersEnabled ?? false
-			);
-			const allForMed = getAllTakenByForMedication(takenByArray, intakes);
-			for (const person of allForMed) {
+        for (const person of takenByArray) {
           if (person) allPeople.add(person);
         }
       }
 
       return { people: [...allPeople].sort() };
-	});
+    }
+  );
 }

backend/src/services/intake-reminder-scheduler.ts

@@ -1,40 +1,32 @@
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { and, eq, gte, lte } from "drizzle-orm";
 import nodemailer from "nodemailer";
+import { eq, and, gte, lte } from "drizzle-orm";
 import { db } from "../db/client.js";
-import { getDataDir } from "../db/db-utils.js";
-import { doseTracking, medications } from "../db/schema.js";
-import {
-	getDateLocale,
-	getFooterHtml,
-	getFooterPlain,
-	getTranslations,
-	type Language,
-	t,
-} from "../i18n/translations.js";
+import { medications, doseTracking } from "../db/schema.js";
+import { readFileSync, writeFileSync, existsSync } from "fs";
+import { resolve } from "path";
 import { getAllUserSettings, sendShoutrrrNotification, type UserSettings } from "../routes/settings.js";
-import type { ServiceLogger } from "../utils/logger.js";
+import { getTranslations, t, getDateLocale, type Language } from "../i18n/translations.js";
+import { getReminderState, updateReminderSentTime, updateUserReminderSentTime } from "./reminder-scheduler.js";
+
 // Import shared utilities
 import {
-	cleanOldIntakeReminders,
-	createDefaultIntakeReminderState,
   getTimezone,
-	getTodaysIntakes,
-	getUpcomingIntakes,
-	type Intake,
-	type IntakeReminderState,
-	parseIntakeReminderState,
-	parseIntakesJson,
+  parseBlisters,
   parseTakenByJson,
+  getUpcomingIntakes,
+  getTodaysIntakes,
+  parseIntakeReminderState,
+  createDefaultIntakeReminderState,
+  cleanOldIntakeReminders,
+  type Blister,
+  type IntakeReminderState,
   type UpcomingIntake,
 } from "../utils/scheduler-utils.js";
-import { updateReminderSentTime, updateUserReminderSentTime } from "./reminder-scheduler.js";
 
 const REMINDER_MINUTES_BEFORE = parseInt(process.env.REMINDER_MINUTES_BEFORE ?? "15", 10);
 const CHECK_INTERVAL_MS = 60 * 1000; // Check every 1 minute
 
-const intakeReminderStateFile = resolve(getDataDir(), "intake-reminder-state.json");
+const intakeReminderStateFile = resolve(process.cwd(), "data", "intake-reminder-state.json");
 
 function loadIntakeReminderState(): IntakeReminderState {
   try {
@@ -51,19 +43,21 @@ function saveIntakeReminderState(state: IntakeReminderState): void {
   writeFileSync(intakeReminderStateFile, JSON.stringify(state, null, 2));
 }
 
+function parseBlistersFromRow(row: { usageJson: string; everyJson: string; startJson: string }): Blister[] {
+  return parseBlisters(row);
+}
+
 async function sendIntakeReminderEmail(
   email: string, 
   intakes: UpcomingIntake[], 
   language: Language,
   isRepeat: boolean = false,
-	repeatIntervalMinutes?: number,
-	currentCount?: number,
-	maxCount?: number
+  repeatIntervalMinutes?: number
 ): Promise<{ success: boolean; error?: string }> {
   const smtpHost = process.env.SMTP_HOST;
   const smtpUser = process.env.SMTP_USER;
   const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS; // Token takes precedence
-	const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+  const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
   const smtpSecure = process.env.SMTP_SECURE === "true";
   const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
@@ -84,10 +78,11 @@ async function sendIntakeReminderEmail(
     return pillText;
   };
   
-	// Helper to format medication name with takenBy (single person or null)
+  // Helper to format medication name with takenBy (array of names)
   const formatMedName = (intake: UpcomingIntake): string => {
-		if (intake.takenBy) {
-			return `${intake.medName} <span style="color: #6b7280; font-size: 12px;">${t(tr.intakeReminder.takenBy, { name: intake.takenBy })}</span>`;
+    if (intake.takenBy.length > 0) {
+      const namesStr = intake.takenBy.join(", ");
+      return `${intake.medName} <span style="color: #6b7280; font-size: 12px;">${t(tr.intakeReminder.takenBy, { name: namesStr })}</span>`;
     }
     return intake.medName;
   };
@@ -104,31 +99,14 @@ async function sendIntakeReminderEmail(
     )
     .join("");
 
-	const alertText =
-		intakes.length === 1
+  const alertText = intakes.length === 1 
     ? tr.intakeReminder.alertSingle 
     : t(tr.intakeReminder.alertMultiple, { count: intakes.length });
 
   // Different description for repeat reminders
-	let description: string;
-	if (isRepeat && repeatIntervalMinutes && currentCount !== undefined && maxCount !== undefined) {
-		const remainingReminders = maxCount - currentCount;
-		if (remainingReminders <= 0) {
-			description = language === "de" ? "⚠️ Dies ist die letzte Erinnerung." : "⚠️ This is the last reminder.";
-		} else if (remainingReminders === 1) {
-			description =
-				language === "de"
-					? `ℹ️ Eine weitere Erinnerung wird in ${repeatIntervalMinutes} Minuten gesendet.`
-					: `ℹ️ One more reminder will be sent in ${repeatIntervalMinutes} minutes.`;
-		} else {
-			description =
-				language === "de"
-					? `ℹ️ ${remainingReminders} weitere Erinnerungen werden alle ${repeatIntervalMinutes} Minuten gesendet.`
-					: `ℹ️ ${remainingReminders} more reminders will be sent every ${repeatIntervalMinutes} minutes.`;
-		}
-	} else {
-		description = t(tr.intakeReminder.description, { minutes: REMINDER_MINUTES_BEFORE });
-	}
+  const description = isRepeat && repeatIntervalMinutes
+    ? `⚠️ Don't forget your medication! This reminder will be sent every ${repeatIntervalMinutes} minutes until you mark it as taken.`
+    : t(tr.intakeReminder.description, { minutes: REMINDER_MINUTES_BEFORE });
 
   const html = `
     <div style="font-family: system-ui, -apple-system, sans-serif; max-width: 100%; margin: 0 auto; padding: 12px; background: #f9fafb;">
@@ -157,7 +135,7 @@ async function sendIntakeReminderEmail(
 
         <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
         <p style="color: #9ca3af; font-size: 11px; margin: 0;">
-          ${getFooterHtml(language)}
+          ${tr.intakeReminder.footer}
         </p>
       </div>
     </div>
@@ -178,19 +156,17 @@ async function sendIntakeReminderEmail(
 
 ${description}
 
-${intakes
-	.map((i) => {
-		const takenByStr = i.takenBy ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy })}` : "";
+${intakes.map((i) => {
+    const takenByStr = i.takenBy.length > 0 ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy.join(", ") })}` : "";
     return `${i.medName}${takenByStr}: ${formatDosagePlain(i)} - ${i.intakeTimeStr}`;
-	})
-	.join("\n")}
+  }).join("\n")}
 
 ---
-${getFooterPlain(language)}`;
+${tr.intakeReminder.footer}`;
 
   const subject = isRepeat
-		? `[Reminder] ${t(tr.intakeReminder.subject, { medications: intakes.map((i) => i.medName).join(", ") })}`
-		: t(tr.intakeReminder.subject, { medications: intakes.map((i) => i.medName).join(", ") });
+    ? `[Reminder] ${t(tr.intakeReminder.subject, { medications: intakes.map(i => i.medName).join(", ") })}`
+    : t(tr.intakeReminder.subject, { medications: intakes.map(i => i.medName).join(", ") });
 
   try {
     const transporter = nodemailer.createTransport({
@@ -218,18 +194,18 @@ ${getFooterPlain(language)}`;
   }
 }
 
-async function checkAndSendIntakeReminders(logger: ServiceLogger): Promise<void> {
-	logger.debug(`[IntakeReminder] Checking for intake reminders...`);
+async function checkAndSendIntakeReminders(logger: { info: (msg: string) => void; error: (msg: string) => void }): Promise<void> {
+  logger.info(`[IntakeReminder] Checking for intake reminders...`);
   
   // Get all user settings to iterate over each user
   const allUserSettings = await getAllUserSettings();
   
   if (allUserSettings.length === 0) {
-		logger.debug(`[IntakeReminder] No users with settings found`);
+    logger.info(`[IntakeReminder] No users with settings found`);
     return; // No users with settings
   }
 
-	logger.debug(`[IntakeReminder] Found ${allUserSettings.length} users to check`);
+  logger.info(`[IntakeReminder] Found ${allUserSettings.length} users to check`);
   
   for (const userSettings of allUserSettings) {
     await checkAndSendIntakeRemindersForUser(userSettings, logger);
@@ -238,46 +214,34 @@ async function checkAndSendIntakeReminders(logger: ServiceLogger): Promise<void>
 
 async function checkAndSendIntakeRemindersForUser(
   settings: UserSettings & { userId: number },
-	logger: ServiceLogger
+  logger: { info: (msg: string) => void; error: (msg: string) => void }
 ): Promise<void> {
   const language = settings.language;
   const tr = getTranslations(language);
   
-	logger.debug(
-		`[IntakeReminder] Checking user ${settings.userId} - repeat:${settings.repeatRemindersEnabled} skip:${settings.skipRemindersForTakenDoses}`
-	);
+  logger.info(`[IntakeReminder] Checking user ${settings.userId} - repeat:${settings.repeatRemindersEnabled} skip:${settings.skipRemindersForTakenDoses}`);
   
   // Check if any intake reminder notifications are enabled (granular check)
   const emailEnabled = settings.emailEnabled && settings.notificationEmail && settings.emailIntakeReminders;
   const shoutrrrEnabled = settings.shoutrrrEnabled && settings.shoutrrrUrl && settings.shoutrrrIntakeReminders;
   
   if (!emailEnabled && !shoutrrrEnabled) {
-		logger.debug(
-			`[IntakeReminder] User ${settings.userId}: No intake notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`
-		);
+    logger.info(`[IntakeReminder] User ${settings.userId}: No intake notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`);
     return; // No intake reminder notifications enabled for this user
   }
 
-	logger.debug(
-		`[IntakeReminder] User ${settings.userId}: Notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`
-	);
+  logger.info(`[IntakeReminder] User ${settings.userId}: Notifications enabled (email:${emailEnabled}, shoutrrr:${shoutrrrEnabled})`);
 
   // Get all medications with intake reminders enabled for this user
-	const rows = await db
-		.select()
-		.from(medications)
-		.where(eq(medications.userId, settings.userId))
-		.orderBy(medications.id);
-	const medsWithReminders = rows.filter((row) => row.intakeRemindersEnabled);
+  const rows = await db.select().from(medications).where(eq(medications.userId, settings.userId)).orderBy(medications.id);
+  const medsWithReminders = rows.filter(row => row.intakeRemindersEnabled);
   
   if (medsWithReminders.length === 0) {
-		logger.debug(`[IntakeReminder] User ${settings.userId}: No medications have reminders enabled`);
+    logger.info(`[IntakeReminder] User ${settings.userId}: No medications have reminders enabled`);
     return; // No medications have reminders enabled for this user
   }
 
-	logger.debug(
-		`[IntakeReminder] User ${settings.userId}: Found ${medsWithReminders.length} medications with reminders`
-	);
+  logger.info(`[IntakeReminder] User ${settings.userId}: Found ${medsWithReminders.length} medications with reminders`);
   
   const state = loadIntakeReminderState();
   const allUpcoming: (UpcomingIntake & { medicationId: number; blisterIndex: number })[] = [];
@@ -292,120 +256,60 @@ async function checkAndSendIntakeRemindersForUser(
   const todayEnd = new Date(now.toLocaleString("en-US", { timeZone: tz }));
   todayEnd.setHours(23, 59, 59, 999);
   
-	logger.debug(
-		`[IntakeReminder] User ${settings.userId}: Today range: ${todayStart.toISOString()} to ${todayEnd.toISOString()}`
-	);
+  logger.info(`[IntakeReminder] User ${settings.userId}: Today range: ${todayStart.toISOString()} to ${todayEnd.toISOString()}`);
   
   // Find intakes: upcoming ones in reminder window + past ones for repeat reminders
   for (const med of medsWithReminders) {
-		// Parse intakes using new format (with per-intake takenBy), falling back to legacy
-		const intakes = parseIntakesJson(
-			med.intakesJson,
-			{ usageJson: med.usageJson, everyJson: med.everyJson, startJson: med.startJson },
-			med.intakeRemindersEnabled ?? false
-		);
-		// Medication-level takenBy (for fallback/display purposes)
-		const medicationTakenBy = parseTakenByJson(med.takenByJson);
+    const blisters = parseBlistersFromRow(med);
+    const takenByArray = parseTakenByJson(med.takenByJson);
     
-		logger.debug(
-			`[IntakeReminder] User ${settings.userId}: Processing medication "${med.name}" with ${intakes.length} intakes`
-		);
+    logger.info(`[IntakeReminder] User ${settings.userId}: Processing medication "${med.name}" with ${blisters.length} blisters`);
     
-		// Filter intakes that have reminders enabled (per-intake setting or medication-level)
-		const intakesWithReminders = intakes.filter((intake, idx) => {
-			const hasReminder = intake.intakeRemindersEnabled || med.intakeRemindersEnabled;
-			if (!hasReminder) {
-				logger.debug(`[IntakeReminder] User ${settings.userId}: Intake ${idx} has reminders disabled, skipping`);
-			}
-			return hasReminder;
-		});
-
-		// Process each intake separately to track blisterIndex
-		intakesWithReminders.forEach((intake, blisterIndex) => {
-			const actualIndex = intakes.indexOf(intake); // Get the actual index in original array
-			logger.debug(
-				`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} - start: ${intake.start}, every: ${intake.every} days, usage: ${intake.usage}, takenBy: ${intake.takenBy || "(none)"}`
-			);
+    // Process each blister separately to track blisterIndex
+    blisters.forEach((blister, blisterIndex) => {
+      logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} - start: ${blister.start}, every: ${blister.every} days, usage: ${blister.usage}`);
       
       // Always get upcoming intakes (15 min before) for first reminders
-			const upcomingIntakes = getUpcomingIntakes(
-				med.name,
-				[intake],
-				REMINDER_MINUTES_BEFORE,
-				medicationTakenBy,
-				med.pillWeightMg,
-				locale,
-				tz,
-				undefined, // nowOverride
-				med.id,
-				med.doseUnit ?? "mg"
-			);
-			logger.debug(
-				`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} found ${upcomingIntakes.length} upcoming intakes (reminder window)`
-			);
+      const upcomingIntakes = getUpcomingIntakes(med.name, [blister], REMINDER_MINUTES_BEFORE, takenByArray, med.pillWeightMg, locale, tz);
+      logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} found ${upcomingIntakes.length} upcoming intakes (reminder window)`);
       
       // Add upcoming intakes for first reminders
-			allUpcoming.push(
-				...upcomingIntakes.map((upcomingIntake) => ({
-					...upcomingIntake,
+      allUpcoming.push(...upcomingIntakes.map(intake => ({
+        ...intake,
         medicationId: med.id,
-					blisterIndex: actualIndex,
-				}))
-			);
+        blisterIndex,
+      })));
       
       // If repeat reminders enabled, also check for missed intakes (past the intake time)
       if (settings.repeatRemindersEnabled) {
-				const allTodaysIntakes = getTodaysIntakes(
-					med.name,
-					[intake],
-					medicationTakenBy,
-					med.pillWeightMg,
-					locale,
-					tz,
-					med.id,
-					med.doseUnit ?? "mg"
-				);
-				logger.debug(
-					`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} - all today's intakes: ${allTodaysIntakes.length}, times: ${allTodaysIntakes.map((i) => i.intakeTime.toISOString()).join(", ")}`
-				);
-				const missedIntakes = allTodaysIntakes.filter(
-					(todayIntake) => todayIntake.intakeTime.getTime() < now.getTime()
-				);
-				logger.debug(
-					`[IntakeReminder] User ${settings.userId}: Intake ${actualIndex} found ${missedIntakes.length} missed intakes (past intake time)`
-				);
+        const allTodaysIntakes = getTodaysIntakes(med.name, [blister], takenByArray, med.pillWeightMg, locale, tz);
+        logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} - all today's intakes: ${allTodaysIntakes.length}, times: ${allTodaysIntakes.map(i => i.intakeTime.toISOString()).join(', ')}`);
+        const missedIntakes = allTodaysIntakes.filter(intake => intake.intakeTime.getTime() < now.getTime());
+        logger.info(`[IntakeReminder] User ${settings.userId}: Blister ${blisterIndex} found ${missedIntakes.length} missed intakes (past intake time)`);
         
         // Add missed intakes for repeat reminders (only if not already in upcoming list)
-				const upcomingTimes = new Set(upcomingIntakes.map((i) => i.intakeTime.getTime()));
-				allUpcoming.push(
-					...missedIntakes
-						.filter((missed) => !upcomingTimes.has(missed.intakeTime.getTime()))
-						.map((missed) => ({
-							...missed,
+        const upcomingTimes = new Set(upcomingIntakes.map(i => i.intakeTime.getTime()));
+        allUpcoming.push(...missedIntakes
+          .filter(intake => !upcomingTimes.has(intake.intakeTime.getTime()))
+          .map(intake => ({
+            ...intake,
             medicationId: med.id,
-							blisterIndex: actualIndex,
-						}))
-				);
+            blisterIndex,
+          })));
       }
     });
   }
   
-	logger.debug(`[IntakeReminder] User ${settings.userId}: Total ${allUpcoming.length} intakes for today`);
+  logger.info(`[IntakeReminder] User ${settings.userId}: Total ${allUpcoming.length} intakes for today`);
   
   if (allUpcoming.length === 0) {
-		logger.debug(`[IntakeReminder] User ${settings.userId}: No intakes for today`);
+    logger.info(`[IntakeReminder] User ${settings.userId}: No intakes for today`);
     return; // No upcoming intakes for today
   }
   
   // Determine which doses need reminders (new or repeated)
   const nowMs = Date.now();
-	const maxReminders = settings.maxNaggingReminders ?? 5;
-	type ReminderWithCount = (typeof allUpcoming)[number] & {
-		currentSendCount: number; // 0 = advance reminder (no counter), 1+ = nagging count
-		maxReminders: number;
-		isAdvanceReminder: boolean; // true if this is the 15-min-before reminder
-	};
-	let remindersToSend: ReminderWithCount[] = [];
+  let remindersToSend: typeof allUpcoming = [];
   
   for (const intake of allUpcoming) {
     const key = `user_${settings.userId}:${intake.medName}:${intake.intakeTime.getTime()}`;
@@ -414,58 +318,21 @@ async function checkAndSendIntakeRemindersForUser(
     const isIntakePast = intakeTimeMs < nowMs;
     
     if (!existingEntry) {
-			// New dose - send first reminder
-			if (isIntakePast) {
-				// Intake time already passed and we have no state entry. Check how recently it was missed.
-				const minutesSinceIntake = (nowMs - intakeTimeMs) / 60000;
-				const gracePeriodMinutes = (settings.reminderRepeatIntervalMinutes ?? 30) + REMINDER_MINUTES_BEFORE;
-
-				if (minutesSinceIntake <= gracePeriodMinutes) {
-					// Recently missed — scheduler likely recovered from sleep/restart.
-					// Send a catch-up reminder (counts as first nagging reminder).
-					remindersToSend.push({ ...intake, currentSendCount: 1, maxReminders, isAdvanceReminder: false });
-					logger.info(
-						`[IntakeReminder] User ${settings.userId}: Catch-up reminder for recently missed "${intake.medName}" at ${intake.intakeTimeStr} (${Math.round(minutesSinceIntake)} min ago)`
-					);
-				} else {
-					// Long ago — seed state without notification (user likely already noticed)
-					state.reminders[key] = {
-						firstSentAt: nowMs,
-						lastSentAt: nowMs,
-						sendCount: 0,
-						advanceSent: false,
-					};
-					logger.debug(
-						`[IntakeReminder] User ${settings.userId}: Seeding state for old past "${intake.medName}" at ${intake.intakeTimeStr} (no notification — ${Math.round(minutesSinceIntake)} min ago)`
-					);
-				}
-			} else {
-				// Upcoming - this is advance reminder (no counter)
-				remindersToSend.push({ ...intake, currentSendCount: 0, maxReminders, isAdvanceReminder: true });
-				logger.debug(
-					`[IntakeReminder] User ${settings.userId}: Advance reminder for "${intake.medName}" at ${intake.intakeTimeStr}`
-				);
-			}
+      // New dose - always send first reminder (upcoming or already missed)
+      remindersToSend.push(intake);
+      logger.info(`[IntakeReminder] User ${settings.userId}: First reminder for "${intake.medName}" at ${intake.intakeTimeStr} (${isIntakePast ? 'missed' : 'upcoming'})`);
     } else if (settings.repeatRemindersEnabled && isIntakePast) {
-			// Intake time passed - check if we need to send nagging reminder
+      // Repeat reminder - only for intakes that are already past (missed)
       const intervalMs = settings.reminderRepeatIntervalMinutes * 60 * 1000;
       const timeSinceLastReminder = nowMs - existingEntry.lastSentAt;
+      const maxReminders = settings.maxNaggingReminders ?? 5;
       
-			// If only advance reminder was sent (sendCount=0), first nagging has count=1
-			// Otherwise increment from current sendCount
-			const currentNaggingCount = existingEntry.sendCount;
-
-			if (currentNaggingCount >= maxReminders) {
-				// Max nagging reminders reached - stop
-				logger.debug(
-					`[IntakeReminder] User ${settings.userId}: Max nagging (${maxReminders}) reached for "${intake.medName}" at ${intake.intakeTimeStr}`
-				);
+      if (existingEntry.sendCount >= maxReminders) {
+        // Max reminders reached - stop nagging
+        logger.info(`[IntakeReminder] User ${settings.userId}: Max reminders (${maxReminders}) reached for "${intake.medName}" at ${intake.intakeTimeStr}`);
       } else if (timeSinceLastReminder >= intervalMs) {
-				const nextSendCount = currentNaggingCount + 1;
-				remindersToSend.push({ ...intake, currentSendCount: nextSendCount, maxReminders, isAdvanceReminder: false });
-				logger.debug(
-					`[IntakeReminder] User ${settings.userId}: Nagging reminder for "${intake.medName}" at ${intake.intakeTimeStr} (${nextSendCount}/${maxReminders})`
-				);
+        remindersToSend.push(intake);
+        logger.info(`[IntakeReminder] User ${settings.userId}: Repeat reminder for missed "${intake.medName}" at ${intake.intakeTimeStr} (${existingEntry.sendCount + 1}/${maxReminders})`);
       }
     }
     // Else: Already sent and either repeats disabled or intake not yet past - skip
@@ -478,10 +345,7 @@ async function checkAndSendIntakeRemindersForUser(
   // If skipRemindersForTakenDoses is enabled, filter out doses that were already taken today
   if (settings.skipRemindersForTakenDoses) {
     // Query doses marked as taken today (takenAt is timestamp, stored as seconds since epoch)
-		const takenToday = await db
-			.select()
-			.from(doseTracking)
-			.where(
+    const takenToday = await db.select().from(doseTracking).where(
       and(
         eq(doseTracking.userId, settings.userId),
         gte(doseTracking.takenAt, todayStart),
@@ -489,40 +353,29 @@ async function checkAndSendIntakeRemindersForUser(
       )
     );
     
-		const takenDoseIds = new Set(takenToday.map((d) => d.doseId));
+    const takenDoseIds = new Set(takenToday.map(d => d.doseId));
     
     // Filter out reminders for doses that were already taken
-		remindersToSend = remindersToSend.filter((intake) => {
-			// Convert to date-only timestamp (midnight) to match frontend dose ID format
-			const intakeDate = intake.intakeTime;
-			const dateOnlyMs = new Date(intakeDate.getFullYear(), intakeDate.getMonth(), intakeDate.getDate()).getTime();
+    remindersToSend = remindersToSend.filter(intake => {
+      const timestamp = intake.intakeTime.getTime();
       
       // Check both with and without person suffix
-			if (intake.takenBy) {
-				// For person-specific intake, check if that person has taken it
-				const doseId = `${intake.medicationId}-${intake.blisterIndex}-${dateOnlyMs}-${intake.takenBy}`;
-				const isTaken = takenDoseIds.has(doseId);
-				if (isTaken) {
-					logger.debug(
-						`[IntakeReminder] User ${settings.userId}: Skipping "${intake.medName}" - dose ${doseId} already taken`
-					);
-				}
-				return !isTaken;
+      if (intake.takenBy.length > 0) {
+        // For multi-person medications, check if any person has taken it
+        const anyTaken = intake.takenBy.some(person => {
+          const doseId = `${intake.medicationId}-${intake.blisterIndex}-${timestamp}-${person}`;
+          return takenDoseIds.has(doseId);
+        });
+        return !anyTaken; // Skip if any person has taken it
       } else {
-				// For non-person-specific intakes
-				const doseId = `${intake.medicationId}-${intake.blisterIndex}-${dateOnlyMs}`;
-				const isTaken = takenDoseIds.has(doseId);
-				if (isTaken) {
-					logger.debug(
-						`[IntakeReminder] User ${settings.userId}: Skipping "${intake.medName}" - dose ${doseId} already taken`
-					);
-				}
-				return !isTaken;
+        // For non-person-specific medications
+        const doseId = `${intake.medicationId}-${intake.blisterIndex}-${timestamp}`;
+        return !takenDoseIds.has(doseId);
       }
     });
     
     if (remindersToSend.length === 0) {
-			logger.debug(`[IntakeReminder] User ${settings.userId}: All doses taken, skipping reminders`);
+      logger.info(`[IntakeReminder] User ${settings.userId}: All doses taken, skipping reminders`);
       return;
     }
   }
@@ -532,7 +385,7 @@ async function checkAndSendIntakeRemindersForUser(
   // Determine if this is a repeat reminder:
   // - Any intake already has a state entry AND is past (repeat after first reminder)
   // - OR intake is past even without state entry (missed the 15-min window)
-	const isRepeatReminder = remindersToSend.some((intake) => {
+  const isRepeatReminder = remindersToSend.some(intake => {
     const intakeTimeMs = intake.intakeTime.getTime();
     const isIntakePast = intakeTimeMs < nowMs;
     return isIntakePast; // Use repeat message for ANY missed intake
@@ -543,19 +396,12 @@ async function checkAndSendIntakeRemindersForUser(
   
   // Send email if enabled for intake reminders
   if (emailEnabled) {
-		// Calculate counts for repeat reminder text
-		const hasNaggingReminder = remindersToSend.some((r) => !r.isAdvanceReminder);
-		const highestSendCount = Math.max(...remindersToSend.map((r) => r.currentSendCount));
-		const maxReminderCount = remindersToSend[0]?.maxReminders ?? 5;
-
     const result = await sendIntakeReminderEmail(
       settings.notificationEmail!, 
       remindersToSend, 
       language,
       isRepeatReminder,
-			settings.reminderRepeatIntervalMinutes,
-			hasNaggingReminder ? highestSendCount : undefined,
-			hasNaggingReminder ? maxReminderCount : undefined
+      settings.reminderRepeatIntervalMinutes
     );
     emailSuccess = result.success;
     if (result.success) {
@@ -567,50 +413,17 @@ async function checkAndSendIntakeRemindersForUser(
   
   // Send Shoutrrr notification if enabled for intake reminders
   if (shoutrrrEnabled) {
-		// Check if any reminder is a nagging reminder (not advance)
-		const hasNaggingReminder = remindersToSend.some((r) => !r.isAdvanceReminder);
-		const highestSendCount = Math.max(...remindersToSend.map((r) => r.currentSendCount));
-		const maxReminderCount = remindersToSend[0]?.maxReminders ?? 5;
+    const title = isRepeatReminder
+      ? (language === 'de' ? '⚠️ Medikamenten-Erinnerung' : '⚠️ Medication Reminder')
+      : t(tr.push.intakeTitle, { minutes: REMINDER_MINUTES_BEFORE });
     
-		let title: string;
-		if (hasNaggingReminder && highestSendCount > 0) {
-			// Nagging reminder - show counter
-			const counterStr = `(${highestSendCount}/${maxReminderCount})`;
-			title =
-				language === "de"
-					? `⚠️ Erinnerung: Medikamenteneinnahme ${counterStr}`
-					: `⚠️ Reminder: Medication intake ${counterStr}`;
-		} else {
-			// Advance reminder - no counter
-			title = t(tr.push.intakeTitle, { minutes: REMINDER_MINUTES_BEFORE });
-		}
+    const repeatNote = isRepeatReminder && settings.reminderRepeatIntervalMinutes
+      ? `\n\n⚠️ This reminder will be sent every ${settings.reminderRepeatIntervalMinutes} minutes until marked as taken.`
+      : '';
     
-		// Only show repeat note for nagging reminders, not for advance reminders
-		let repeatNote = "";
-		if (hasNaggingReminder && settings.reminderRepeatIntervalMinutes) {
-			const remainingReminders = maxReminderCount - highestSendCount;
-			if (remainingReminders <= 0) {
-				// Last reminder
-				repeatNote = language === "de" ? "\n\n⚠️ Dies ist die letzte Erinnerung." : "\n\n⚠️ This is the last reminder.";
-			} else if (remainingReminders === 1) {
-				// One more reminder
-				repeatNote =
-					language === "de"
-						? `\n\nℹ️ Eine weitere Erinnerung wird in ${settings.reminderRepeatIntervalMinutes} Minuten gesendet.`
-						: `\n\nℹ️ One more reminder will be sent in ${settings.reminderRepeatIntervalMinutes} minutes.`;
-			} else {
-				// Multiple reminders remaining
-				repeatNote =
-					language === "de"
-						? `\n\nℹ️ ${remainingReminders} weitere Erinnerungen werden alle ${settings.reminderRepeatIntervalMinutes} Minuten gesendet.`
-						: `\n\nℹ️ ${remainingReminders} more reminders will be sent every ${settings.reminderRepeatIntervalMinutes} minutes.`;
-			}
-		}
-
-		const message =
-			remindersToSend
+    const message = remindersToSend
       .map((i) => {
-					const takenByStr = i.takenBy ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy })}` : "";
+        const takenByStr = i.takenBy.length > 0 ? ` ${t(tr.intakeReminder.takenBy, { name: i.takenBy.join(", ") })}` : "";
         let dosage = `${i.usage} ${i.usage === 1 ? tr.common.pill : tr.common.pills}`;
         if (i.pillWeightMg) {
           const totalMg = i.usage * i.pillWeightMg;
@@ -618,9 +431,7 @@ async function checkAndSendIntakeRemindersForUser(
         }
         return `• ${i.medName}${takenByStr}: ${dosage} @ ${i.intakeTimeStr}`;
       })
-				.join("\n") +
-			repeatNote +
-			`\n\n---\n${getFooterPlain(language)}`;
+      .join("\n") + repeatNote;
     
     const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
     shoutrrrSuccess = result.success;
@@ -639,44 +450,21 @@ async function checkAndSendIntakeRemindersForUser(
       const existing = state.reminders[key];
       
       if (existing) {
-				// Update existing entry
-				if (intake.isAdvanceReminder) {
-					// Advance reminder - don't increment nagging count
-					state.reminders[key] = {
-						...existing,
-						lastSentAt: nowMs,
-						advanceSent: true,
-					};
-				} else {
-					// Nagging reminder - increment count
+        // Update existing entry (repeat)
         state.reminders[key] = {
           firstSentAt: existing.firstSentAt,
           lastSentAt: nowMs,
           sendCount: existing.sendCount + 1,
-						advanceSent: existing.advanceSent,
-					};
-				}
-			} else {
-				// Create new entry
-				if (intake.isAdvanceReminder) {
-					// Advance reminder - sendCount stays 0
-					state.reminders[key] = {
-						firstSentAt: nowMs,
-						lastSentAt: nowMs,
-						sendCount: 0,
-						advanceSent: true,
         };
       } else {
-					// First nagging reminder - sendCount starts at 1
+        // Create new entry (first send)
         state.reminders[key] = {
           firstSentAt: nowMs,
           lastSentAt: nowMs,
           sendCount: 1,
-						advanceSent: false,
         };
       }
     }
-		}
     
     // Clean up old entries (remove doses from past days)
     state.reminders = cleanOldIntakeReminders(state.reminders, tz);
@@ -688,17 +476,13 @@ async function checkAndSendIntakeRemindersForUser(
     updateReminderSentTime("intake", channel);
     
     // Also update user settings in database so frontend can display the info
-		// Get the first reminder's medication name and taken by for display
-		const firstReminder = remindersToSend[0];
-		const medName = firstReminder?.medName;
-		const takenBy = firstReminder?.takenBy || undefined;
-		await updateUserReminderSentTime(settings.userId, "intake", channel, medName, takenBy);
+    await updateUserReminderSentTime(settings.userId, "intake", channel);
   }
 }
 
 let intakeCheckInterval: NodeJS.Timeout | null = null;
 
-export function startIntakeReminderScheduler(logger: ServiceLogger): void {
+export function startIntakeReminderScheduler(logger: { info: (msg: string) => void; error: (msg: string) => void }): void {
   logger.info(`[IntakeReminder] Starting intake reminder scheduler (checks every minute)...`);
   
   // Run immediately on start

backend/src/services/reminder-scheduler.ts

@@ -1,32 +1,32 @@
-import { existsSync, readFileSync, writeFileSync } from "node:fs";
-import { resolve } from "node:path";
-import { eq } from "drizzle-orm";
 import nodemailer from "nodemailer";
+import { eq } from "drizzle-orm";
 import { db } from "../db/client.js";
-import { getDataDir } from "../db/db-utils.js";
 import { medications, userSettings } from "../db/schema.js";
-import { getFooterHtml, getFooterPlain, getTranslations, type Language, t } from "../i18n/translations.js";
-import { getAllUserSettings, sendShoutrrrNotification, type UserSettings } from "../routes/settings.js";
-import type { ServiceLogger } from "../utils/logger.js";
+import { readFileSync, writeFileSync, existsSync } from "fs";
+import { resolve } from "path";
+import { loadUserSettings, getAllUserSettings, sendShoutrrrNotification, type UserSettings } from "../routes/settings.js";
+import { getTranslations, t, type Language } from "../i18n/translations.js";
+
 // Import shared utilities
 import {
-	type Blister,
-	calculateDepletionInfo,
-	createDefaultReminderState,
+  getTimezone,
   formatInTimezone,
   getCurrentHourInTimezone,
-	getMsUntilNextCheck,
-	getNextScheduledTime,
-	getTimezone,
   getTodayInTimezone,
+  getNextScheduledTime,
+  getMsUntilNextCheck,
   parseBlisters,
+  calculateDailyUsage,
+  calculateDepletionInfo,
   parseReminderState,
+  createDefaultReminderState,
+  type Blister,
   type ReminderState,
 } from "../utils/scheduler-utils.js";
 
 const REMINDER_HOUR = parseInt(process.env.REMINDER_HOUR ?? "6", 10); // Default 6:00 AM local time
 
-const reminderStateFile = resolve(getDataDir(), "reminder-state.json");
+const reminderStateFile = resolve(process.cwd(), "data", "reminder-state.json");
 
 function loadReminderState(): ReminderState {
   try {
@@ -47,10 +47,7 @@ export function getReminderState(): ReminderState {
   return loadReminderState();
 }
 
-export function updateReminderSentTime(
-	type: "stock" | "intake" = "stock",
-	channel: "email" | "push" | "both" = "email"
-): void {
+export function updateReminderSentTime(type: "stock" | "intake" = "stock", channel: "email" | "push" | "both" = "email"): void {
   const state = loadReminderState();
   const today = getTodayInTimezone();
   saveReminderState({
@@ -63,40 +60,20 @@ export function updateReminderSentTime(
 }
 
 // Update user settings in database when reminder is sent
-// Stock and intake reminders are tracked separately so neither overwrites the other
 export async function updateUserReminderSentTime(
   userId: number, 
   type: "stock" | "intake" = "stock", 
-	channel: "email" | "push" | "both" = "email",
-	medName?: string,
-	takenBy?: string
+  channel: "email" | "push" | "both" = "email"
 ): Promise<void> {
   const now = new Date().toISOString();
-	if (type === "stock") {
-		// Write to dedicated stock reminder columns only — do NOT touch the shared
-		// lastNotificationType column, as that would block intake reminder display
-		await db
-			.update(userSettings)
-			.set({
-				lastStockReminderSent: now,
-				lastStockReminderChannel: channel,
-				lastStockReminderMedNames: medName ?? null,
-			})
-			.where(eq(userSettings.userId, userId));
-	} else {
-		// Write to intake reminder columns
-		await db
-			.update(userSettings)
+  await db.update(userSettings)
     .set({
       lastAutoEmailSent: now,
       lastNotificationType: type,
       lastNotificationChannel: channel,
-				lastReminderMedName: medName ?? null,
-				lastReminderTakenBy: takenBy ?? null,
     })
     .where(eq(userSettings.userId, userId));
 }
-}
 
 function parseBlistersFromRow(row: { usageJson: string; everyJson: string; startJson: string }): Blister[] {
   return parseBlisters(row);
@@ -109,21 +86,14 @@ type LowStockItem = {
   depletionDate: string | null;
 };
 
-async function getMedicationsNeedingReminder(
-	userId: number,
-	reminderDaysBefore: number,
-	language: Language
-): Promise<LowStockItem[]> {
+async function getMedicationsNeedingReminder(userId: number, reminderDaysBefore: number, language: Language): Promise<LowStockItem[]> {
   const rows = await db.select().from(medications).where(eq(medications.userId, userId)).orderBy(medications.id);
   
   const lowStock: LowStockItem[] = [];
   
   for (const row of rows) {
     const blisters = parseBlistersFromRow(row);
-		const totalPills =
-			(row.packageType ?? "blister") === "bottle"
-				? row.looseTablets + (row.stockAdjustment ?? 0)
-				: row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets + (row.stockAdjustment ?? 0);
+    const totalPills = row.packCount * row.blistersPerPack * row.pillsPerBlister + row.looseTablets;
     const { daysLeft, depletionDate } = calculateDepletionInfo({ count: totalPills, blisters }, language);
     
     // Check if medication runs out within reminderDaysBefore days
@@ -140,16 +110,11 @@ async function getMedicationsNeedingReminder(
   return lowStock;
 }
 
-async function sendReminderEmail(
-	email: string,
-	lowStock: LowStockItem[],
-	language: Language,
-	isRepeatDaily: boolean = false
-): Promise<{ success: boolean; error?: string }> {
+async function sendReminderEmail(email: string, lowStock: LowStockItem[], language: Language, isRepeatDaily: boolean = false): Promise<{ success: boolean; error?: string }> {
   const smtpHost = process.env.SMTP_HOST;
   const smtpUser = process.env.SMTP_USER;
   const smtpPass = process.env.SMTP_TOKEN || process.env.SMTP_PASS; // Token takes precedence
-	const smtpPort = parseInt(process.env.SMTP_PORT ?? "587", 10);
+  const smtpPort = parseInt(process.env.SMTP_PORT ?? "587");
   const smtpSecure = process.env.SMTP_SECURE === "true";
   const smtpFrom = process.env.SMTP_FROM ?? smtpUser;
 
@@ -171,8 +136,7 @@ async function sendReminderEmail(
     )
     .join("");
 
-	const alertText =
-		lowStock.length === 1
+  const alertText = lowStock.length === 1 
     ? tr.stockReminder.alertSingle 
     : t(tr.stockReminder.alertMultiple, { count: lowStock.length });
 
@@ -206,7 +170,7 @@ async function sendReminderEmail(
 
         <hr style="border: none; border-top: 1px solid #e5e7eb; margin: 16px 0;" />
         <p style="color: #9ca3af; font-size: 11px; margin: 0;">
-          ${getFooterHtml(language)}
+          ${tr.stockReminder.footer}
         </p>
         ${isRepeatDaily ? `<p style="color: #9ca3af; font-size: 11px; margin: 8px 0 0 0; font-style: italic;">${tr.stockReminder.repeatDailyNote}</p>` : ""}
       </div>
@@ -220,9 +184,9 @@ ${tr.stockReminder.description}
 ${lowStock.map((r) => `${r.name}: ${r.medsLeft} ${tr.common.pills}, ${r.daysLeft ?? 0} ${tr.common.days}, ${tr.stockReminder.tableHeaders.runsOut}: ${r.depletionDate ?? tr.common.soon}`).join("\n")}
 
 ---
-${getFooterPlain(language)}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDailyNote}` : ""}`;
+${tr.stockReminder.footer}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDailyNote}` : ""}`;
 
-	const subjectPlural = lowStock.length === 1 ? "" : language === "de" ? "e" : "s";
+  const subjectPlural = lowStock.length === 1 ? "" : (language === "de" ? "e" : "s");
   const subject = t(tr.stockReminder.subject, { count: lowStock.length, s: subjectPlural, e: subjectPlural });
 
   try {
@@ -251,12 +215,12 @@ ${getFooterPlain(language)}${isRepeatDaily ? `\n\n${tr.stockReminder.repeatDaily
   }
 }
 
-async function checkAndSendReminder(logger: ServiceLogger): Promise<void> {
+async function checkAndSendReminder(logger: { info: (msg: string) => void; error: (msg: string) => void }): Promise<void> {
   // Get all user settings to iterate over each user
   const allUserSettings = await getAllUserSettings();
   
   if (allUserSettings.length === 0) {
-		logger.debug("[Reminder] No users with settings found");
+    logger.info("[Reminder] No users with settings found");
     return;
   }
 
@@ -267,7 +231,7 @@ async function checkAndSendReminder(logger: ServiceLogger): Promise<void> {
 
 async function checkAndSendReminderForUser(
   settings: UserSettings & { userId: number },
-	logger: ServiceLogger
+  logger: { info: (msg: string) => void; error: (msg: string) => void }
 ): Promise<void> {
   const language = settings.language;
   const tr = getTranslations(language);
@@ -304,12 +268,7 @@ async function checkAndSendReminderForUser(
   
   // Send email if enabled
   if (emailEnabled) {
-		const result = await sendReminderEmail(
-			settings.notificationEmail!,
-			allLowStock,
-			language,
-			settings.repeatDailyReminders
-		);
+    const result = await sendReminderEmail(settings.notificationEmail!, allLowStock, language, settings.repeatDailyReminders);
     emailSuccess = result.success;
     if (result.success) {
       logger.info(`[Reminder] User ${settings.userId}: Email sent successfully to ${settings.notificationEmail}`);
@@ -320,34 +279,30 @@ async function checkAndSendReminderForUser(
   
   // Send Shoutrrr notification if enabled
   if (shoutrrrEnabled) {
-		// Separate empty from critical stock medications (all auto-reminder meds are critical by definition)
-		const emptyMeds = allLowStock.filter((m) => m.medsLeft <= 0);
-		const criticalMeds = allLowStock.filter((m) => m.medsLeft > 0);
+    // Separate empty from low stock medications
+    const emptyMeds = allLowStock.filter(m => m.medsLeft <= 0);
+    const lowMeds = allLowStock.filter(m => m.medsLeft > 0);
     
     // Build clear title
     const titleParts: string[] = [];
     if (emptyMeds.length > 0) {
       titleParts.push(`🚨 ${emptyMeds.length} ${tr.push.empty || "Empty"}`);
     }
-		if (criticalMeds.length > 0) {
-			titleParts.push(`🚨 ${criticalMeds.length} ${tr.push.critical || "Critical"}`);
+    if (lowMeds.length > 0) {
+      titleParts.push(`⚠️ ${lowMeds.length} ${tr.push.low || "Low"}`);
     }
     const title = `MedAssist: ${titleParts.join(", ")} - ${tr.push.reorderNow || "Reorder Now!"}`;
     
     // Build clear message with sections
     const messageParts: string[] = [];
     if (emptyMeds.length > 0) {
-			messageParts.push(`🚨 ${tr.push.emptySection || "Empty (reorder immediately)"}:`);
-			emptyMeds.forEach((m) => messageParts.push(`  • ${m.name}`));
+      messageParts.push(`🚨 ${tr.push.emptySection || "EMPTY (reorder immediately)"}:`);
+      emptyMeds.forEach(m => messageParts.push(`  • ${m.name}`));
     }
-		if (criticalMeds.length > 0) {
+    if (lowMeds.length > 0) {
       if (emptyMeds.length > 0) messageParts.push("");
-			messageParts.push(`🚨 ${tr.push.criticalSection || "Running critically low"}:`);
-			criticalMeds.forEach((m) =>
-				messageParts.push(
-					`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`
-				)
-			);
+      messageParts.push(`⚠️ ${tr.push.lowSection || "RUNNING LOW (reorder soon)"}:`);
+      lowMeds.forEach(m => messageParts.push(`  • ${m.name}: ${t(tr.push.pillsLeft, { count: m.medsLeft })}, ${t(tr.push.daysLeft, { count: m.daysLeft ?? 0 })}`));
     }
     
     if (settings.repeatDailyReminders) {
@@ -355,7 +310,7 @@ async function checkAndSendReminderForUser(
       messageParts.push(tr.push.repeatDailyNote);
     }
     
-		const message = messageParts.join("\n") + `\n\n---\n${getFooterPlain(language)}`;
+    const message = messageParts.join("\n");
     
     const result = await sendShoutrrrNotification(settings.shoutrrrUrl!, title, message);
     shoutrrrSuccess = result.success;
@@ -380,16 +335,13 @@ async function checkAndSendReminderForUser(
     });
     
     // Also update user settings in database so frontend can display the info
-		// For stock reminders, show the first medication name
-		const firstMed = allLowStock[0];
-		const medNames = allLowStock.length > 1 ? `${firstMed.name} (+${allLowStock.length - 1})` : firstMed?.name;
-		await updateUserReminderSentTime(settings.userId, "stock", channel, medNames);
+    await updateUserReminderSentTime(settings.userId, "stock", channel);
   }
 }
 
 let schedulerTimeout: NodeJS.Timeout | null = null;
 
-function scheduleNextCheck(logger: ServiceLogger): void {
+function scheduleNextCheck(logger: { info: (msg: string) => void; error: (msg: string) => void }): void {
   const msUntilNext = getMsUntilNextCheck(REMINDER_HOUR);
   const nextTime = getNextScheduledTime(REMINDER_HOUR);
   
@@ -400,9 +352,7 @@ function scheduleNextCheck(logger: ServiceLogger): void {
     nextScheduledCheck: nextTime.toISOString(),
   });
   
-	logger.debug(
-		`[Reminder] Next check scheduled for ${formatInTimezone(nextTime)} (${getTimezone()}) (in ${Math.round(msUntilNext / 1000 / 60)} minutes)`
-	);
+  logger.info(`[Reminder] Next check scheduled for ${formatInTimezone(nextTime)} (${getTimezone()}) (in ${Math.round(msUntilNext / 1000 / 60)} minutes)`);
   
   schedulerTimeout = setTimeout(() => {
     checkAndSendReminder(logger).catch((err) => logger.error(`[Reminder] Error: ${err}`));
@@ -411,7 +361,7 @@ function scheduleNextCheck(logger: ServiceLogger): void {
   }, msUntilNext);
 }
 
-export function startReminderScheduler(logger: ServiceLogger): void {
+export function startReminderScheduler(logger: { info: (msg: string) => void; error: (msg: string) => void }): void {
   logger.info(`[Reminder] Starting reminder scheduler (timezone: ${getTimezone()})...`);
   
   // Check if we need to run immediately (missed today's check)

backend/src/test/auth.test.ts

@@ -1,13 +1,13 @@
 /**
  * E2E Tests for auth routes with AUTH_ENABLED=true
  */
-
+import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from "vitest";
+import Fastify, { FastifyInstance } from "fastify";
 import cookie from "@fastify/cookie";
 import jwt from "@fastify/jwt";
 import sensible from "@fastify/sensible";
-import type { Client } from "@libsql/client";
-import Fastify, { type FastifyInstance } from "fastify";
-import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { createClient, Client } from "@libsql/client";
+import { drizzle } from "drizzle-orm/libsql";
 
 // Use vi.hoisted to create the db BEFORE mocks are set up
 const { testClient, testDb } = vi.hoisted(() => {
@@ -327,7 +327,7 @@ describe("Auth Routes (AUTH_ENABLED=true)", () => {
   describe("POST /auth/refresh", () => {
     it("should refresh access token with valid refresh token", async () => {
       // Login first to get tokens
-			const _loginResponse = await app.inject({
+      const loginResponse = await app.inject({
         method: "POST",
         url: "/auth/login",
         payload: {
@@ -682,62 +682,4 @@ describe("Auth Routes (AUTH_ENABLED=true)", () => {
       expect(response.statusCode).toBe(401);
     });
   });
-
-	describe("DELETE /auth/me - Delete Account", () => {
-		it("should delete user account and all data", async () => {
-			// Register and login
-			await app.inject({
-				method: "POST",
-				url: "/auth/register",
-				payload: {
-					username: "deleteuser",
-					password: "TestPassword123",
-				},
-			});
-
-			const login = await app.inject({
-				method: "POST",
-				url: "/auth/login",
-				payload: {
-					username: "deleteuser",
-					password: "TestPassword123",
-				},
-			});
-
-			const accessToken = login.cookies.find((c: any) => c.name === "access_token");
-
-			// Delete account
-			const response = await app.inject({
-				method: "DELETE",
-				url: "/auth/me",
-				cookies: {
-					access_token: accessToken?.value ?? "",
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json().ok).toBe(true);
-
-			// Verify can't login anymore
-			const loginAgain = await app.inject({
-				method: "POST",
-				url: "/auth/login",
-				payload: {
-					username: "deleteuser",
-					password: "TestPassword123",
-				},
-			});
-
-			expect(loginAgain.statusCode).toBe(401);
-		});
-
-		it("should reject delete without auth", async () => {
-			const response = await app.inject({
-				method: "DELETE",
-				url: "/auth/me",
-			});
-
-			expect(response.statusCode).toBe(401);
-		});
-	});
 });

backend/src/test/doses.test.ts

@@ -2,8 +2,15 @@
  * Tests for /doses/taken API endpoints.
  * Tests marking doses as taken, listing taken doses, and unmarking.
  */
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import { buildTestApp, clearTestData, closeTestApp, createTestUser, type TestContext } from "./setup.js";
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
+import {
+  buildTestApp,
+  closeTestApp,
+  clearTestData,
+  createTestUser,
+  createTestMedication,
+  TestContext,
+} from "./setup.js";
 
 // =============================================================================
 // Route Registration
@@ -15,7 +22,7 @@ async function registerDoseRoutes(ctx: TestContext) {
   const { app, client } = ctx;
 
   // GET /doses/taken - List all taken doses
-	app.get("/doses/taken", async (_request, _reply) => {
+  app.get("/doses/taken", async (request, reply) => {
     // In test mode, use user ID 1 (will be created in tests)
     const userId = 1;
 
@@ -62,68 +69,17 @@ async function registerDoseRoutes(ctx: TestContext) {
   });
 
   // DELETE /doses/taken/:doseId - Unmark a dose
-	app.delete<{ Params: { doseId: string } }>("/doses/taken/:doseId", async (request, _reply) => {
+  app.delete<{ Params: { doseId: string } }>("/doses/taken/:doseId", async (request, reply) => {
     const userId = 1;
     const { doseId } = request.params;
 
-		// Check if this dose was also dismissed
-		const existing = await client.execute({
-			sql: `SELECT id, dismissed FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
-			args: [userId, doseId],
-		});
-
-		if (existing.rows.length > 0 && existing.rows[0].dismissed) {
-			// Already dismissed - keep the record as-is (don't delete)
-			// The dose stays dismissed, we just ignore the undo request
-		} else {
-			// Not dismissed - delete the record entirely
     await client.execute({
       sql: `DELETE FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
       args: [userId, doseId],
     });
-		}
 
     return { success: true };
   });
-
-	// POST /doses/dismiss - Dismiss missed doses without deducting stock
-	app.post<{ Body: { doseIds: string[] } }>("/doses/dismiss", async (request, reply) => {
-		const userId = 1;
-		const { doseIds } = request.body || {};
-
-		if (!doseIds || !Array.isArray(doseIds) || doseIds.length === 0) {
-			return reply.status(400).send({ error: "doseIds array is required" });
-		}
-
-		let dismissedCount = 0;
-		for (const doseId of doseIds) {
-			// Check if already exists
-			const existing = await client.execute({
-				sql: `SELECT id, dismissed FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
-				args: [userId, doseId],
-			});
-
-			if (existing.rows.length > 0) {
-				// Update to dismissed if not already
-				if (!existing.rows[0].dismissed) {
-					await client.execute({
-						sql: `UPDATE dose_tracking SET dismissed = 1 WHERE id = ?`,
-						args: [existing.rows[0].id],
-					});
-					dismissedCount++;
-				}
-			} else {
-				// Insert new dismissed record
-				await client.execute({
-					sql: `INSERT INTO dose_tracking (user_id, dose_id, dismissed) VALUES (?, ?, 1)`,
-					args: [userId, doseId],
-				});
-				dismissedCount++;
-			}
-		}
-
-		return { success: true, dismissedCount };
-	});
 }
 
 // =============================================================================
@@ -351,43 +307,6 @@ describe("Dose Tracking API", () => {
       expect(response.statusCode).toBe(200);
       expect(response.json()).toEqual({ success: true });
     });
-
-		it("should preserve dismissed status when unmarking a dose", async () => {
-			const doseId = "1-0-1735344000000";
-
-			// First dismiss the dose
-			await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: { doseIds: [doseId] },
-			});
-
-			// Verify it's dismissed
-			let result = await ctx.client.execute({
-				sql: `SELECT dismissed, taken_at FROM dose_tracking WHERE dose_id = ?`,
-				args: [doseId],
-			});
-			expect(result.rows[0].dismissed).toBe(1);
-			const originalTakenAt = result.rows[0].taken_at;
-
-			// Now try to unmark it (undo) - should keep the dismissed record
-			const response = await ctx.app.inject({
-				method: "DELETE",
-				url: `/doses/taken/${encodeURIComponent(doseId)}`,
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true });
-
-			// Verify the record still exists and is still dismissed
-			result = await ctx.client.execute({
-				sql: `SELECT dose_id, dismissed, taken_at FROM dose_tracking WHERE dose_id = ?`,
-				args: [doseId],
-			});
-			expect(result.rows.length).toBe(1);
-			expect(result.rows[0].dismissed).toBe(1);
-			expect(result.rows[0].taken_at).toBe(originalTakenAt); // unchanged
-		});
   });
 
   // ---------------------------------------------------------------------------
@@ -442,101 +361,4 @@ describe("Dose Tracking API", () => {
       expect(getResponse.json().doses[0].doseId).toBe(doseId);
     });
   });
-
-	// ---------------------------------------------------------------------------
-	// Dismiss Doses Tests (POST /doses/dismiss)
-	// ---------------------------------------------------------------------------
-
-	describe("POST /doses/dismiss", () => {
-		it("should dismiss multiple doses", async () => {
-			const doseIds = ["1-0-1735344000000", "1-0-1735430400000"];
-
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: { doseIds },
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true, dismissedCount: 2 });
-
-			// Verify in database
-			const result = await ctx.client.execute({
-				sql: `SELECT dose_id, dismissed FROM dose_tracking WHERE user_id = ? AND dismissed = 1`,
-				args: [userId],
-			});
-			expect(result.rows.length).toBe(2);
-		});
-
-		it("should not double-count already dismissed doses", async () => {
-			const doseId = "1-0-1735344000000";
-
-			// Dismiss once
-			await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: { doseIds: [doseId] },
-			});
-
-			// Dismiss again
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: { doseIds: [doseId] },
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true, dismissedCount: 0 });
-		});
-
-		it("should reject empty doseIds array", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: { doseIds: [] },
-			});
-
-			expect(response.statusCode).toBe(400);
-			expect(response.json()).toEqual({ error: "doseIds array is required" });
-		});
-
-		it("should reject missing doseIds", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: {},
-			});
-
-			expect(response.statusCode).toBe(400);
-			expect(response.json()).toEqual({ error: "doseIds array is required" });
-		});
-
-		it("should dismiss a dose that was already taken (convert to dismissed)", async () => {
-			const doseId = "1-0-1735344000000";
-
-			// First mark as taken
-			await ctx.app.inject({
-				method: "POST",
-				url: "/doses/taken",
-				payload: { doseId },
-			});
-
-			// Then dismiss it
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/doses/dismiss",
-				payload: { doseIds: [doseId] },
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true, dismissedCount: 1 });
-
-			// Verify it's now dismissed
-			const result = await ctx.client.execute({
-				sql: `SELECT dismissed FROM dose_tracking WHERE user_id = ? AND dose_id = ?`,
-				args: [userId, doseId],
-			});
-			expect(result.rows[0].dismissed).toBe(1);
-		});
-	});
 });

backend/src/test/env.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it, vi } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
 import { z } from "zod";
 
 // Mock process.exit to prevent tests from exiting
@@ -8,44 +8,23 @@ vi.spyOn(process, "exit").mockImplementation(mockExit as any);
 // Re-create the schema from env.ts for testing
 const EnvSchema = z.object({
   NODE_ENV: z.enum(["development", "production", "test"]).default("production"),
-	PORT: z
-		.string()
-		.transform((v) => parseInt(v, 10))
-		.default("3000"),
+  PORT: z.string().transform((v) => parseInt(v, 10)).default("3000"),
   CORS_ORIGINS: z.string().default("http://localhost:5173,http://localhost:4173"),
   LOG_LEVEL: z.string().default("info"),
-	AUTH_ENABLED: z
-		.string()
-		.transform((v) => v === "true")
-		.default("false"),
-	REGISTRATION_ENABLED: z
-		.string()
-		.transform((v) => v === "true")
-		.default("false"),
+  AUTH_ENABLED: z.string().transform((v) => v === "true").default("false"),
+  REGISTRATION_ENABLED: z.string().transform((v) => v === "true").default("false"),
   JWT_SECRET: z.string().min(10).optional(),
   REFRESH_SECRET: z.string().min(10).optional(),
   COOKIE_SECRET: z.string().min(10).optional(),
-	ACCESS_TOKEN_TTL_MINUTES: z
-		.string()
-		.transform((v) => parseInt(v, 10))
-		.default("15"),
-	REFRESH_TOKEN_TTL_DAYS: z
-		.string()
-		.transform((v) => parseInt(v, 10))
-		.default("7"),
-	OIDC_ENABLED: z
-		.string()
-		.transform((v) => v === "true")
-		.default("false"),
+  ACCESS_TOKEN_TTL_MINUTES: z.string().transform((v) => parseInt(v, 10)).default("15"),
+  REFRESH_TOKEN_TTL_DAYS: z.string().transform((v) => parseInt(v, 10)).default("7"),
+  OIDC_ENABLED: z.string().transform((v) => v === "true").default("false"),
   OIDC_ISSUER_URL: z.string().url().optional(),
   OIDC_CLIENT_ID: z.string().optional(),
   OIDC_CLIENT_SECRET: z.string().optional(),
   OIDC_REDIRECT_URI: z.string().url().optional(),
   OIDC_SCOPES: z.string().default("openid profile email"),
-	OIDC_AUTO_CREATE_USERS: z
-		.string()
-		.transform((v) => v === "true")
-		.default("true"),
+  OIDC_AUTO_CREATE_USERS: z.string().transform((v) => v === "true").default("true"),
   OIDC_USERNAME_CLAIM: z.string().default("preferred_username"),
   OIDC_PROVIDER_NAME: z.string().default("SSO"),
 });

backend/src/test/export.test.ts

@@ -1,843 +0,0 @@
-/**
- * Tests for /export and /import API endpoints.
- * Tests export/import functionality with schema-independent format.
- */
-
-import { randomBytes } from "node:crypto";
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import {
-	buildTestApp,
-	clearTestData,
-	closeTestApp,
-	createTestMedication,
-	createTestUser,
-	type TestContext,
-} from "./setup.js";
-
-// =============================================================================
-// Route Registration (simplified test routes)
-// =============================================================================
-
-async function registerExportRoutes(ctx: TestContext) {
-	const { app, client } = ctx;
-	const userId = 1; // Test user ID
-
-	// Helper to parse blisters from DB
-	function parseBlisters(row: any): Array<{ usage: number; every: number; start: string; remind: boolean }> {
-		const usage = JSON.parse(row.usage_json || "[]") as number[];
-		const every = JSON.parse(row.every_json || "[]") as number[];
-		const start = JSON.parse(row.start_json || "[]") as string[];
-		const len = Math.min(usage.length, every.length, start.length);
-		return Array.from({ length: len }, (_, i) => ({
-			usage: usage[i],
-			every: every[i],
-			start: start[i],
-			remind: Boolean(row.intake_reminders_enabled),
-		}));
-	}
-
-	// GET /export
-	app.get<{ Querystring: { includeSensitive?: string } }>("/export", async (request, _reply) => {
-		const includeSensitive = request.query.includeSensitive === "true";
-
-		// Load medications
-		const medsResult = await client.execute({
-			sql: `SELECT * FROM medications WHERE user_id = ? ORDER BY id`,
-			args: [userId],
-		});
-
-		const medIdToExportId = new Map<number, string>();
-		const medications = medsResult.rows.map((m, i) => {
-			const exportId = `med-${i + 1}`;
-			medIdToExportId.set(m.id as number, exportId);
-			return {
-				_exportId: exportId,
-				name: m.name,
-				genericName: m.generic_name,
-				takenBy: JSON.parse((m.taken_by_json as string) || "[]"),
-				inventory: {
-					packCount: m.pack_count ?? 1,
-					blistersPerPack: m.blisters_per_pack ?? 1,
-					pillsPerBlister: m.pills_per_blister ?? 1,
-					looseTablets: m.loose_tablets ?? 0,
-				},
-				pillWeightMg: m.pill_weight_mg,
-				schedules: parseBlisters(m),
-				expiryDate: m.expiry_date,
-				notes: m.notes,
-				intakeRemindersEnabled: Boolean(m.intake_reminders_enabled),
-				image: null, // Skip images in test
-			};
-		});
-
-		// Load dose tracking
-		const dosesResult = await client.execute({
-			sql: `SELECT * FROM dose_tracking WHERE user_id = ?`,
-			args: [userId],
-		});
-
-		const doseHistory = dosesResult.rows
-			.map((d) => {
-				const parts = (d.dose_id as string).split("-");
-				if (parts.length < 3) return null;
-				const medId = parseInt(parts[0], 10);
-				const exportId = medIdToExportId.get(medId);
-				if (!exportId) return null;
-				return {
-					medicationRef: exportId,
-					scheduleIndex: parseInt(parts[1], 10),
-					scheduledTime: new Date(parseInt(parts[2], 10)).toISOString(),
-					takenAt: d.taken_at ? new Date((d.taken_at as number) * 1000).toISOString() : new Date().toISOString(),
-					markedBy: d.marked_by,
-				};
-			})
-			.filter(Boolean);
-
-		// Load settings
-		const settingsResult = await client.execute({
-			sql: `SELECT * FROM user_settings WHERE user_id = ?`,
-			args: [userId],
-		});
-
-		let settings;
-		if (settingsResult.rows.length > 0) {
-			const s = settingsResult.rows[0];
-			settings = {
-				emailEnabled: Boolean(s.email_enabled),
-				notificationEmail: s.notification_email,
-				emailStockReminders: Boolean(s.email_stock_reminders ?? 1),
-				emailIntakeReminders: Boolean(s.email_intake_reminders ?? 1),
-				shoutrrrEnabled: includeSensitive ? Boolean(s.shoutrrr_enabled) : undefined,
-				shoutrrrUrl: includeSensitive ? s.shoutrrr_url : undefined,
-				shoutrrrStockReminders: Boolean(s.shoutrrr_stock_reminders ?? 1),
-				shoutrrrIntakeReminders: Boolean(s.shoutrrr_intake_reminders ?? 1),
-				reminderDaysBefore: s.reminder_days_before ?? 7,
-				repeatDailyReminders: Boolean(s.repeat_daily_reminders),
-				skipRemindersForTakenDoses: Boolean(s.skip_reminders_for_taken_doses),
-				repeatRemindersEnabled: Boolean(s.repeat_reminders_enabled),
-				reminderRepeatIntervalMinutes: s.reminder_repeat_interval_minutes ?? 30,
-				maxNaggingReminders: s.max_nagging_reminders ?? 5,
-				lowStockDays: s.low_stock_days ?? 30,
-				normalStockDays: s.normal_stock_days ?? 90,
-				highStockDays: s.high_stock_days ?? 180,
-				language: s.language ?? "en",
-				stockCalculationMode: s.stock_calculation_mode ?? "automatic",
-			};
-		}
-
-		// Load share links
-		const sharesResult = await client.execute({
-			sql: `SELECT * FROM share_tokens WHERE user_id = ?`,
-			args: [userId],
-		});
-
-		const shareLinks = sharesResult.rows.map((s) => ({
-			takenBy: s.taken_by,
-			scheduleDays: s.schedule_days ?? 30,
-			expiresAt: s.expires_at ? new Date((s.expires_at as number) * 1000).toISOString() : null,
-			regenerateToken: true,
-		}));
-
-		return {
-			version: "1.0",
-			exportedAt: new Date().toISOString(),
-			includeSensitiveData: includeSensitive,
-			medications,
-			doseHistory,
-			settings,
-			shareLinks,
-		};
-	});
-
-	// POST /import
-	app.post<{ Body: any }>("/import", async (request, reply) => {
-		const importData = request.body as any;
-
-		// Basic validation
-		if (!importData.version) {
-			return reply.status(400).send({ error: "Invalid import data format" });
-		}
-
-		// Delete existing data
-		await client.execute({ sql: `DELETE FROM dose_tracking WHERE user_id = ?`, args: [userId] });
-		await client.execute({ sql: `DELETE FROM share_tokens WHERE user_id = ?`, args: [userId] });
-		await client.execute({ sql: `DELETE FROM medications WHERE user_id = ?`, args: [userId] });
-		await client.execute({ sql: `DELETE FROM user_settings WHERE user_id = ?`, args: [userId] });
-
-		// Import medications
-		const exportIdToNewId = new Map<string, number>();
-		for (const med of importData.medications || []) {
-			const usageJson = JSON.stringify((med.schedules || []).map((s: any) => s.usage));
-			const everyJson = JSON.stringify((med.schedules || []).map((s: any) => s.every));
-			const startJson = JSON.stringify((med.schedules || []).map((s: any) => s.start));
-			const takenByJson = JSON.stringify(med.takenBy || []);
-
-			const result = await client.execute({
-				sql: `INSERT INTO medications (
-          user_id, name, generic_name, taken_by_json,
-          pack_count, blisters_per_pack, pills_per_blister, loose_tablets,
-          pill_weight_mg, expiry_date, notes, intake_reminders_enabled,
-          usage_json, every_json, start_json
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`,
-				args: [
-					userId,
-					med.name,
-					med.genericName || null,
-					takenByJson,
-					med.inventory?.packCount ?? 1,
-					med.inventory?.blistersPerPack ?? 1,
-					med.inventory?.pillsPerBlister ?? 1,
-					med.inventory?.looseTablets ?? 0,
-					med.pillWeightMg ?? null,
-					med.expiryDate || null,
-					med.notes || null,
-					med.intakeRemindersEnabled ? 1 : 0,
-					usageJson,
-					everyJson,
-					startJson,
-				],
-			});
-
-			exportIdToNewId.set(med._exportId, result.rows[0].id as number);
-		}
-
-		// Import dose history
-		for (const dose of importData.doseHistory || []) {
-			const newMedId = exportIdToNewId.get(dose.medicationRef);
-			if (!newMedId) continue;
-
-			const timestampMs = new Date(dose.scheduledTime).getTime();
-			const doseId = `${newMedId}-${dose.scheduleIndex}-${timestampMs}`;
-
-			await client.execute({
-				sql: `INSERT INTO dose_tracking (user_id, dose_id, taken_at, marked_by) VALUES (?, ?, ?, ?)`,
-				args: [userId, doseId, Math.floor(new Date(dose.takenAt).getTime() / 1000), dose.markedBy || null],
-			});
-		}
-
-		// Import settings
-		if (importData.settings) {
-			const s = importData.settings;
-			await client.execute({
-				sql: `INSERT INTO user_settings (
-          user_id, email_enabled, notification_email,
-          email_stock_reminders, email_intake_reminders,
-          shoutrrr_enabled, shoutrrr_url,
-          shoutrrr_stock_reminders, shoutrrr_intake_reminders,
-          reminder_days_before, repeat_daily_reminders,
-          skip_reminders_for_taken_doses, repeat_reminders_enabled,
-          reminder_repeat_interval_minutes, max_nagging_reminders,
-          low_stock_days, normal_stock_days, high_stock_days,
-          language, stock_calculation_mode
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
-				args: [
-					userId,
-					s.emailEnabled ? 1 : 0,
-					s.notificationEmail || null,
-					s.emailStockReminders ?? 1,
-					s.emailIntakeReminders ?? 1,
-					s.shoutrrrEnabled ? 1 : 0,
-					s.shoutrrrUrl || null,
-					s.shoutrrrStockReminders ?? 1,
-					s.shoutrrrIntakeReminders ?? 1,
-					s.reminderDaysBefore ?? 7,
-					s.repeatDailyReminders ? 1 : 0,
-					s.skipRemindersForTakenDoses ? 1 : 0,
-					s.repeatRemindersEnabled ? 1 : 0,
-					s.reminderRepeatIntervalMinutes ?? 30,
-					s.maxNaggingReminders ?? 5,
-					s.lowStockDays ?? 30,
-					s.normalStockDays ?? 90,
-					s.highStockDays ?? 180,
-					s.language ?? "en",
-					s.stockCalculationMode ?? "automatic",
-				],
-			});
-		}
-
-		// Import share links
-		for (const share of importData.shareLinks || []) {
-			const token = randomBytes(8).toString("hex");
-			await client.execute({
-				sql: `INSERT INTO share_tokens (user_id, token, taken_by, schedule_days, expires_at) VALUES (?, ?, ?, ?, ?)`,
-				args: [
-					userId,
-					token,
-					share.takenBy,
-					share.scheduleDays ?? 30,
-					share.expiresAt ? Math.floor(new Date(share.expiresAt).getTime() / 1000) : null,
-				],
-			});
-		}
-
-		return {
-			success: true,
-			imported: {
-				medications: (importData.medications || []).length,
-				doseHistory: (importData.doseHistory || []).length,
-				settings: importData.settings ? 1 : 0,
-				shareLinks: (importData.shareLinks || []).length,
-			},
-		};
-	});
-}
-
-// =============================================================================
-// Tests
-// =============================================================================
-
-describe("Export/Import API", () => {
-	let ctx: TestContext;
-	let userId: number;
-
-	beforeAll(async () => {
-		ctx = await buildTestApp();
-		await registerExportRoutes(ctx);
-		await ctx.app.ready();
-	});
-
-	afterAll(async () => {
-		await closeTestApp(ctx);
-	});
-
-	beforeEach(async () => {
-		await clearTestData(ctx.client);
-		await ctx.client.execute("DELETE FROM sqlite_sequence WHERE name='users'");
-		await ctx.client.execute("DELETE FROM sqlite_sequence WHERE name='medications'");
-		userId = await createTestUser(ctx.client, { username: "testuser" });
-	});
-
-	// ---------------------------------------------------------------------------
-	// GET /export
-	// ---------------------------------------------------------------------------
-
-	describe("GET /export", () => {
-		it("should export empty data for new user", async () => {
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.version).toBe("1.0");
-			expect(data.exportedAt).toBeDefined();
-			expect(data.medications).toEqual([]);
-			expect(data.doseHistory).toEqual([]);
-			expect(data.shareLinks).toEqual([]);
-		});
-
-		it("should export medications with correct format", async () => {
-			const startDate = "2025-01-15T08:00:00.000Z";
-			await createTestMedication(ctx.client, {
-				userId,
-				name: "Aspirin",
-				genericName: "Acetylsalicylic acid",
-				takenBy: ["Daniel", "Maria"],
-				packCount: 2,
-				blistersPerPack: 3,
-				pillsPerBlister: 10,
-				looseTablets: 5,
-				pillWeightMg: 500,
-				expiryDate: "2027-06-30",
-				notes: "Take with food",
-				intakeRemindersEnabled: true,
-				blisters: [
-					{ usage: 1, every: 1, start: startDate },
-					{ usage: 0.5, every: 7, start: startDate },
-				],
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.medications).toHaveLength(1);
-
-			const med = data.medications[0];
-			expect(med._exportId).toBe("med-1");
-			expect(med.name).toBe("Aspirin");
-			expect(med.genericName).toBe("Acetylsalicylic acid");
-			expect(med.takenBy).toEqual(["Daniel", "Maria"]);
-			expect(med.inventory).toEqual({
-				packCount: 2,
-				blistersPerPack: 3,
-				pillsPerBlister: 10,
-				looseTablets: 5,
-			});
-			expect(med.pillWeightMg).toBe(500);
-			expect(med.expiryDate).toBe("2027-06-30");
-			expect(med.notes).toBe("Take with food");
-			expect(med.intakeRemindersEnabled).toBe(true);
-			expect(med.schedules).toHaveLength(2);
-			expect(med.schedules[0]).toEqual({
-				usage: 1,
-				every: 1,
-				start: startDate,
-				remind: true,
-			});
-		});
-
-		it("should export settings", async () => {
-			// Create settings
-			await ctx.client.execute({
-				sql: `INSERT INTO user_settings (
-          user_id, email_enabled, notification_email, language, low_stock_days
-        ) VALUES (?, 1, 'test@example.com', 'de', 14)`,
-				args: [userId],
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.settings).toBeDefined();
-			expect(data.settings.emailEnabled).toBe(true);
-			expect(data.settings.notificationEmail).toBe("test@example.com");
-			expect(data.settings.language).toBe("de");
-			expect(data.settings.lowStockDays).toBe(14);
-		});
-
-		it("should exclude sensitive data by default", async () => {
-			await ctx.client.execute({
-				sql: `INSERT INTO user_settings (
-          user_id, shoutrrr_enabled, shoutrrr_url
-        ) VALUES (?, 1, 'ntfy://user:pass@ntfy.sh/topic')`,
-				args: [userId],
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.includeSensitiveData).toBe(false);
-			expect(data.settings.shoutrrrEnabled).toBeUndefined();
-			expect(data.settings.shoutrrrUrl).toBeUndefined();
-		});
-
-		it("should include sensitive data when requested", async () => {
-			await ctx.client.execute({
-				sql: `INSERT INTO user_settings (
-          user_id, shoutrrr_enabled, shoutrrr_url
-        ) VALUES (?, 1, 'ntfy://user:pass@ntfy.sh/topic')`,
-				args: [userId],
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export?includeSensitive=true",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.includeSensitiveData).toBe(true);
-			expect(data.settings.shoutrrrEnabled).toBe(true);
-			expect(data.settings.shoutrrrUrl).toBe("ntfy://user:pass@ntfy.sh/topic");
-		});
-
-		it("should export dose history with medication references", async () => {
-			const medId = await createTestMedication(ctx.client, {
-				userId,
-				name: "Test Med",
-			});
-
-			// Create dose tracking entry
-			const timestampMs = Date.now();
-			const doseId = `${medId}-0-${timestampMs}`;
-			await ctx.client.execute({
-				sql: `INSERT INTO dose_tracking (user_id, dose_id, taken_at) VALUES (?, ?, ?)`,
-				args: [userId, doseId, Math.floor(Date.now() / 1000)],
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.doseHistory).toHaveLength(1);
-			expect(data.doseHistory[0].medicationRef).toBe("med-1");
-			expect(data.doseHistory[0].scheduleIndex).toBe(0);
-			expect(data.doseHistory[0].scheduledTime).toBeDefined();
-			expect(data.doseHistory[0].takenAt).toBeDefined();
-		});
-
-		it("should export share links", async () => {
-			await ctx.client.execute({
-				sql: `INSERT INTO share_tokens (user_id, token, taken_by, schedule_days) VALUES (?, ?, ?, ?)`,
-				args: [userId, "abc123", "Daniel", 30],
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.shareLinks).toHaveLength(1);
-			expect(data.shareLinks[0].takenBy).toBe("Daniel");
-			expect(data.shareLinks[0].scheduleDays).toBe(30);
-			expect(data.shareLinks[0].regenerateToken).toBe(true);
-		});
-	});
-
-	// ---------------------------------------------------------------------------
-	// POST /import
-	// ---------------------------------------------------------------------------
-
-	describe("POST /import", () => {
-		it("should import medications", async () => {
-			const importData = {
-				version: "1.0",
-				exportedAt: new Date().toISOString(),
-				medications: [
-					{
-						_exportId: "med-1",
-						name: "Imported Med",
-						genericName: "Generic",
-						takenBy: ["Alice"],
-						inventory: {
-							packCount: 2,
-							blistersPerPack: 3,
-							pillsPerBlister: 10,
-							looseTablets: 5,
-						},
-						pillWeightMg: 250,
-						schedules: [{ usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z", remind: true }],
-						expiryDate: "2027-12-31",
-						notes: "Test notes",
-						intakeRemindersEnabled: true,
-					},
-				],
-				doseHistory: [],
-				shareLinks: [],
-			};
-
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: importData,
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json().success).toBe(true);
-			expect(response.json().imported.medications).toBe(1);
-
-			// Verify in database
-			const result = await ctx.client.execute({
-				sql: `SELECT * FROM medications WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(result.rows).toHaveLength(1);
-			expect(result.rows[0].name).toBe("Imported Med");
-			expect(result.rows[0].generic_name).toBe("Generic");
-			expect(result.rows[0].pack_count).toBe(2);
-			expect(result.rows[0].blisters_per_pack).toBe(3);
-			expect(result.rows[0].pills_per_blister).toBe(10);
-			expect(result.rows[0].loose_tablets).toBe(5);
-		});
-
-		it("should replace existing data on import", async () => {
-			// Create existing medication
-			await createTestMedication(ctx.client, {
-				userId,
-				name: "Existing Med",
-			});
-
-			const importData = {
-				version: "1.0",
-				exportedAt: new Date().toISOString(),
-				medications: [
-					{
-						_exportId: "med-1",
-						name: "New Med",
-						schedules: [{ usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z" }],
-					},
-				],
-				doseHistory: [],
-				shareLinks: [],
-			};
-
-			await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: importData,
-			});
-
-			// Verify old med deleted, new one exists
-			const result = await ctx.client.execute({
-				sql: `SELECT * FROM medications WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(result.rows).toHaveLength(1);
-			expect(result.rows[0].name).toBe("New Med");
-		});
-
-		it("should import dose history with remapped IDs", async () => {
-			const importData = {
-				version: "1.0",
-				exportedAt: new Date().toISOString(),
-				medications: [
-					{
-						_exportId: "med-1",
-						name: "Med 1",
-						schedules: [{ usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z" }],
-					},
-				],
-				doseHistory: [
-					{
-						medicationRef: "med-1",
-						scheduleIndex: 0,
-						scheduledTime: "2025-01-15T08:00:00.000Z",
-						takenAt: "2025-01-15T08:15:00.000Z",
-						markedBy: null,
-					},
-				],
-				shareLinks: [],
-			};
-
-			await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: importData,
-			});
-
-			// Verify dose tracking
-			const doses = await ctx.client.execute({
-				sql: `SELECT * FROM dose_tracking WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(doses.rows).toHaveLength(1);
-			// Dose ID should contain the NEW medication ID
-			const doseId = doses.rows[0].dose_id as string;
-			expect(doseId).toMatch(/^\d+-0-\d+$/);
-		});
-
-		it("should import settings", async () => {
-			const importData = {
-				version: "1.0",
-				exportedAt: new Date().toISOString(),
-				medications: [],
-				doseHistory: [],
-				settings: {
-					emailEnabled: true,
-					notificationEmail: "imported@example.com",
-					language: "de",
-					lowStockDays: 14,
-					normalStockDays: 60,
-					highStockDays: 120,
-				},
-				shareLinks: [],
-			};
-
-			await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: importData,
-			});
-
-			// Verify settings
-			const settings = await ctx.client.execute({
-				sql: `SELECT * FROM user_settings WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(settings.rows).toHaveLength(1);
-			expect(settings.rows[0].email_enabled).toBe(1);
-			expect(settings.rows[0].notification_email).toBe("imported@example.com");
-			expect(settings.rows[0].language).toBe("de");
-			expect(settings.rows[0].low_stock_days).toBe(14);
-		});
-
-		it("should import share links with new tokens", async () => {
-			const importData = {
-				version: "1.0",
-				exportedAt: new Date().toISOString(),
-				medications: [],
-				doseHistory: [],
-				shareLinks: [
-					{
-						takenBy: "Daniel",
-						scheduleDays: 60,
-						regenerateToken: true,
-					},
-				],
-			};
-
-			await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: importData,
-			});
-
-			// Verify share token
-			const shares = await ctx.client.execute({
-				sql: `SELECT * FROM share_tokens WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(shares.rows).toHaveLength(1);
-			expect(shares.rows[0].taken_by).toBe("Daniel");
-			expect(shares.rows[0].schedule_days).toBe(60);
-			expect(shares.rows[0].token).toBeDefined();
-			expect((shares.rows[0].token as string).length).toBe(16); // 8 bytes = 16 hex chars
-		});
-
-		it("should reject invalid import data", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: { invalid: "data" },
-			});
-
-			expect(response.statusCode).toBe(400);
-			expect(response.json().error).toBe("Invalid import data format");
-		});
-	});
-
-	// ---------------------------------------------------------------------------
-	// Export/Import Roundtrip Tests
-	// ---------------------------------------------------------------------------
-
-	describe("Export/Import Roundtrip", () => {
-		it("should preserve all data through export/import cycle", async () => {
-			// Setup: Create medications, doses, settings, shares
-			const startDate = "2025-01-15T08:00:00.000Z";
-			const medId = await createTestMedication(ctx.client, {
-				userId,
-				name: "Roundtrip Med",
-				genericName: "Generic Name",
-				takenBy: ["Daniel", "Maria"],
-				packCount: 2,
-				blistersPerPack: 3,
-				pillsPerBlister: 10,
-				looseTablets: 5,
-				pillWeightMg: 500,
-				expiryDate: "2027-06-30",
-				notes: "Test notes",
-				intakeRemindersEnabled: true,
-				blisters: [
-					{ usage: 1, every: 1, start: startDate },
-					{ usage: 0.5, every: 7, start: startDate },
-				],
-			});
-
-			// Create dose
-			const timestampMs = new Date(startDate).getTime();
-			const doseId = `${medId}-0-${timestampMs}`;
-			await ctx.client.execute({
-				sql: `INSERT INTO dose_tracking (user_id, dose_id, taken_at, marked_by) VALUES (?, ?, ?, ?)`,
-				args: [userId, doseId, Math.floor(Date.now() / 1000), "Daniel"],
-			});
-
-			// Create settings
-			await ctx.client.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, notification_email, language, low_stock_days) VALUES (?, 1, 'test@example.com', 'de', 14)`,
-				args: [userId],
-			});
-
-			// Create share
-			await ctx.client.execute({
-				sql: `INSERT INTO share_tokens (user_id, token, taken_by, schedule_days) VALUES (?, ?, ?, ?)`,
-				args: [userId, "original123", "Daniel", 60],
-			});
-
-			// Export
-			const exportResponse = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-			expect(exportResponse.statusCode).toBe(200);
-			const exportData = exportResponse.json();
-
-			// Import (this replaces all data)
-			const importResponse = await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: exportData,
-			});
-			expect(importResponse.statusCode).toBe(200);
-
-			// Export again and compare
-			const reExportResponse = await ctx.app.inject({
-				method: "GET",
-				url: "/export",
-			});
-			const reExportData = reExportResponse.json();
-
-			// Compare (excluding timestamps and IDs that change)
-			expect(reExportData.medications).toHaveLength(1);
-			expect(reExportData.medications[0].name).toBe("Roundtrip Med");
-			expect(reExportData.medications[0].genericName).toBe("Generic Name");
-			expect(reExportData.medications[0].takenBy).toEqual(["Daniel", "Maria"]);
-			expect(reExportData.medications[0].inventory).toEqual({
-				packCount: 2,
-				blistersPerPack: 3,
-				pillsPerBlister: 10,
-				looseTablets: 5,
-			});
-			expect(reExportData.medications[0].schedules).toHaveLength(2);
-
-			expect(reExportData.doseHistory).toHaveLength(1);
-			expect(reExportData.doseHistory[0].markedBy).toBe("Daniel");
-
-			expect(reExportData.settings.emailEnabled).toBe(true);
-			expect(reExportData.settings.notificationEmail).toBe("test@example.com");
-			expect(reExportData.settings.language).toBe("de");
-
-			expect(reExportData.shareLinks).toHaveLength(1);
-			expect(reExportData.shareLinks[0].takenBy).toBe("Daniel");
-		});
-
-		it("should handle import with different schema (backward compatibility)", async () => {
-			// Simulate import from older version without some fields
-			const importData = {
-				version: "1.0",
-				exportedAt: new Date().toISOString(),
-				medications: [
-					{
-						_exportId: "med-1",
-						name: "Legacy Med",
-						// Missing: genericName, takenBy, pillWeightMg, etc.
-						inventory: {
-							packCount: 1,
-							blistersPerPack: 1,
-							pillsPerBlister: 10,
-							looseTablets: 0,
-						},
-						schedules: [{ usage: 1, every: 1, start: "2025-01-15T08:00:00.000Z" }],
-					},
-				],
-				doseHistory: [],
-				// Missing: settings, shareLinks
-			};
-
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: "/import",
-				payload: importData,
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json().success).toBe(true);
-
-			// Verify defaults were applied
-			const result = await ctx.client.execute({
-				sql: `SELECT * FROM medications WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(result.rows[0].name).toBe("Legacy Med");
-			expect(result.rows[0].generic_name).toBeNull();
-			expect(result.rows[0].taken_by_json).toBe("[]");
-		});
-	});
-});

backend/src/test/integration.test.ts

@@ -2,14 +2,14 @@
  * Integration Tests - Testing interactions between multiple routes/features
  * These tests verify critical app behavior that spans multiple components.
  */
-
+import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from "vitest";
+import Fastify, { FastifyInstance } from "fastify";
 import cookie from "@fastify/cookie";
 import jwt from "@fastify/jwt";
-import fastifyMultipart from "@fastify/multipart";
 import sensible from "@fastify/sensible";
-import type { Client } from "@libsql/client";
-import Fastify, { type FastifyInstance } from "fastify";
-import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import fastifyMultipart from "@fastify/multipart";
+import { createClient, Client } from "@libsql/client";
+import { drizzle } from "drizzle-orm/libsql";
 
 // Use vi.hoisted to create the db BEFORE mocks are set up
 const { testClient, testDb } = vi.hoisted(() => {
@@ -76,25 +76,18 @@ async function createSchema(client: Client) {
       name text NOT NULL,
       generic_name text,
       taken_by_json text NOT NULL DEFAULT '[]',
-		    package_type text NOT NULL DEFAULT 'blister',
       pack_count integer NOT NULL DEFAULT 1,
       blisters_per_pack integer NOT NULL DEFAULT 1,
       pills_per_blister integer NOT NULL DEFAULT 1,
-		    total_pills integer,
       loose_tablets integer NOT NULL DEFAULT 0,
-		    stock_adjustment integer NOT NULL DEFAULT 0,
-		    last_stock_correction_at integer,
       pill_weight_mg integer,
-		    dose_unit text DEFAULT 'mg',
       usage_json text NOT NULL DEFAULT '[]',
       every_json text NOT NULL DEFAULT '[]',
       start_json text NOT NULL DEFAULT '[]',
-		    intakes_json text NOT NULL DEFAULT '[]',
       image_url text,
       expiry_date text,
       notes text,
       intake_reminders_enabled integer NOT NULL DEFAULT 0,
-		    dismissed_until text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -121,15 +114,9 @@ async function createSchema(client: Client) {
       expiry_warning_days integer NOT NULL DEFAULT 90,
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
-      share_stock_status integer NOT NULL DEFAULT 1,
       last_auto_email_sent text,
       last_notification_type text,
       last_notification_channel text,
-      last_reminder_med_name text,
-      last_reminder_taken_by text,
-      last_stock_reminder_sent text,
-      last_stock_reminder_channel text,
-      last_stock_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -149,7 +136,6 @@ async function createSchema(client: Client) {
       dose_id text NOT NULL,
       taken_at integer NOT NULL DEFAULT (strftime('%s','now')),
       marked_by text,
-      dismissed integer NOT NULL DEFAULT 0,
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
   ];
@@ -174,7 +160,7 @@ async function clearData(client: Client) {
 
 describe("Integration Tests", () => {
   let app: FastifyInstance;
-	const _userId = 999999999;
+  const userId = 999999999;
 
   beforeAll(async () => {
     await createSchema(testClient);
@@ -369,196 +355,6 @@ describe("Integration Tests", () => {
     });
   });
 
-	// ---------------------------------------------------------------------------
-	// Dose ID Migration on Schedule Changes
-	// ---------------------------------------------------------------------------
-
-	describe("Dose ID migration when schedule changes", () => {
-		it("should migrate dose IDs when weekly start day changes", async () => {
-			// Create a weekly medication starting Friday Oct 17
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Weekly Med",
-					blisters: [{ usage: 1, every: 7, start: "2025-10-17T08:00:00" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			// Mark doses for Fridays (Oct 17, Oct 24, Oct 31)
-			const fri17 = new Date(2025, 9, 17).getTime(); // Oct 17
-			const fri24 = new Date(2025, 9, 24).getTime(); // Oct 24
-			const fri31 = new Date(2025, 9, 31).getTime(); // Oct 31
-
-			for (const ts of [fri17, fri24, fri31]) {
-				await app.inject({
-					method: "POST",
-					url: "/doses/taken",
-					payload: { doseId: `${medId}-0-${ts}` },
-				});
-			}
-
-			// Verify 3 doses exist
-			const before = await testClient.execute({
-				sql: `SELECT COUNT(*) as count FROM dose_tracking WHERE dose_id LIKE ?`,
-				args: [`${medId}-%`],
-			});
-			expect(before.rows[0].count).toBe(3);
-
-			// Change start to Saturday Oct 18 (shifts all future and past IDs)
-			await app.inject({
-				method: "PUT",
-				url: `/medications/${medId}`,
-				payload: {
-					name: "Weekly Med",
-					blisters: [{ usage: 1, every: 7, start: "2025-10-18T08:00:00" }],
-				},
-			});
-
-			// Doses should be migrated to Saturday dates
-			const sat18 = new Date(2025, 9, 18).getTime(); // Oct 18
-			const sat25 = new Date(2025, 9, 25).getTime(); // Oct 25
-			const nov1 = new Date(2025, 10, 1).getTime(); // Nov 1
-
-			const after = await testClient.execute({
-				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ? ORDER BY dose_id`,
-				args: [`${medId}-%`],
-			});
-			expect(after.rows.length).toBe(3);
-			const ids = after.rows.map((r: { dose_id: string }) => r.dose_id);
-			expect(ids).toContain(`${medId}-0-${sat18}`);
-			expect(ids).toContain(`${medId}-0-${sat25}`);
-			expect(ids).toContain(`${medId}-0-${nov1}`);
-		});
-
-		it("should migrate dose IDs with person suffix when schedule changes", async () => {
-			// Create weekly medication with takenBy person
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Person Med",
-					intakes: [{ usage: 1, every: 7, start: "2025-10-17T08:00:00", takenBy: "Alice" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			// Mark dose with person suffix
-			const fri17 = new Date(2025, 9, 17).getTime();
-			await app.inject({
-				method: "POST",
-				url: "/doses/taken",
-				payload: { doseId: `${medId}-0-${fri17}-Alice` },
-			});
-
-			// Change start day
-			await app.inject({
-				method: "PUT",
-				url: `/medications/${medId}`,
-				payload: {
-					name: "Person Med",
-					intakes: [{ usage: 1, every: 7, start: "2025-10-18T08:00:00", takenBy: "Alice" }],
-				},
-			});
-
-			// Dose should be migrated with person suffix preserved
-			const sat18 = new Date(2025, 9, 18).getTime();
-			const after = await testClient.execute({
-				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ?`,
-				args: [`${medId}-%`],
-			});
-			expect(after.rows.length).toBe(1);
-			expect(after.rows[0].dose_id).toBe(`${medId}-0-${sat18}-Alice`);
-		});
-
-		it("should not migrate dose IDs when only time-of-day changes", async () => {
-			// Create daily medication at 08:00
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Daily Med",
-					blisters: [{ usage: 1, every: 1, start: "2025-10-17T08:00:00" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			// Mark dose
-			const oct17 = new Date(2025, 9, 17).getTime();
-			await app.inject({
-				method: "POST",
-				url: "/doses/taken",
-				payload: { doseId: `${medId}-0-${oct17}` },
-			});
-
-			// Change only time from 08:00 to 20:00 (same date)
-			await app.inject({
-				method: "PUT",
-				url: `/medications/${medId}`,
-				payload: {
-					name: "Daily Med",
-					blisters: [{ usage: 1, every: 1, start: "2025-10-17T20:00:00" }],
-				},
-			});
-
-			// Dose ID should remain unchanged (dateOnlyMs is the same)
-			const after = await testClient.execute({
-				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ?`,
-				args: [`${medId}-%`],
-			});
-			expect(after.rows.length).toBe(1);
-			expect(after.rows[0].dose_id).toBe(`${medId}-0-${oct17}`);
-		});
-
-		it("should migrate dose IDs when interval changes from daily to every-other-day", async () => {
-			// Create daily medication starting Oct 17
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Interval Med",
-					blisters: [{ usage: 1, every: 1, start: "2025-10-17T08:00:00" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			// Mark doses for Oct 17, 18, 19
-			const oct17 = new Date(2025, 9, 17).getTime();
-			const oct18 = new Date(2025, 9, 18).getTime();
-			const oct19 = new Date(2025, 9, 19).getTime();
-
-			for (const ts of [oct17, oct18, oct19]) {
-				await app.inject({
-					method: "POST",
-					url: "/doses/taken",
-					payload: { doseId: `${medId}-0-${ts}` },
-				});
-			}
-
-			// Change to every 2 days (Oct 17, 19, 21, ...)
-			await app.inject({
-				method: "PUT",
-				url: `/medications/${medId}`,
-				payload: {
-					name: "Interval Med",
-					blisters: [{ usage: 1, every: 2, start: "2025-10-17T08:00:00" }],
-				},
-			});
-
-			// Oct 17 stays (matches), Oct 18 → Oct 19 (nearest), Oct 19 → no match (already used)
-			// Actually: Oct 17 is exact match (no migration needed), Oct 18 maps to Oct 19 (within 1 day = half of 2),
-			// Oct 19 was the original schedule date but the new schedule also has Oct 19,
-			// which was already taken by Oct 18's migration
-			const after = await testClient.execute({
-				sql: `SELECT dose_id FROM dose_tracking WHERE dose_id LIKE ? ORDER BY dose_id`,
-				args: [`${medId}-%`],
-			});
-			// We should have at least the doses that could be mapped
-			expect(after.rows.length).toBeGreaterThanOrEqual(2);
-		});
-	});
-
   // ---------------------------------------------------------------------------
   // Share Link + Dose Tracking Integration
   // ---------------------------------------------------------------------------
@@ -900,16 +696,7 @@ describe("Integration Tests", () => {
   describe("Planner usage calculation", () => {
     it("should calculate correct usage for daily medication", async () => {
       // Create medication: 2 packs × 3 blisters × 10 pills = 60 pills total
-			// Schedule: 1 pill daily starting tomorrow (future date)
-			const tomorrow = new Date();
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(8, 0, 0, 0);
-			const intakeStart = tomorrow.toISOString();
-
-			const planEnd = new Date(tomorrow);
-			planEnd.setDate(planEnd.getDate() + 10);
-			const planEndStr = planEnd.toISOString();
-
+      // Schedule: 1 pill daily starting Jan 1
       await app.inject({
         method: "POST",
         url: "/medications",
@@ -919,17 +706,17 @@ describe("Integration Tests", () => {
           blistersPerPack: 3,
           pillsPerBlister: 10,
           looseTablets: 0,
-					blisters: [{ usage: 1, every: 1, start: intakeStart }],
+          blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
         },
       });
 
-			// Calculate usage for 10 days starting tomorrow
+      // Calculate usage for Jan 1-10 (10 days = 10 pills needed)
       const response = await app.inject({
         method: "POST",
         url: "/medications/usage",
         payload: {
-					startDate: intakeStart,
-					endDate: planEndStr, // 10 days
+          startDate: "2025-01-01T00:00:00.000Z",
+          endDate: "2025-01-11T00:00:00.000Z", // 10 days
         },
       });
 
@@ -938,22 +725,13 @@ describe("Integration Tests", () => {
       expect(data).toHaveLength(1);
       expect(data[0].medicationName).toBe("Daily Med");
       expect(data[0].plannerUsage).toBe(10); // 10 days × 1 pill
-			expect(data[0].totalPills).toBe(60); // Current stock is full (no consumption yet)
-			expect(data[0].enough).toBe(true);
+      // Note: 'enough' depends on current stock after consumption since start date
+      // Since test runs ~364 days after Jan 1, most pills are consumed
     });
 
     it("should detect insufficient stock", async () => {
       // Create medication: 1 pack × 1 blister × 5 pills = 5 pills total
-			// Schedule: 1 pill daily starting tomorrow
-			const tomorrow = new Date();
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(8, 0, 0, 0);
-			const intakeStart = tomorrow.toISOString();
-
-			const planEnd = new Date(tomorrow);
-			planEnd.setDate(planEnd.getDate() + 10);
-			const planEndStr = planEnd.toISOString();
-
+      // Schedule: 1 pill daily
       await app.inject({
         method: "POST",
         url: "/medications",
@@ -963,17 +741,17 @@ describe("Integration Tests", () => {
           blistersPerPack: 1,
           pillsPerBlister: 5,
           looseTablets: 0,
-					blisters: [{ usage: 1, every: 1, start: intakeStart }],
+          blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
         },
       });
 
-			// Calculate usage for 10 days (needs 10 pills, only have 5)
+      // Calculate usage for 10 days (needs 10 pills, only have 5 originally)
       const response = await app.inject({
         method: "POST",
         url: "/medications/usage",
         payload: {
-					startDate: intakeStart,
-					endDate: planEndStr,
+          startDate: "2025-01-01T00:00:00.000Z",
+          endDate: "2025-01-11T00:00:00.000Z",
         },
       });
 
@@ -985,16 +763,7 @@ describe("Integration Tests", () => {
 
     it("should calculate weekly medication usage correctly", async () => {
       // Create medication: 10 pills total
-			// Schedule: 1 pill every 7 days starting tomorrow
-			const tomorrow = new Date();
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(8, 0, 0, 0);
-			const intakeStart = tomorrow.toISOString();
-
-			const planEnd = new Date(tomorrow);
-			planEnd.setDate(planEnd.getDate() + 35); // 35 days to get 5 weekly doses
-			const planEndStr = planEnd.toISOString();
-
+      // Schedule: 1 pill every 7 days starting Jan 1
       await app.inject({
         method: "POST",
         url: "/medications",
@@ -1003,42 +772,29 @@ describe("Integration Tests", () => {
           packCount: 1,
           blistersPerPack: 1,
           pillsPerBlister: 10,
-					blisters: [{ usage: 1, every: 7, start: intakeStart }],
+          blisters: [{ usage: 1, every: 7, start: "2025-01-01T08:00:00.000Z" }],
         },
       });
 
-			// Calculate usage for 35 days (should need 5 pills)
+      // Calculate usage for 30 days (should need ~4-5 pills)
       const response = await app.inject({
         method: "POST",
         url: "/medications/usage",
         payload: {
-					startDate: intakeStart,
-					endDate: planEndStr,
+          startDate: "2025-01-01T00:00:00.000Z",
+          endDate: "2025-01-31T00:00:00.000Z", // 30 days
         },
       });
 
       expect(response.statusCode).toBe(200);
       const data = response.json();
-			// Day 0, 7, 14, 21, 28 = 5 doses
+      // Jan 1, 8, 15, 22, 29 = 5 doses
       expect(data[0].plannerUsage).toBe(5);
     });
 
     it("should handle multiple intake schedules per medication", async () => {
       // Create medication with morning and evening doses
       // 30 pills total, 1.5 pills per day (1 morning + 0.5 evening)
-			const tomorrow = new Date();
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(8, 0, 0, 0);
-			const morningStart = tomorrow.toISOString();
-
-			const eveningStart = new Date(tomorrow);
-			eveningStart.setHours(20, 0, 0, 0);
-			const eveningStartStr = eveningStart.toISOString();
-
-			const planEnd = new Date(tomorrow);
-			planEnd.setDate(planEnd.getDate() + 10);
-			const planEndStr = planEnd.toISOString();
-
       await app.inject({
         method: "POST",
         url: "/medications",
@@ -1048,8 +804,8 @@ describe("Integration Tests", () => {
           blistersPerPack: 1,
           pillsPerBlister: 30,
           blisters: [
-						{ usage: 1, every: 1, start: morningStart }, // Morning: 1 pill
-						{ usage: 0.5, every: 1, start: eveningStartStr }, // Evening: 0.5 pill
+            { usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" },   // Morning: 1 pill
+            { usage: 0.5, every: 1, start: "2025-01-01T20:00:00.000Z" }, // Evening: 0.5 pill
           ],
         },
       });
@@ -1059,8 +815,8 @@ describe("Integration Tests", () => {
         method: "POST",
         url: "/medications/usage",
         payload: {
-					startDate: morningStart,
-					endDate: planEndStr,
+          startDate: "2025-01-01T00:00:00.000Z",
+          endDate: "2025-01-11T00:00:00.000Z",
         },
       });
 
@@ -1072,15 +828,6 @@ describe("Integration Tests", () => {
 
     it("should calculate correct blisters needed", async () => {
       // 10 pills per blister, need 25 pills → need 3 blisters
-			const tomorrow = new Date();
-			tomorrow.setDate(tomorrow.getDate() + 1);
-			tomorrow.setHours(8, 0, 0, 0);
-			const intakeStart = tomorrow.toISOString();
-
-			const planEnd = new Date(tomorrow);
-			planEnd.setDate(planEnd.getDate() + 10);
-			const planEndStr = planEnd.toISOString();
-
       await app.inject({
         method: "POST",
         url: "/medications",
@@ -1089,7 +836,7 @@ describe("Integration Tests", () => {
           packCount: 5,
           blistersPerPack: 1,
           pillsPerBlister: 10,
-					blisters: [{ usage: 2.5, every: 1, start: intakeStart }],
+          blisters: [{ usage: 2.5, every: 1, start: "2025-01-01T08:00:00.000Z" }],
         },
       });
 
@@ -1098,8 +845,8 @@ describe("Integration Tests", () => {
         method: "POST",
         url: "/medications/usage",
         payload: {
-					startDate: intakeStart,
-					endDate: planEndStr,
+          startDate: "2025-01-01T00:00:00.000Z",
+          endDate: "2025-01-11T00:00:00.000Z",
         },
       });
 
@@ -1185,256 +932,5 @@ describe("Integration Tests", () => {
       expect(data[0].plannerUsage).toBe(10);
       expect(data[0].enough).toBe(true); // 45 > 10
     });
-
-		it("should use user-selected start date, not current time (fix asymmetric counting)", async () => {
-			// Regression test: When a planner range starts today, the old code used
-			// max(now, start) as the effective start. If now was between the morning
-			// dose (07:00) and evening dose (20:00), morning was skipped but evening
-			// counted, giving an asymmetric result (e.g., 5 instead of 6).
-			//
-			// Example: medication with daily morning (07:00) + evening (20:00) intakes,
-			// planner range [today 01:00, today+3 01:00).
-			// Old code at 15:00: morning 07:00 < 15:00 → skipped, evening 20:00 ≥ 15:00 → counted
-			// Result: 2 morning + 3 evening = 5 instead of 3+3 = 6.
-
-			// Use a past start date so the intakes predate the planner range
-			const intakeStart = "2025-01-01T07:00:00.000Z";
-			const intakeEvening = "2025-01-01T20:00:00.000Z";
-
-			// Plan range: Feb 9 00:00 to Feb 12 00:00 UTC (3 full days)
-			const planStart = "2026-02-09T00:00:00.000Z";
-			const planEnd = "2026-02-12T00:00:00.000Z";
-
-			await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Twice Daily Med Asymmetric",
-					packCount: 5,
-					blistersPerPack: 5,
-					pillsPerBlister: 10,
-					blisters: [
-						{ usage: 1, every: 1, start: intakeStart },
-						{ usage: 1, every: 1, start: intakeEvening },
-					],
-				},
-			});
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/medications/usage",
-				payload: {
-					startDate: planStart,
-					endDate: planEnd,
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			// Both morning and evening should have exactly 3 occurrences each
-			// (Feb 9, 10, 11) for a total of 6, regardless of current time
-			expect(data[0].plannerUsage).toBe(6);
-		});
-
-		it("should handle planner range starting before blister start", async () => {
-			// Blister starts on Feb 10, planner range starts Feb 9
-			// Should only count doses from Feb 10 onwards
-			const intakeMorning = "2026-02-10T07:00:00.000Z";
-			const intakeEvening = "2026-02-10T20:00:00.000Z";
-
-			await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Recent Start Med",
-					packCount: 1,
-					blistersPerPack: 1,
-					pillsPerBlister: 30,
-					blisters: [
-						{ usage: 1, every: 1, start: intakeMorning },
-						{ usage: 1, every: 1, start: intakeEvening },
-					],
-				},
-			});
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/medications/usage",
-				payload: {
-					startDate: "2026-02-09T00:00:00.000Z",
-					endDate: "2026-02-12T00:00:00.000Z",
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			// Only Feb 10 and Feb 11 have doses (blister starts Feb 10)
-			expect(data[0].plannerUsage).toBe(4); // 2 days × 2 intakes
-		});
-	});
-
-	// ---------------------------------------------------------------------------
-	// Dismiss Until (Clear Missed Doses)
-	// ---------------------------------------------------------------------------
-
-	describe("Dismiss Until functionality", () => {
-		it("should set dismissedUntil for multiple medications", async () => {
-			// Create two medications
-			const med1Res = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Med 1",
-					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
-				},
-			});
-			const med1Id = med1Res.json().id;
-
-			const med2Res = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Med 2",
-					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
-				},
-			});
-			const med2Id = med2Res.json().id;
-
-			// Set dismissedUntil for both
-			const dismissRes = await app.inject({
-				method: "POST",
-				url: "/medications/dismiss-until",
-				payload: {
-					medicationIds: [med1Id, med2Id],
-					until: "2025-01-15",
-				},
-			});
-
-			expect(dismissRes.statusCode).toBe(200);
-			expect(dismissRes.json().success).toBe(true);
-			expect(dismissRes.json().updatedCount).toBe(2);
-
-			// Verify dismissedUntil is set via GET
-			const medsRes = await app.inject({
-				method: "GET",
-				url: "/medications",
-			});
-			const meds = medsRes.json();
-			const med1 = meds.find((m: any) => m.id === med1Id);
-			const med2 = meds.find((m: any) => m.id === med2Id);
-
-			expect(med1.dismissedUntil).toBe("2025-01-15");
-			expect(med2.dismissedUntil).toBe("2025-01-15");
-		});
-
-		it("should clear dismissedUntil for a medication", async () => {
-			// Create medication
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Med to Clear",
-					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			// Set dismissedUntil
-			await app.inject({
-				method: "POST",
-				url: "/medications/dismiss-until",
-				payload: {
-					medicationIds: [medId],
-					until: "2025-01-20",
-				},
-			});
-
-			// Clear it
-			const clearRes = await app.inject({
-				method: "DELETE",
-				url: `/medications/${medId}/dismiss-until`,
-			});
-
-			expect(clearRes.statusCode).toBe(200);
-			expect(clearRes.json().success).toBe(true);
-
-			// Verify it's cleared
-			const medsRes = await app.inject({
-				method: "GET",
-				url: "/medications",
-			});
-			const med = medsRes.json().find((m: any) => m.id === medId);
-			expect(med.dismissedUntil).toBeNull();
-		});
-
-		it("should reject invalid date format", async () => {
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "Med",
-					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			const res = await app.inject({
-				method: "POST",
-				url: "/medications/dismiss-until",
-				payload: {
-					medicationIds: [medId],
-					until: "01-15-2025", // Wrong format
-				},
-			});
-
-			expect(res.statusCode).toBe(400);
-		});
-
-		it("should reject empty medicationIds array", async () => {
-			const res = await app.inject({
-				method: "POST",
-				url: "/medications/dismiss-until",
-				payload: {
-					medicationIds: [],
-					until: "2025-01-15",
-				},
-			});
-
-			expect(res.statusCode).toBe(400);
-		});
-
-		it("should not update medications belonging to other users", async () => {
-			// Create medication for user 999999999
-			const createRes = await app.inject({
-				method: "POST",
-				url: "/medications",
-				payload: {
-					name: "My Med",
-					blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
-				},
-			});
-			const medId = createRes.json().id;
-
-			// Try to dismiss a medication that doesn't exist (ID 99999)
-			const dismissRes = await app.inject({
-				method: "POST",
-				url: "/medications/dismiss-until",
-				payload: {
-					medicationIds: [99999],
-					until: "2025-01-15",
-				},
-			});
-
-			expect(dismissRes.statusCode).toBe(200);
-			expect(dismissRes.json().updatedCount).toBe(0); // Nothing updated
-
-			// Our med should still have no dismissedUntil
-			const medsRes = await app.inject({
-				method: "GET",
-				url: "/medications",
-			});
-			const med = medsRes.json().find((m: any) => m.id === medId);
-			expect(med.dismissedUntil).toBeNull();
-		});
   });
 });

backend/src/test/medications.test.ts

@@ -2,14 +2,14 @@
  * Tests for /medications API endpoints.
  * Tests CRUD operations for medications.
  */
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
 import {
   buildTestApp,
-	clearTestData,
   closeTestApp,
-	createTestMedication,
+  clearTestData,
   createTestUser,
-	type TestContext,
+  createTestMedication,
+  TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -20,7 +20,7 @@ async function registerMedicationRoutes(ctx: TestContext) {
   const { app, client } = ctx;
 
   // GET /medications - List all medications
-	app.get("/medications", async (_request, _reply) => {
+  app.get("/medications", async (request, reply) => {
     const userId = 1;
 
     const result = await client.execute({
@@ -664,7 +664,8 @@ describe("Medications API", () => {
 
       const [med] = response.json();
       // Total = (2 packs × 3 blisters × 10 pills) + 5 loose = 65
-			const totalPills = med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets;
+      const totalPills =
+        med.packCount * med.blistersPerPack * med.pillsPerBlister + med.looseTablets;
       expect(totalPills).toBe(65);
     });
   });

backend/src/test/planner.test.ts

@@ -1,16 +1,10 @@
-import type { Client } from "@libsql/client";
-import Fastify, { type FastifyInstance } from "fastify";
-import { afterAll, beforeAll, beforeEach, describe, expect, it, vi } from "vitest";
+import { describe, it, expect, beforeAll, afterAll, beforeEach, vi } from "vitest";
+import Fastify, { FastifyInstance } from "fastify";
+import { createClient, Client } from "@libsql/client";
+import { drizzle } from "drizzle-orm/libsql";
 
 // Create test database and mocks before anything else (hoisted)
-const {
-	testClient,
-	testDb,
-	mockSendMail,
-	mockSendShoutrrr,
-	mockUpdateReminderSentTime,
-	mockUpdateUserReminderSentTime,
-} = vi.hoisted(() => {
+const { testClient, testDb, mockSendMail, mockSendShoutrrr, mockUpdateReminderSentTime, mockUpdateUserReminderSentTime } = vi.hoisted(() => {
   const { createClient } = require("@libsql/client");
   const { drizzle } = require("drizzle-orm/libsql");
   const client = createClient({ url: ":memory:" });
@@ -63,7 +57,7 @@ vi.mock("../services/reminder-scheduler.js", () => ({
 
 // Mock sendShoutrrrNotification from settings
 vi.mock("../routes/settings.js", async (importOriginal) => {
-	const original = (await importOriginal()) as any;
+  const original = await importOriginal() as any;
   return {
     ...original,
     sendShoutrrrNotification: mockSendShoutrrr,
@@ -110,15 +104,9 @@ async function createSchema(client: Client) {
       expiry_warning_days integer NOT NULL DEFAULT 90,
       language text NOT NULL DEFAULT 'en',
       stock_calculation_mode text NOT NULL DEFAULT 'automatic',
-      share_stock_status integer NOT NULL DEFAULT 1,
       last_auto_email_sent text,
       last_notification_type text,
       last_notification_channel text,
-      last_reminder_med_name text,
-      last_reminder_taken_by text,
-      last_stock_reminder_sent text,
-      last_stock_reminder_channel text,
-      last_stock_reminder_med_names text,
       updated_at integer NOT NULL DEFAULT (strftime('%s','now')),
       FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE
     )`,
@@ -165,6 +153,21 @@ describe("Planner Routes", () => {
   });
 
   describe("POST /planner/send-email", () => {
+    it("should reject request with missing email", async () => {
+      const response = await app.inject({
+        method: "POST",
+        url: "/planner/send-email",
+        payload: {
+          from: "2025-01-01",
+          until: "2025-01-31",
+          rows: [{ medicationName: "Test", totalPills: 10, plannerUsage: 5, enough: true }],
+        },
+      });
+
+      expect(response.statusCode).toBe(400);
+      expect(response.json()).toEqual({ error: "Missing email or planner data" });
+    });
+
     it("should reject request with missing rows", async () => {
       const response = await app.inject({
         method: "POST",
@@ -178,16 +181,10 @@ describe("Planner Routes", () => {
       });
 
       expect(response.statusCode).toBe(400);
-			expect(response.json()).toEqual({ error: "Missing planner data" });
-		});
-
-		it("should return error when no notification channels configured", async () => {
-			// User settings exist but email/shoutrrr disabled
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 0, 0, 'en')`,
-				args: [999999999],
+      expect(response.json()).toEqual({ error: "Missing email or planner data" });
     });
 
+    it("should reject when SMTP is not configured", async () => {
       const response = await app.inject({
         method: "POST",
         url: "/planner/send-email",
@@ -212,7 +209,7 @@ describe("Planner Routes", () => {
       });
 
       expect(response.statusCode).toBe(400);
-			expect(response.json()).toEqual({ error: "No notification channels configured" });
+      expect(response.json()).toEqual({ error: "SMTP not configured" });
     });
 
     it("should send email successfully when SMTP is configured", async () => {
@@ -221,12 +218,6 @@ describe("Planner Routes", () => {
       process.env.SMTP_USER = "user@test.com";
       process.env.SMTP_PASS = "password";
 
-			// Enable email in user settings
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
-				args: [999999999],
-			});
-
       mockSendMail.mockResolvedValueOnce({ messageId: "123" });
 
       const response = await app.inject({
@@ -254,7 +245,7 @@ describe("Planner Routes", () => {
       });
 
       expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true, message: "Notification sent via email" });
+      expect(response.json()).toEqual({ success: true, message: "Email sent successfully" });
       expect(mockSendMail).toHaveBeenCalledTimes(1);
 
       // Cleanup
@@ -268,11 +259,6 @@ describe("Planner Routes", () => {
       process.env.SMTP_USER = "user@test.com";
       process.env.SMTP_PASS = "password";
 
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
-				args: [999999999],
-			});
-
       mockSendMail.mockResolvedValueOnce({ messageId: "123" });
 
       const response = await app.inject({
@@ -314,7 +300,7 @@ describe("Planner Routes", () => {
       
       // Check that HTML contains out of stock warning
       const mailCall = mockSendMail.mock.calls[0][0];
-			expect(mailCall.html).toContain("Empty");
+      expect(mailCall.html).toContain("Out of Stock");
       expect(mailCall.html).toContain("1 medication");
 
       delete process.env.SMTP_HOST;
@@ -327,11 +313,6 @@ describe("Planner Routes", () => {
       process.env.SMTP_USER = "user@test.com";
       process.env.SMTP_PASS = "password";
 
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
-				args: [999999999],
-			});
-
       mockSendMail.mockRejectedValueOnce(new Error("Connection refused"));
 
       const response = await app.inject({
@@ -358,7 +339,7 @@ describe("Planner Routes", () => {
       });
 
       expect(response.statusCode).toBe(500);
-			expect(response.json().error).toContain("Email:");
+      expect(response.json().error).toContain("Failed to send email");
       expect(response.json().error).toContain("Connection refused");
 
       delete process.env.SMTP_HOST;
@@ -371,12 +352,6 @@ describe("Planner Routes", () => {
       process.env.SMTP_USER = "user@test.com";
       process.env.SMTP_PASS = "password";
 
-			// User settings with German language
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'de')`,
-				args: [999999999],
-			});
-
       mockSendMail.mockResolvedValueOnce({ messageId: "123" });
 
       const response = await app.inject({
@@ -407,178 +382,12 @@ describe("Planner Routes", () => {
       
       // German date format should be used
       const mailCall = mockSendMail.mock.calls[0][0];
-			expect(mailCall.subject).toContain("Bestandsübersicht");
+      expect(mailCall.subject).toContain("Supply Overview");
 
       delete process.env.SMTP_HOST;
       delete process.env.SMTP_USER;
       delete process.env.SMTP_PASS;
     });
-
-		it("should send push notification when shoutrrr is enabled", async () => {
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
-				args: [999999999],
-			});
-
-			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/planner/send-email",
-				payload: {
-					email: "test@example.com",
-					from: "2025-01-01",
-					until: "2025-01-31",
-					rows: [
-						{
-							medicationId: 1,
-							medicationName: "Aspirin",
-							totalPills: 30,
-							plannerUsage: 10,
-							blisterSize: 10,
-							blistersNeeded: 1,
-							fullBlisters: 3,
-							loosePills: 0,
-							enough: true,
-						},
-					],
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true, message: "Notification sent via push" });
-			expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
-
-			// Verify push message contains medication info
-			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
-			expect(title).toContain("Supply Overview");
-			expect(message).toContain("Aspirin");
-		});
-
-		it("should send both email and push when both enabled", async () => {
-			process.env.SMTP_HOST = "smtp.test.com";
-			process.env.SMTP_USER = "user@test.com";
-			process.env.SMTP_PASS = "password";
-
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 1, 1, 'ntfy://localhost/test', 'en')`,
-				args: [999999999],
-			});
-
-			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
-			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/planner/send-email",
-				payload: {
-					email: "test@example.com",
-					from: "2025-01-01",
-					until: "2025-01-31",
-					rows: [
-						{
-							medicationId: 1,
-							medicationName: "Aspirin",
-							totalPills: 5,
-							plannerUsage: 30,
-							blisterSize: 10,
-							blistersNeeded: 3,
-							fullBlisters: 0,
-							loosePills: 5,
-							enough: false,
-						},
-					],
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ success: true, message: "Notification sent via email and push" });
-			expect(mockSendMail).toHaveBeenCalledTimes(1);
-			expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
-
-			// Verify push message contains out of stock info
-			const [_url, _title, message] = mockSendShoutrrr.mock.calls[0];
-			expect(message).toContain("Aspirin");
-			expect(message).toContain("Empty");
-
-			delete process.env.SMTP_HOST;
-			delete process.env.SMTP_USER;
-			delete process.env.SMTP_PASS;
-		});
-
-		it("should send push with German translations", async () => {
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'de')`,
-				args: [999999999],
-			});
-
-			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/planner/send-email",
-				payload: {
-					email: "test@example.com",
-					from: "2025-01-01",
-					until: "2025-01-31",
-					rows: [
-						{
-							medicationId: 1,
-							medicationName: "Aspirin",
-							totalPills: 5,
-							plannerUsage: 30,
-							blisterSize: 10,
-							blistersNeeded: 3,
-							fullBlisters: 0,
-							loosePills: 5,
-							enough: false,
-						},
-					],
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-
-			// Check German translations in push
-			const [_url, title] = mockSendShoutrrr.mock.calls[0];
-			expect(title).toContain("Bestandsübersicht");
-		});
-
-		it("should handle push error gracefully", async () => {
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
-				args: [999999999],
-			});
-
-			mockSendShoutrrr.mockResolvedValueOnce({ success: false, error: "Connection failed" });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/planner/send-email",
-				payload: {
-					email: "test@example.com",
-					from: "2025-01-01",
-					until: "2025-01-31",
-					rows: [
-						{
-							medicationId: 1,
-							medicationName: "Aspirin",
-							totalPills: 30,
-							plannerUsage: 10,
-							blisterSize: 10,
-							blistersNeeded: 1,
-							fullBlisters: 3,
-							loosePills: 0,
-							enough: true,
-						},
-					],
-				},
-			});
-
-			expect(response.statusCode).toBe(500);
-			expect(response.json().error).toContain("Push:");
-			expect(response.json().error).toContain("Connection failed");
-		});
   });
 
   describe("POST /reminder/send-email", () => {
@@ -621,7 +430,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -647,7 +458,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -686,10 +499,10 @@ describe("Planner Routes", () => {
 
       expect(response.statusCode).toBe(200);
       
-			// Check email contains empty warning
+      // Check email contains EMPTY warning
       const mailCall = mockSendMail.mock.calls[0][0];
       expect(mailCall.subject).toContain("Empty");
-			expect(mailCall.html).toContain("empty");
+      expect(mailCall.html).toContain("EMPTY");
 
       delete process.env.SMTP_HOST;
       delete process.env.SMTP_USER;
@@ -724,7 +537,7 @@ describe("Planner Routes", () => {
       
       const mailCall = mockSendMail.mock.calls[0][0];
       expect(mailCall.subject).toContain("Empty");
-			expect(mailCall.subject).toContain("Critical");
+      expect(mailCall.subject).toContain("Running Low");
 
       delete process.env.SMTP_HOST;
       delete process.env.SMTP_USER;
@@ -748,7 +561,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -773,7 +588,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -800,7 +617,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -827,7 +646,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -848,7 +669,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 0, daysLeft: 0, depletionDate: null }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 0, daysLeft: 0, depletionDate: null },
+          ],
         },
       });
 
@@ -856,7 +679,7 @@ describe("Planner Routes", () => {
       expect(mockSendShoutrrr).toHaveBeenCalledTimes(1);
       
       // Check German translations are used
-			const [title, _message] = mockSendShoutrrr.mock.calls[0].slice(1);
+      const [title, message] = mockSendShoutrrr.mock.calls[0].slice(1);
       expect(title).toContain("Leer");
     });
 
@@ -873,7 +696,9 @@ describe("Planner Routes", () => {
         url: "/reminder/send-email",
         payload: {
           email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
+          lowStock: [
+            { name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" },
+          ],
         },
       });
 
@@ -881,103 +706,5 @@ describe("Planner Routes", () => {
       expect(response.json().error).toContain("Push:");
       expect(response.json().error).toContain("Network error");
     });
-
-		it("should differentiate critical and low stock in push notification", async () => {
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
-				args: [999999999],
-			});
-
-			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/reminder/send-email",
-				payload: {
-					email: "test@example.com",
-					lowStock: [
-						{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03", isCritical: true },
-						{ name: "Ibuprofen", medsLeft: 49, daysLeft: 24, depletionDate: "2025-01-24", isCritical: false },
-					],
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-
-			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
-			// Title should contain both Critical and Low labels
-			expect(title).toContain("Critical");
-			expect(title).toContain("Low");
-			// Message should have separate sections
-			expect(message).toContain("Running critically low");
-			expect(message).toContain("Aspirin");
-			expect(message).toContain("Running low");
-			expect(message).toContain("Ibuprofen");
-		});
-
-		it("should differentiate critical and low stock in email", async () => {
-			process.env.SMTP_HOST = "smtp.test.com";
-			process.env.SMTP_USER = "user@test.com";
-			process.env.SMTP_PASS = "password";
-
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, language) VALUES (?, 1, 0, 'en')`,
-				args: [999999999],
-			});
-
-			mockSendMail.mockResolvedValueOnce({ messageId: "123" });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/reminder/send-email",
-				payload: {
-					email: "test@example.com",
-					lowStock: [
-						{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03", isCritical: true },
-						{ name: "Ibuprofen", medsLeft: 49, daysLeft: 24, depletionDate: "2025-01-24", isCritical: false },
-					],
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-
-			const mailCall = mockSendMail.mock.calls[0][0];
-			// Subject should contain both Critical and Low
-			expect(mailCall.subject).toContain("Critical");
-			expect(mailCall.subject).toContain("Low");
-			// HTML should have separate alert boxes
-			expect(mailCall.html).toContain("critically low");
-			expect(mailCall.html).toContain("running low");
-
-			delete process.env.SMTP_HOST;
-			delete process.env.SMTP_USER;
-			delete process.env.SMTP_PASS;
-		});
-
-		it("should label all meds as critical when isCritical not provided", async () => {
-			await testClient.execute({
-				sql: `INSERT INTO user_settings (user_id, email_enabled, shoutrrr_enabled, shoutrrr_url, language) VALUES (?, 0, 1, 'ntfy://localhost/test', 'en')`,
-				args: [999999999],
-			});
-
-			mockSendShoutrrr.mockResolvedValueOnce({ success: true });
-
-			const response = await app.inject({
-				method: "POST",
-				url: "/reminder/send-email",
-				payload: {
-					email: "test@example.com",
-					lowStock: [{ name: "Aspirin", medsLeft: 5, daysLeft: 3, depletionDate: "2025-01-03" }],
-				},
-			});
-
-			expect(response.statusCode).toBe(200);
-
-			const [_url, title, message] = mockSendShoutrrr.mock.calls[0];
-			// Should be treated as critical (backwards compat)
-			expect(title).toContain("Critical");
-			expect(title).not.toContain("Low");
-			expect(message).toContain("Running critically low");
-		});
   });
 });

backend/src/test/refills.test.ts

@@ -1,396 +0,0 @@
-/**
- * Tests for /medications/:id/refill and /medications/:id/refills API endpoints.
- * Tests adding refills to medication stock and retrieving refill history.
- */
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
-import {
-	buildTestApp,
-	clearTestData,
-	closeTestApp,
-	createTestMedication,
-	createTestUser,
-	type TestContext,
-} from "./setup.js";
-
-// Store userId at module level so routes can access it
-let currentUserId = 1;
-
-// =============================================================================
-// Route Registration
-// =============================================================================
-
-async function registerRefillRoutes(ctx: TestContext) {
-	const { app, client } = ctx;
-
-	// POST /medications/:id/refill - Add stock and record history
-	app.post<{ Params: { id: string }; Body: { packsAdded?: number; loosePillsAdded?: number } }>(
-		"/medications/:id/refill",
-		async (request, reply) => {
-			const userId = currentUserId;
-			const medId = parseInt(request.params.id, 10);
-			const { packsAdded = 0, loosePillsAdded = 0 } = request.body || {};
-
-			// Validate input
-			if (packsAdded < 0 || loosePillsAdded < 0) {
-				return reply.status(400).send({ error: "packsAdded and loosePillsAdded must be non-negative" });
-			}
-			if (packsAdded === 0 && loosePillsAdded === 0) {
-				return reply
-					.status(400)
-					.send({ error: "At least one of packsAdded or loosePillsAdded must be greater than 0" });
-			}
-
-			// Check medication exists and belongs to user
-			const medResult = await client.execute({
-				sql: `SELECT id, pack_count, loose_tablets, blisters_per_pack, pills_per_blister 
-              FROM medications WHERE id = ? AND user_id = ?`,
-				args: [medId, userId],
-			});
-
-			if (medResult.rows.length === 0) {
-				return reply.status(404).send({ error: "Medication not found" });
-			}
-
-			const med = medResult.rows[0];
-			const newPackCount = (med.pack_count as number) + packsAdded;
-			const newLooseTablets = (med.loose_tablets as number) + loosePillsAdded;
-			const pillsPerPack = (med.blisters_per_pack as number) * (med.pills_per_blister as number);
-			const totalPillsAdded = packsAdded * pillsPerPack + loosePillsAdded;
-
-			// Update medication stock
-			await client.execute({
-				sql: `UPDATE medications SET pack_count = ?, loose_tablets = ? WHERE id = ?`,
-				args: [newPackCount, newLooseTablets, medId],
-			});
-
-			// Record refill history
-			await client.execute({
-				sql: `INSERT INTO refill_history (medication_id, user_id, packs_added, loose_pills_added) 
-              VALUES (?, ?, ?, ?)`,
-				args: [medId, userId, packsAdded, loosePillsAdded],
-			});
-
-			return {
-				success: true,
-				pillsAdded: totalPillsAdded,
-				newPackCount,
-				newLooseTablets,
-			};
-		}
-	);
-
-	// GET /medications/:id/refills - Get refill history
-	app.get<{ Params: { id: string } }>("/medications/:id/refills", async (request, reply) => {
-		const userId = currentUserId;
-		const medId = parseInt(request.params.id, 10);
-
-		// Check medication exists and belongs to user
-		const medResult = await client.execute({
-			sql: `SELECT id FROM medications WHERE id = ? AND user_id = ?`,
-			args: [medId, userId],
-		});
-
-		if (medResult.rows.length === 0) {
-			return reply.status(404).send({ error: "Medication not found" });
-		}
-
-		// Get refill history, newest first
-		const refillResult = await client.execute({
-			sql: `SELECT id, packs_added, loose_pills_added, refill_date 
-            FROM refill_history 
-            WHERE medication_id = ? AND user_id = ?
-            ORDER BY refill_date DESC`,
-			args: [medId, userId],
-		});
-
-		return {
-			refills: refillResult.rows.map((r) => ({
-				id: r.id,
-				packsAdded: r.packs_added,
-				loosePillsAdded: r.loose_pills_added,
-				refillDate: r.refill_date,
-			})),
-		};
-	});
-}
-
-// =============================================================================
-// Tests
-// =============================================================================
-
-describe("Refill API", () => {
-	let ctx: TestContext;
-	let userId: number;
-	let medId: number;
-
-	beforeAll(async () => {
-		ctx = await buildTestApp();
-		await registerRefillRoutes(ctx);
-		await ctx.app.ready();
-	});
-
-	afterAll(async () => {
-		await closeTestApp(ctx);
-	});
-
-	beforeEach(async () => {
-		await clearTestData(ctx.client);
-		// Create test user
-		userId = await createTestUser(ctx.client, { username: "testuser" });
-		// Update the module-level userId so routes use the correct one
-		currentUserId = userId;
-		// Create a test medication with 1 pack (10 blisters × 10 pills = 100 pills/pack)
-		medId = await createTestMedication(ctx.client, {
-			userId,
-			name: "Test Med",
-			packCount: 1,
-			blistersPerPack: 10,
-			pillsPerBlister: 10,
-			looseTablets: 5,
-		});
-	});
-
-	// ---------------------------------------------------------------------------
-	// POST /medications/:id/refill
-	// ---------------------------------------------------------------------------
-
-	describe("POST /medications/:id/refill", () => {
-		it("should add packs to medication stock", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 2 },
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.success).toBe(true);
-			expect(data.pillsAdded).toBe(200); // 2 packs × 100 pills
-			expect(data.newPackCount).toBe(3); // 1 + 2
-
-			// Verify in database
-			const result = await ctx.client.execute({
-				sql: `SELECT pack_count FROM medications WHERE id = ?`,
-				args: [medId],
-			});
-			expect(result.rows[0].pack_count).toBe(3);
-		});
-
-		it("should add loose pills to medication stock", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { loosePillsAdded: 15 },
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.success).toBe(true);
-			expect(data.pillsAdded).toBe(15);
-			expect(data.newLooseTablets).toBe(20); // 5 + 15
-
-			// Verify in database
-			const result = await ctx.client.execute({
-				sql: `SELECT loose_tablets FROM medications WHERE id = ?`,
-				args: [medId],
-			});
-			expect(result.rows[0].loose_tablets).toBe(20);
-		});
-
-		it("should add both packs and loose pills", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 1, loosePillsAdded: 10 },
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.success).toBe(true);
-			expect(data.pillsAdded).toBe(110); // 1 pack (100) + 10 loose
-			expect(data.newPackCount).toBe(2);
-			expect(data.newLooseTablets).toBe(15);
-		});
-
-		it("should record refill in history", async () => {
-			await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 2, loosePillsAdded: 5 },
-			});
-
-			// Check history
-			const result = await ctx.client.execute({
-				sql: `SELECT packs_added, loose_pills_added FROM refill_history WHERE medication_id = ?`,
-				args: [medId],
-			});
-			expect(result.rows.length).toBe(1);
-			expect(result.rows[0].packs_added).toBe(2);
-			expect(result.rows[0].loose_pills_added).toBe(5);
-		});
-
-		it("should reject refill with zero amounts", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 0, loosePillsAdded: 0 },
-			});
-
-			expect(response.statusCode).toBe(400);
-			expect(response.json().error).toContain("At least one");
-		});
-
-		it("should reject refill with negative amounts", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: -1 },
-			});
-
-			expect(response.statusCode).toBe(400);
-			expect(response.json().error).toContain("non-negative");
-		});
-
-		it("should return 404 for non-existent medication", async () => {
-			const response = await ctx.app.inject({
-				method: "POST",
-				url: `/medications/99999/refill`,
-				payload: { packsAdded: 1 },
-			});
-
-			expect(response.statusCode).toBe(404);
-			expect(response.json().error).toBe("Medication not found");
-		});
-	});
-
-	// ---------------------------------------------------------------------------
-	// GET /medications/:id/refills
-	// ---------------------------------------------------------------------------
-
-	describe("GET /medications/:id/refills", () => {
-		it("should return empty array when no refills", async () => {
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: `/medications/${medId}/refills`,
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json()).toEqual({ refills: [] });
-		});
-
-		it("should return refill history newest first", async () => {
-			// Add two refills with different values so we can identify them
-			await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 1, loosePillsAdded: 0 },
-			});
-
-			// Increase delay to ensure different timestamps (SQLite datetime has second precision)
-			await new Promise((r) => setTimeout(r, 1100));
-
-			await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 0, loosePillsAdded: 20 },
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: `/medications/${medId}/refills`,
-			});
-
-			expect(response.statusCode).toBe(200);
-			const data = response.json();
-			expect(data.refills).toHaveLength(2);
-
-			// Newest first (loose pills - added second)
-			expect(data.refills[0].packsAdded).toBe(0);
-			expect(data.refills[0].loosePillsAdded).toBe(20);
-
-			// Older (packs - added first)
-			expect(data.refills[1].packsAdded).toBe(1);
-			expect(data.refills[1].loosePillsAdded).toBe(0);
-
-			// Each entry should have an id and refillDate
-			for (const refill of data.refills) {
-				expect(refill.id).toBeTypeOf("number");
-				expect(refill.refillDate).toBeTruthy();
-			}
-		});
-
-		it("should return 404 for non-existent medication", async () => {
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: `/medications/99999/refills`,
-			});
-
-			expect(response.statusCode).toBe(404);
-			expect(response.json().error).toBe("Medication not found");
-		});
-	});
-
-	// ---------------------------------------------------------------------------
-	// Cascade Delete Tests
-	// ---------------------------------------------------------------------------
-
-	describe("Cascade Delete", () => {
-		it("should delete refill history when medication is deleted", async () => {
-			// Add a refill
-			await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 1 },
-			});
-
-			// Verify refill exists
-			let result = await ctx.client.execute({
-				sql: `SELECT COUNT(*) as count FROM refill_history WHERE medication_id = ?`,
-				args: [medId],
-			});
-			expect(result.rows[0].count).toBe(1);
-
-			// Delete medication
-			await ctx.client.execute({
-				sql: `DELETE FROM medications WHERE id = ?`,
-				args: [medId],
-			});
-
-			// Verify refill history was cascade deleted
-			result = await ctx.client.execute({
-				sql: `SELECT COUNT(*) as count FROM refill_history WHERE medication_id = ?`,
-				args: [medId],
-			});
-			expect(result.rows[0].count).toBe(0);
-		});
-
-		it("should delete refill history when user is deleted", async () => {
-			// Add a refill
-			await ctx.app.inject({
-				method: "POST",
-				url: `/medications/${medId}/refill`,
-				payload: { packsAdded: 1 },
-			});
-
-			// Verify refill exists
-			let result = await ctx.client.execute({
-				sql: `SELECT COUNT(*) as count FROM refill_history WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(result.rows[0].count).toBe(1);
-
-			// Delete user
-			await ctx.client.execute({
-				sql: `DELETE FROM users WHERE id = ?`,
-				args: [userId],
-			});
-
-			// Verify refill history was cascade deleted
-			result = await ctx.client.execute({
-				sql: `SELECT COUNT(*) as count FROM refill_history WHERE user_id = ?`,
-				args: [userId],
-			});
-			expect(result.rows[0].count).toBe(0);
-		});
-	});
-});

backend/src/test/server.test.ts

@@ -1,20 +1,20 @@
-import { existsSync, rmSync } from "node:fs";
-import { tmpdir } from "node:os";
-import { resolve } from "node:path";
-import cookie from "@fastify/cookie";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import Fastify from "fastify";
 import cors from "@fastify/cors";
 import sensible from "@fastify/sensible";
-import Fastify from "fastify";
-import { afterEach, describe, expect, it } from "vitest";
+import cookie from "@fastify/cookie";
+import { mkdirSync, rmSync, existsSync } from "fs";
+import { resolve } from "path";
+import { tmpdir } from "os";
 
 // Import from utils to avoid index.ts import side effects (server start)
 import {
-	buildAppConfig,
+  parseCorsOrigins,
   buildBaseCookieOptions,
   buildRefreshCookieOptions,
+  buildAppConfig,
   ensureImagesDirectory,
   getJwtConfig,
-	parseCorsOrigins,
 } from "../utils/server-config.js";
 
 describe("Index.ts Utility Functions", () => {
@@ -247,7 +247,7 @@ describe("Server Bootstrap", () => {
       await app.register(cookie, { secret: "test-cookie-secret" });
       
       // Add a test route that sets a cookie
-			app.get("/set-cookie", async (_request, reply) => {
+      app.get("/set-cookie", async (request, reply) => {
         reply.setCookie("test", "value", { path: "/" });
         return { ok: true };
       });
@@ -317,10 +317,7 @@ describe("Server Bootstrap", () => {
   describe("CORS Origins Parsing", () => {
     it("should parse comma-separated origins", () => {
       const originsEnv = "http://localhost:5173,http://localhost:4173";
-			const origins = originsEnv
-				.split(",")
-				.map((o) => o.trim())
-				.filter(Boolean);
+      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
       
       expect(origins).toHaveLength(2);
       expect(origins[0]).toBe("http://localhost:5173");
@@ -329,10 +326,7 @@ describe("Server Bootstrap", () => {
 
     it("should handle single origin", () => {
       const originsEnv = "https://myapp.example.com";
-			const origins = originsEnv
-				.split(",")
-				.map((o) => o.trim())
-				.filter(Boolean);
+      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
       
       expect(origins).toHaveLength(1);
       expect(origins[0]).toBe("https://myapp.example.com");
@@ -340,20 +334,14 @@ describe("Server Bootstrap", () => {
 
     it("should filter out empty strings", () => {
       const originsEnv = "http://localhost:5173,,http://localhost:4173,";
-			const origins = originsEnv
-				.split(",")
-				.map((o) => o.trim())
-				.filter(Boolean);
+      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
       
       expect(origins).toHaveLength(2);
     });
 
     it("should trim whitespace", () => {
       const originsEnv = " http://localhost:5173 , http://localhost:4173 ";
-			const origins = originsEnv
-				.split(",")
-				.map((o) => o.trim())
-				.filter(Boolean);
+      const origins = originsEnv.split(",").map((o) => o.trim()).filter(Boolean);
       
       expect(origins).toEqual(["http://localhost:5173", "http://localhost:4173"]);
     });
@@ -410,7 +398,9 @@ describe("Server Bootstrap", () => {
       const app = Fastify({ logger: false });
       
       // Try to listen on an invalid port
-			await expect(app.listen({ port: -1, host: "127.0.0.1" })).rejects.toThrow();
+      await expect(
+        app.listen({ port: -1, host: "127.0.0.1" })
+      ).rejects.toThrow();
       
       await app.close();
     });
@@ -463,11 +453,11 @@ describe("Cookie Options", () => {
 describe("Rate Limiting", () => {
   it("should configure rate limit settings", () => {
     const rateLimitConfig = {
-			max: 300,
+      max: 100,
       timeWindow: "1 minute",
     };
     
-		expect(rateLimitConfig.max).toBe(300);
+    expect(rateLimitConfig.max).toBe(100);
     expect(rateLimitConfig.timeWindow).toBe("1 minute");
   });
 });

backend/src/test/services.test.ts

@@ -1,39 +1,33 @@
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { readFileSync, writeFileSync, existsSync, unlinkSync } from "fs";
+import { resolve } from "path";
+import { tmpdir } from "os";
 
 // Import actual utility functions from scheduler-utils
 import {
-	type Blister,
-	calculateDailyUsage,
-	calculateDepletionInfo,
-	cleanOldIntakeReminders,
-	createDefaultIntakeReminderState,
-	createDefaultReminderState,
+  getTimezone,
   formatInTimezone,
   getCurrentHourInTimezone,
-	getMsUntilNextCheck,
-	getNextScheduledTime,
-	getTimezone,
   getTodayInTimezone,
-	getTodaysIntakes,
-	getUpcomingIntakes,
-	type Intake,
+  getNextScheduledTime,
+  getMsUntilNextCheck,
   parseBlisters,
-	parseIntakeReminderState,
-	parseReminderState,
   parseTakenByJson,
+  calculateDailyUsage,
+  calculateDepletionInfo,
+  getUpcomingIntakes,
+  getTodaysIntakes,
+  createDefaultReminderState,
+  createDefaultIntakeReminderState,
+  parseReminderState,
+  parseIntakeReminderState,
+  cleanOldIntakeReminders,
+  type Blister,
+  type ReminderState,
+  type IntakeReminderState,
+  type UpcomingIntake,
 } from "../utils/scheduler-utils.js";
 
-// Helper to convert Blister to Intake for tests
-function blisterToIntake(blister: Blister, takenBy: string | null = null, intakeRemindersEnabled = false): Intake {
-	return {
-		usage: blister.usage,
-		every: blister.every,
-		start: blister.start,
-		takenBy,
-		intakeRemindersEnabled,
-	};
-}
-
 describe("Scheduler Utils - Timezone Functions", () => {
   let originalTz: string | undefined;
 
@@ -344,113 +338,61 @@ describe("Scheduler Utils - Depletion Calculation", () => {
 describe("Scheduler Utils - Upcoming Intakes", () => {
   describe("getUpcomingIntakes", () => {
     it("should return empty array when no intakes in window", () => {
-			// With parseLocalDateTime, times are treated as local - use same format for consistency
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" })];
-			// Set "now" to a time far from any scheduled intake (12:00 local)
-			const now = new Date(2025, 0, 1, 12, 0, 0).getTime();
+      const blisters: Blister[] = [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }];
+      // Set "now" to a time far from any scheduled intake
+      const now = new Date("2025-01-01T12:00:00.000Z").getTime();
       
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+      const result = getUpcomingIntakes("TestMed", blisters, 15, [], null, "en-US", "UTC", now);
       expect(result).toEqual([]);
     });
 
     it("should find intake within reminder window", () => {
-			// Schedule intake at 08:00 local, check at 07:45 local (15 minutes before)
-			const intakes: Intake[] = [blisterToIntake({ usage: 2, every: 1, start: "2025-01-01T08:00:00" }, "Alice")];
-			const now = new Date(2025, 0, 1, 7, 45, 0).getTime();
+      // Schedule intake at 08:00, check at 07:45 (15 minutes before)
+      const blisters: Blister[] = [{ usage: 2, every: 1, start: "2025-01-01T08:00:00.000Z" }];
+      const now = new Date("2025-01-01T07:45:00.000Z").getTime();
       
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], 500, "en-US", "UTC", now);
+      const result = getUpcomingIntakes("TestMed", blisters, 15, ["Alice"], 500, "en-US", "UTC", now);
       
       expect(result).toHaveLength(1);
       expect(result[0].medName).toBe("TestMed");
       expect(result[0].usage).toBe(2);
-			expect(result[0].takenBy).toBe("Alice");
+      expect(result[0].takenBy).toEqual(["Alice"]);
       expect(result[0].pillWeightMg).toBe(500);
     });
 
     it("should skip blisters with zero interval", () => {
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 0, start: "2025-01-01T08:00:00" })];
-			const now = new Date(2025, 0, 1, 7, 45, 0).getTime();
+      const blisters: Blister[] = [{ usage: 1, every: 0, start: "2025-01-01T08:00:00.000Z" }];
+      const now = new Date("2025-01-01T07:45:00.000Z").getTime();
       
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+      const result = getUpcomingIntakes("TestMed", blisters, 15, [], null, "en-US", "UTC", now);
       expect(result).toEqual([]);
     });
 
     it("should handle multiple blisters", () => {
-			// Two intakes at 08:00 and 08:01 local
-			const intakes: Intake[] = [
-				blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" }),
-				blisterToIntake({ usage: 2, every: 1, start: "2025-01-01T08:01:00" }),
+      // Two intakes at 08:00 and 08:01
+      const blisters: Blister[] = [
+        { usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" },
+        { usage: 2, every: 1, start: "2025-01-01T08:01:00.000Z" },
       ];
-			const now = new Date(2025, 0, 1, 7, 45, 0).getTime();
+      const now = new Date("2025-01-01T07:45:00.000Z").getTime();
       
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
+      const result = getUpcomingIntakes("TestMed", blisters, 15, [], null, "en-US", "UTC", now);
       
       // Both should be found as they're within the window
       expect(result.length).toBeGreaterThanOrEqual(1);
     });
-
-		it("should catch up missed advance reminder when notify window passed but intake still future", () => {
-			// Intake at 15:57, reminder 15 min before = 15:42
-			// Scheduler was down at 15:42, now running at 15:50 (intake still in future)
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T15:57:00" })];
-			// "now" = 15:50 local time on the same day — past the 15:42 notify window, but before 15:57 intake
-			const now = new Date(2025, 0, 1, 15, 50, 0).getTime();
-
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
-
-			// Should still return the intake as a catch-up advance reminder
-			expect(result).toHaveLength(1);
-			expect(result[0].medName).toBe("TestMed");
-			expect(result[0].usage).toBe(1);
-		});
-
-		it("should catch up missed advance reminder even 1 minute before intake", () => {
-			// Intake at 08:00, reminder at 07:45. Scheduler catches up at 07:59.
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" })];
-			const now = new Date(2025, 0, 1, 7, 59, 30).getTime();
-
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
-
-			expect(result).toHaveLength(1);
-		});
-
-		it("should not catch up for intakes already in the past", () => {
-			// Intake at 08:00, reminder at 07:45. Now = 08:05 (intake already past).
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00" })];
-			const now = new Date(2025, 0, 1, 8, 5, 0).getTime();
-
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
-
-			// Should NOT return — intake is past, handled by getTodaysIntakes instead
-			expect(result).toHaveLength(0);
-		});
-
-		it("should catch up for recurring intake on later day", () => {
-			// Intake started Jan 1 at 10:00, every 1 day. Now = Jan 3 at 09:50 (past notify, before intake)
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T10:00:00" })];
-			const now = new Date(2025, 0, 3, 9, 50, 0).getTime();
-
-			const result = getUpcomingIntakes("TestMed", intakes, 15, [], null, "en-US", "UTC", now);
-
-			// Should return today's occurrence via catch-up
-			expect(result).toHaveLength(1);
-			// The intake time should be Jan 3 at 10:00
-			expect(result[0].intakeTime.getHours()).toBe(10);
-			expect(result[0].intakeTime.getDate()).toBe(3);
-		});
   });
 
   describe("getTodaysIntakes", () => {
     it("should return all intakes for today", () => {
       // Daily medication at 08:00 starting yesterday
-			// With parseLocalDateTime, "08:00:00.000Z" is treated as 08:00 local time
-			const intakes: Intake[] = [blisterToIntake({ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" })];
+      const blisters: Blister[] = [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }];
       
-			// Get intakes for today (today's intake should be at 08:00 local)
-			const result = getTodaysIntakes("TestMed", intakes, [], null, "en-US", "UTC");
+      // Get intakes for 2025-01-02 (today's intake should be at 08:00)
+      const result = getTodaysIntakes("TestMed", blisters, [], null, "en-US", "UTC");
       
       expect(result.length).toBeGreaterThanOrEqual(1);
-			const intake = result.find((i) => i.intakeTime.getHours() === 8);
+      const intake = result.find(i => i.intakeTime.getUTCHours() === 8);
       expect(intake).toBeDefined();
       expect(intake?.medName).toBe("TestMed");
       expect(intake?.usage).toBe(1);
@@ -461,23 +403,18 @@ describe("Scheduler Utils - Upcoming Intakes", () => {
       const todayMidnight = new Date();
       todayMidnight.setUTCHours(0, 1, 0, 0);
       
-			const intakes: Intake[] = [
-				blisterToIntake(
-					{
+      const blisters: Blister[] = [{ 
         usage: 2, 
         every: 1, 
-						start: todayMidnight.toISOString(),
-					},
-					"Bob"
-				),
-			];
+        start: todayMidnight.toISOString() 
+      }];
       
-			const result = getTodaysIntakes("PastMed", intakes, [], 250, "en-US", "UTC");
+      const result = getTodaysIntakes("PastMed", blisters, ["Bob"], 250, "en-US", "UTC");
       
       expect(result).toHaveLength(1);
       expect(result[0].medName).toBe("PastMed");
       expect(result[0].usage).toBe(2);
-			expect(result[0].takenBy).toBe("Bob");
+      expect(result[0].takenBy).toEqual(["Bob"]);
       expect(result[0].pillWeightMg).toBe(250);
     });
 
@@ -489,12 +426,12 @@ describe("Scheduler Utils - Upcoming Intakes", () => {
       const evening = new Date(today);
       evening.setUTCHours(20, 0, 0, 0);
       
-			const intakes: Intake[] = [
-				blisterToIntake({ usage: 1, every: 1, start: morning.toISOString() }),
-				blisterToIntake({ usage: 1, every: 1, start: evening.toISOString() }),
+      const blisters: Blister[] = [
+        { usage: 1, every: 1, start: morning.toISOString() },
+        { usage: 1, every: 1, start: evening.toISOString() },
       ];
       
-			const result = getTodaysIntakes("MultiMed", intakes, [], null, "en-US", "UTC");
+      const result = getTodaysIntakes("MultiMed", blisters, [], null, "en-US", "UTC");
       
       expect(result.length).toBeGreaterThanOrEqual(2);
     });
@@ -504,40 +441,32 @@ describe("Scheduler Utils - Upcoming Intakes", () => {
       const lastWeek = new Date();
       lastWeek.setDate(lastWeek.getDate() - 7);
       
-			const intakes: Intake[] = [
-				blisterToIntake({
+      const blisters: Blister[] = [{ 
         usage: 1, 
         every: 7, 
-					start: lastWeek.toISOString(),
-				}),
-			];
+        start: lastWeek.toISOString() 
+      }];
       
       // If today is not the same day of week, should return empty
-			const result = getTodaysIntakes("WeeklyMed", intakes, [], null, "en-US", "UTC");
+      const result = getTodaysIntakes("WeeklyMed", blisters, [], null, "en-US", "UTC");
       
       // This test might return 0 or 1 depending on the day
       expect(Array.isArray(result)).toBe(true);
     });
 
-		it("should handle local time correctly (ignore Z suffix)", () => {
-			// With parseLocalDateTime, the Z suffix is ignored and time is treated as local server time
-			// The intakeTimeStr is then formatted for the target timezone (Europe/Berlin)
-			// So if server is in UTC, 14:00 server time becomes 15:00 Europe/Berlin time
-			const intakes: Intake[] = [
-				blisterToIntake({
+    it("should handle timezone correctly", () => {
+      // 23:00 in Europe/Berlin on a specific date
+      const blisters: Blister[] = [{ 
         usage: 1, 
         every: 1, 
-					start: "2025-01-01T14:00:00.000Z", // Treated as 14:00 server local time
-				}),
-			];
+        start: "2025-01-01T22:00:00.000Z" // 23:00 Berlin time
+      }];
       
-			const result = getTodaysIntakes("TzMed", intakes, [], null, "de-DE", "Europe/Berlin");
+      const result = getTodaysIntakes("TzMed", blisters, [], null, "de-DE", "Europe/Berlin");
       
       expect(Array.isArray(result)).toBe(true);
       if (result.length > 0) {
-				// The intakeTimeStr should be a valid time format (HH:MM)
-				// Exact value depends on server timezone vs target timezone offset
-				expect(result[0].intakeTimeStr).toMatch(/^\d{2}:\d{2}$/);
+        expect(result[0].intakeTimeStr).toContain("23:");
       }
     });
   });
@@ -603,8 +532,8 @@ describe("Scheduler Utils - State Management", () => {
       const json = JSON.stringify({ 
         reminders: { 
           "med1:123": { firstSentAt: 1000, lastSentAt: 2000, sendCount: 2 },
-					"med2:456": { firstSentAt: 3000, lastSentAt: 3000, sendCount: 1 },
-				},
+          "med2:456": { firstSentAt: 3000, lastSentAt: 3000, sendCount: 1 }
+        } 
       });
       
       const state = parseIntakeReminderState(json);
@@ -643,11 +572,7 @@ describe("Scheduler Utils - State Management", () => {
       yesterday.setDate(yesterday.getDate() - 1);
       
       const reminders = {
-				[`med1:${yesterday.getTime()}`]: {
-					firstSentAt: yesterday.getTime(),
-					lastSentAt: yesterday.getTime(),
-					sendCount: 1,
-				},
+        [`med1:${yesterday.getTime()}`]: { firstSentAt: yesterday.getTime(), lastSentAt: yesterday.getTime(), sendCount: 1 },
         [`med2:${today.getTime()}`]: { firstSentAt: today.getTime(), lastSentAt: today.getTime(), sendCount: 1 },
       };
       
@@ -683,7 +608,7 @@ describe("Scheduler Utils - State Management", () => {
     it("should handle malformed entries (invalid timestamp in key)", () => {
       const reminders = {
         "med1:invalid": { firstSentAt: 1000, lastSentAt: 1000, sendCount: 1 },
-				"med2:notanumber": { firstSentAt: 2000, lastSentAt: 2000, sendCount: 1 },
+        "med2:notanumber": { firstSentAt: 2000, lastSentAt: 2000, sendCount: 1 }
       };
       const cleaned = cleanOldIntakeReminders(reminders, "Europe/Berlin");
       // NaN from parseInt will cause these to be filtered out (invalid < todayStart)

backend/src/test/settings.test.ts

@@ -2,14 +2,14 @@
  * Tests for /settings API endpoints.
  * Tests user settings CRUD operations.
  */
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
 import {
   buildTestApp,
-	clearTestData,
   closeTestApp,
+  clearTestData,
   createTestUser,
   setUserSettings,
-	type TestContext,
+  TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -20,7 +20,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
   const { app, client } = ctx;
 
   // GET /settings - Get user settings
-	app.get("/settings", async (_request, _reply) => {
+  app.get("/settings", async (request, reply) => {
     const userId = 1;
 
     const result = await client.execute({
@@ -51,7 +51,6 @@ async function registerSettingsRoutes(ctx: TestContext) {
         expiryWarningDays: 90,
         language: "en",
         stockCalculationMode: "automatic",
-				shareStockStatus: true,
       };
     }
 
@@ -77,7 +76,6 @@ async function registerSettingsRoutes(ctx: TestContext) {
       expiryWarningDays: s.expiry_warning_days,
       language: s.language,
       stockCalculationMode: s.stock_calculation_mode,
-			shareStockStatus: Boolean(s.share_stock_status ?? 1),
     };
   });
 
@@ -104,7 +102,6 @@ async function registerSettingsRoutes(ctx: TestContext) {
       expiryWarningDays?: number;
       language?: string;
       stockCalculationMode?: "automatic" | "manual";
-			shareStockStatus?: boolean;
     };
   }>("/settings", async (request, reply) => {
     const userId = 1;
@@ -126,10 +123,7 @@ async function registerSettingsRoutes(ctx: TestContext) {
     if (body.stockCalculationMode && !["automatic", "manual"].includes(body.stockCalculationMode)) {
       return reply.status(400).send({ error: "stockCalculationMode must be 'automatic' or 'manual'" });
     }
-		if (
-			body.reminderRepeatIntervalMinutes !== undefined &&
-			(body.reminderRepeatIntervalMinutes < 5 || body.reminderRepeatIntervalMinutes > 480)
-		) {
+    if (body.reminderRepeatIntervalMinutes !== undefined && (body.reminderRepeatIntervalMinutes < 5 || body.reminderRepeatIntervalMinutes > 480)) {
       return reply.status(400).send({ error: "reminderRepeatIntervalMinutes must be between 5 and 480" });
     }
     if (body.maxNaggingReminders !== undefined && (body.maxNaggingReminders < 1 || body.maxNaggingReminders > 20)) {
@@ -153,8 +147,8 @@ async function registerSettingsRoutes(ctx: TestContext) {
           reminder_days_before, repeat_daily_reminders, skip_reminders_for_taken_doses,
           repeat_reminders_enabled, reminder_repeat_interval_minutes, max_nagging_reminders,
           low_stock_days, normal_stock_days, high_stock_days,
-          expiry_warning_days, language, stock_calculation_mode, share_stock_status
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+          expiry_warning_days, language, stock_calculation_mode
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
         args: [
           userId,
           body.emailEnabled ? 1 : 0,
@@ -177,7 +171,6 @@ async function registerSettingsRoutes(ctx: TestContext) {
           body.expiryWarningDays ?? 90,
           body.language || "en",
           body.stockCalculationMode || "automatic",
-					body.shareStockStatus !== false ? 1 : 0,
         ],
       });
     } else {
@@ -204,7 +197,6 @@ async function registerSettingsRoutes(ctx: TestContext) {
           expiry_warning_days = ?,
           language = ?,
           stock_calculation_mode = ?,
-          share_stock_status = ?,
           updated_at = strftime('%s','now')
         WHERE user_id = ?`,
         args: [
@@ -228,7 +220,6 @@ async function registerSettingsRoutes(ctx: TestContext) {
           body.expiryWarningDays ?? 90,
           body.language || "en",
           body.stockCalculationMode || "automatic",
-					body.shareStockStatus !== false ? 1 : 0,
           userId,
         ],
       });
@@ -548,64 +539,6 @@ describe("Settings API", () => {
     });
   });
 
-	// ---------------------------------------------------------------------------
-	// Share Stock Status
-	// ---------------------------------------------------------------------------
-
-	describe("Share Stock Status", () => {
-		it("should default to true (show stock on shared links)", async () => {
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: "/settings",
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json().shareStockStatus).toBe(true);
-		});
-
-		it("should disable share stock status", async () => {
-			const response = await ctx.app.inject({
-				method: "PUT",
-				url: "/settings",
-				payload: { shareStockStatus: false },
-			});
-
-			expect(response.statusCode).toBe(200);
-
-			const getResponse = await ctx.app.inject({
-				method: "GET",
-				url: "/settings",
-			});
-
-			expect(getResponse.json().shareStockStatus).toBe(false);
-		});
-
-		it("should re-enable share stock status", async () => {
-			// Disable first
-			await ctx.app.inject({
-				method: "PUT",
-				url: "/settings",
-				payload: { shareStockStatus: false },
-			});
-
-			// Re-enable
-			const response = await ctx.app.inject({
-				method: "PUT",
-				url: "/settings",
-				payload: { shareStockStatus: true },
-			});
-
-			expect(response.statusCode).toBe(200);
-
-			const getResponse = await ctx.app.inject({
-				method: "GET",
-				url: "/settings",
-			});
-
-			expect(getResponse.json().shareStockStatus).toBe(true);
-		});
-	});
-
   // ---------------------------------------------------------------------------
   // Repeat Reminders & Skip Reminders Settings
   // ---------------------------------------------------------------------------

backend/src/test/setup.ts

@@ -2,22 +2,15 @@
  * Test setup and utilities for MedAssist backend API tests.
  * Uses in-memory SQLite for isolation between test files.
  */
-
-import { dirname, resolve } from "node:path";
-import { fileURLToPath } from "node:url";
+import Fastify, { FastifyInstance } from "fastify";
 import cookie from "@fastify/cookie";
 import jwt from "@fastify/jwt";
-import fastifyMultipart from "@fastify/multipart";
 import sensible from "@fastify/sensible";
-import { type Client, createClient } from "@libsql/client";
+import fastifyMultipart from "@fastify/multipart";
+import { createClient, Client } from "@libsql/client";
 import { drizzle } from "drizzle-orm/libsql";
-import { migrate } from "drizzle-orm/libsql/migrator";
-import Fastify, { type FastifyInstance } from "fastify";
-
-// Get migrations folder path
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const migrationsFolder = resolve(__dirname, "../../drizzle");
+import { beforeAll, afterAll, beforeEach } from "vitest";
+import { getTableCreationSQL } from "../db/schema-sql.js";
 
 // Type for our test database
 export type TestDb = ReturnType<typeof drizzle>;
@@ -68,11 +61,14 @@ export async function buildTestApp(): Promise<TestContext> {
 }
 
 /**
- * Create test database schema using drizzle-kit migrations
+ * Create test database schema
  */
 async function runTestMigrations(client: Client): Promise<void> {
-	const db = drizzle(client);
-	await migrate(db, { migrationsFolder });
+  const tableCreations = getTableCreationSQL();
+
+  for (const sql of tableCreations) {
+    await client.execute(sql);
+  }
 }
 
 // =============================================================================
@@ -87,7 +83,10 @@ export interface CreateUserOptions {
 /**
  * Create a test user and return the ID
  */
-export async function createTestUser(client: Client, options: CreateUserOptions = {}): Promise<number> {
+export async function createTestUser(
+  client: Client,
+  options: CreateUserOptions = {}
+): Promise<number> {
   const { username = `user_${Date.now()}`, authProvider = "local" } = options;
 
   const result = await client.execute({
@@ -108,9 +107,6 @@ export interface CreateMedicationOptions {
   pillsPerBlister?: number;
   looseTablets?: number;
   pillWeightMg?: number;
-	expiryDate?: string | null;
-	notes?: string | null;
-	intakeRemindersEnabled?: boolean;
   /** Array of { usage, every, start } for each blister schedule */
   blisters?: Array<{ usage: number; every: number; start: string }>;
 }
@@ -118,7 +114,10 @@ export interface CreateMedicationOptions {
 /**
  * Create a test medication and return the ID
  */
-export async function createTestMedication(client: Client, options: CreateMedicationOptions): Promise<number> {
+export async function createTestMedication(
+  client: Client,
+  options: CreateMedicationOptions
+): Promise<number> {
   const {
     userId,
     name = "Test Medication",
@@ -129,9 +128,6 @@ export async function createTestMedication(client: Client, options: CreateMedica
     pillsPerBlister = 10,
     looseTablets = 0,
     pillWeightMg = null,
-		expiryDate = null,
-		notes = null,
-		intakeRemindersEnabled = false,
     blisters = [{ usage: 1, every: 1, start: new Date().toISOString() }],
   } = options;
 
@@ -145,8 +141,8 @@ export async function createTestMedication(client: Client, options: CreateMedica
     sql: `INSERT INTO medications (
       user_id, name, generic_name, taken_by_json,
       pack_count, blisters_per_pack, pills_per_blister, loose_tablets,
-      pill_weight_mg, usage_json, every_json, start_json, expiry_date, notes, intake_reminders_enabled
-    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`,
+      pill_weight_mg, usage_json, every_json, start_json
+    ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING id`,
     args: [
       userId,
       name,
@@ -160,9 +156,6 @@ export async function createTestMedication(client: Client, options: CreateMedica
       usageJson,
       everyJson,
       startJson,
-			expiryDate,
-			notes,
-			intakeRemindersEnabled ? 1 : 0,
     ],
   });
 
@@ -180,8 +173,17 @@ export interface CreateShareTokenOptions {
 /**
  * Create a test share token and return the token string
  */
-export async function createTestShareToken(client: Client, options: CreateShareTokenOptions): Promise<string> {
-	const { userId, takenBy, token = `test_token_${Date.now()}`, scheduleDays = 30, expiresAt = null } = options;
+export async function createTestShareToken(
+  client: Client,
+  options: CreateShareTokenOptions
+): Promise<string> {
+  const {
+    userId,
+    takenBy,
+    token = `test_token_${Date.now()}`,
+    scheduleDays = 30,
+    expiresAt = null,
+  } = options;
 
   await client.execute({
     sql: `INSERT INTO share_tokens (user_id, token, taken_by, schedule_days, expires_at)
@@ -202,8 +204,16 @@ export interface CreateDoseTrackingOptions {
 /**
  * Create a dose tracking record
  */
-export async function createTestDoseTracking(client: Client, options: CreateDoseTrackingOptions): Promise<void> {
-	const { userId, doseId, markedBy = null, takenAt = Math.floor(Date.now() / 1000) } = options;
+export async function createTestDoseTracking(
+  client: Client,
+  options: CreateDoseTrackingOptions
+): Promise<void> {
+  const {
+    userId,
+    doseId,
+    markedBy = null,
+    takenAt = Math.floor(Date.now() / 1000),
+  } = options;
 
   await client.execute({
     sql: `INSERT INTO dose_tracking (user_id, dose_id, marked_by, taken_at)
@@ -216,14 +226,16 @@ export interface UpdateUserSettingsOptions {
   userId: number;
   stockCalculationMode?: "automatic" | "manual";
   lowStockDays?: number;
-	shareStockStatus?: boolean;
 }
 
 /**
  * Create or update user settings
  */
-export async function setUserSettings(client: Client, options: UpdateUserSettingsOptions): Promise<void> {
-	const { userId, stockCalculationMode = "automatic", lowStockDays = 30, shareStockStatus } = options;
+export async function setUserSettings(
+  client: Client,
+  options: UpdateUserSettingsOptions
+): Promise<void> {
+  const { userId, stockCalculationMode = "automatic", lowStockDays = 30 } = options;
 
   // Check if settings exist
   const existing = await client.execute({
@@ -233,19 +245,13 @@ export async function setUserSettings(client: Client, options: UpdateUserSetting
 
   if (existing.rows.length > 0) {
     await client.execute({
-			sql: `UPDATE user_settings SET stock_calculation_mode = ?, low_stock_days = ?${shareStockStatus !== undefined ? ", share_stock_status = ?" : ""} WHERE user_id = ?`,
-			args:
-				shareStockStatus !== undefined
-					? [stockCalculationMode, lowStockDays, shareStockStatus ? 1 : 0, userId]
-					: [stockCalculationMode, lowStockDays, userId],
+      sql: `UPDATE user_settings SET stock_calculation_mode = ?, low_stock_days = ? WHERE user_id = ?`,
+      args: [stockCalculationMode, lowStockDays, userId],
     });
   } else {
     await client.execute({
-			sql: `INSERT INTO user_settings (user_id, stock_calculation_mode, low_stock_days${shareStockStatus !== undefined ? ", share_stock_status" : ""}) VALUES (?, ?, ?${shareStockStatus !== undefined ? ", ?" : ""})`,
-			args:
-				shareStockStatus !== undefined
-					? [userId, stockCalculationMode, lowStockDays, shareStockStatus ? 1 : 0]
-					: [userId, stockCalculationMode, lowStockDays],
+      sql: `INSERT INTO user_settings (user_id, stock_calculation_mode, low_stock_days) VALUES (?, ?, ?)`,
+      args: [userId, stockCalculationMode, lowStockDays],
     });
   }
 }
@@ -267,7 +273,6 @@ export async function closeTestApp(ctx: TestContext): Promise<void> {
  */
 export async function clearTestData(client: Client): Promise<void> {
   // Order matters due to foreign keys
-	await client.execute("DELETE FROM refill_history");
   await client.execute("DELETE FROM dose_tracking");
   await client.execute("DELETE FROM share_tokens");
   await client.execute("DELETE FROM refresh_tokens");

backend/src/test/share.test.ts

@@ -2,16 +2,15 @@
  * Tests for share link API endpoints.
  * Tests creating share tokens, accessing shared schedules, and marking doses via share links.
  */
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
 import {
   buildTestApp,
-	clearTestData,
   closeTestApp,
+  clearTestData,
+  createTestUser,
   createTestMedication,
   createTestShareToken,
-	createTestUser,
-	setUserSettings,
-	type TestContext,
+  TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -41,7 +40,7 @@ async function registerShareRoutes(ctx: TestContext) {
     });
 
     const hasMatchingMed = meds.rows.some((m) => {
-			const takenByList: string[] = JSON.parse((m.taken_by_json as string) || "[]");
+      const takenByList: string[] = JSON.parse(m.taken_by_json as string || "[]");
       return takenByList.includes(takenBy);
     });
 
@@ -104,13 +103,13 @@ async function registerShareRoutes(ctx: TestContext) {
 
     const medications = medsResult.rows
       .filter((m) => {
-				const takenByList: string[] = JSON.parse((m.taken_by_json as string) || "[]");
+        const takenByList: string[] = JSON.parse(m.taken_by_json as string || "[]");
         return takenByList.includes(share.taken_by as string);
       })
       .map((m) => {
-				const usageArr: number[] = JSON.parse((m.usage_json as string) || "[]");
-				const everyArr: number[] = JSON.parse((m.every_json as string) || "[]");
-				const startArr: string[] = JSON.parse((m.start_json as string) || "[]");
+        const usageArr: number[] = JSON.parse(m.usage_json as string || "[]");
+        const everyArr: number[] = JSON.parse(m.every_json as string || "[]");
+        const startArr: string[] = JSON.parse(m.start_json as string || "[]");
 
         return {
           id: m.id,
@@ -119,13 +118,15 @@ async function registerShareRoutes(ctx: TestContext) {
           pillWeightMg: m.pill_weight_mg,
           imageUrl: m.image_url,
           totalPills:
-						(m.pack_count as number) * (m.blisters_per_pack as number) * (m.pills_per_blister as number) +
+            (m.pack_count as number) *
+              (m.blisters_per_pack as number) *
+              (m.pills_per_blister as number) +
             (m.loose_tablets as number),
           packCount: m.pack_count,
           blistersPerPack: m.blisters_per_pack,
           looseTablets: m.loose_tablets,
           pillsPerBlister: m.pills_per_blister,
-					takenBy: JSON.parse((m.taken_by_json as string) || "[]"),
+          takenBy: JSON.parse(m.taken_by_json as string || "[]"),
           blisters: usageArr.map((usage, i) => ({
             usage,
             every: everyArr[i] || 1,
@@ -142,14 +143,6 @@ async function registerShareRoutes(ctx: TestContext) {
 
     const lowStockDays = settingsResult.rows.length > 0 ? (settingsResult.rows[0].low_stock_days as number) : 30;
 
-		// Get shareStockStatus setting
-		const shareStockResult = await client.execute({
-			sql: `SELECT share_stock_status FROM user_settings WHERE user_id = ?`,
-			args: [share.user_id],
-		});
-		const shareStockStatus =
-			shareStockResult.rows.length > 0 ? Boolean(shareStockResult.rows[0].share_stock_status ?? 1) : true;
-
     return {
       takenBy: share.taken_by,
       sharedBy: share.owner_username,
@@ -158,7 +151,6 @@ async function registerShareRoutes(ctx: TestContext) {
       stockThresholds: {
         lowStockDays,
       },
-			shareStockStatus,
     };
   });
 
@@ -192,7 +184,9 @@ async function registerShareRoutes(ctx: TestContext) {
   });
 
   // POST /share/:token/doses - Mark dose via share link
-	app.post<{ Params: { token: string }; Body: { doseId: string } }>("/share/:token/doses", async (request, reply) => {
+  app.post<{ Params: { token: string }; Body: { doseId: string } }>(
+    "/share/:token/doses",
+    async (request, reply) => {
       const { token } = request.params;
       const { doseId } = request.body || {};
 
@@ -228,10 +222,13 @@ async function registerShareRoutes(ctx: TestContext) {
       });
 
       return { success: true };
-	});
+    }
+  );
 
   // DELETE /share/:token/doses/:doseId - Unmark dose via share link
-	app.delete<{ Params: { token: string; doseId: string } }>("/share/:token/doses/:doseId", async (request, reply) => {
+  app.delete<{ Params: { token: string; doseId: string } }>(
+    "/share/:token/doses/:doseId",
+    async (request, reply) => {
       const { token, doseId } = request.params;
 
       const shareResult = await client.execute({
@@ -251,10 +248,11 @@ async function registerShareRoutes(ctx: TestContext) {
       });
 
       return { success: true };
-	});
+    }
+  );
 
   // GET /share/people - Get unique takenBy values
-	app.get("/share/people", async (_request, _reply) => {
+  app.get("/share/people", async (request, reply) => {
     const userId = 1;
 
     const result = await client.execute({
@@ -264,7 +262,7 @@ async function registerShareRoutes(ctx: TestContext) {
 
     const peopleSet = new Set<string>();
     for (const row of result.rows) {
-			const takenByList: string[] = JSON.parse((row.taken_by_json as string) || "[]");
+      const takenByList: string[] = JSON.parse(row.taken_by_json as string || "[]");
       takenByList.forEach((p) => peopleSet.add(p));
     }
 
@@ -431,41 +429,6 @@ describe("Share Link API", () => {
       expect(med.blisters).toHaveLength(1);
       expect(med.blisters[0].usage).toBe(1);
       expect(med.blisters[0].every).toBe(1);
-
-			// shareStockStatus should default to true
-			expect(data.shareStockStatus).toBe(true);
-		});
-
-		it("should respect shareStockStatus setting when disabled", async () => {
-			// Create medication
-			await createTestMedication(ctx.client, {
-				userId,
-				name: "TestMed",
-				takenBy: ["Daniel"],
-				packCount: 1,
-				blistersPerPack: 1,
-				pillsPerBlister: 10,
-				looseTablets: 0,
-				blisters: [{ usage: 1, every: 1, start: "2025-01-01T08:00:00.000Z" }],
-			});
-
-			// Set shareStockStatus to false
-			await setUserSettings(ctx.client, { userId, shareStockStatus: false });
-
-			// Create share token
-			const token = await createTestShareToken(ctx.client, {
-				userId,
-				takenBy: "Daniel",
-				scheduleDays: 30,
-			});
-
-			const response = await ctx.app.inject({
-				method: "GET",
-				url: `/share/${token}`,
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(response.json().shareStockStatus).toBe(false);
     });
 
     it("should return 404 for invalid token", async () => {

backend/src/test/stock-calculation.test.ts

@@ -2,16 +2,16 @@
  * Tests for stock calculation modes (automatic vs manual).
  * Tests the /medications/usage endpoint with different settings.
  */
-import { afterAll, beforeAll, beforeEach, describe, expect, it } from "vitest";
+import { describe, it, expect, beforeAll, afterAll, beforeEach } from "vitest";
 import {
   buildTestApp,
-	clearTestData,
   closeTestApp,
-	createTestDoseTracking,
-	createTestMedication,
+  clearTestData,
   createTestUser,
+  createTestMedication,
+  createTestDoseTracking,
   setUserSettings,
-	type TestContext,
+  TestContext,
 } from "./setup.js";
 
 // =============================================================================
@@ -22,7 +22,9 @@ async function registerUsageRoutes(ctx: TestContext) {
   const { app, client } = ctx;
 
   // POST /medications/usage - Calculate medication usage for a date range
-	app.post<{ Body: { startDate: string; endDate: string } }>("/medications/usage", async (request, reply) => {
+  app.post<{ Body: { startDate: string; endDate: string } }>(
+    "/medications/usage",
+    async (request, reply) => {
       const userId = 1;
       const { startDate, endDate } = request.body || {};
 
@@ -39,7 +41,9 @@ async function registerUsageRoutes(ctx: TestContext) {
         args: [userId],
       });
       const stockMode =
-			settingsResult.rows.length > 0 ? (settingsResult.rows[0].stock_calculation_mode as string) : "automatic";
+        settingsResult.rows.length > 0
+          ? (settingsResult.rows[0].stock_calculation_mode as string)
+          : "automatic";
 
       // Get all medications
       const medsResult = await client.execute({
@@ -51,7 +55,9 @@ async function registerUsageRoutes(ctx: TestContext) {
 
       for (const med of medsResult.rows) {
         const totalPills =
-				(med.pack_count as number) * (med.blisters_per_pack as number) * (med.pills_per_blister as number) +
+          (med.pack_count as number) *
+            (med.blisters_per_pack as number) *
+            (med.pills_per_blister as number) +
           (med.loose_tablets as number);
 
         const blisterSize = med.pills_per_blister as number;
@@ -71,7 +77,7 @@ async function registerUsageRoutes(ctx: TestContext) {
             const scheduleStart = new Date(startArr[i] || start);
 
             // Count doses from scheduleStart to end within the range
-					const current = new Date(scheduleStart);
+            let current = new Date(scheduleStart);
             while (current <= end) {
               if (current >= start) {
                 plannerUsage += usage;
@@ -86,7 +92,11 @@ async function registerUsageRoutes(ctx: TestContext) {
                   WHERE user_id = ? 
                   AND taken_at >= ? 
                   AND taken_at <= ?`,
-					args: [userId, Math.floor(start.getTime() / 1000), Math.floor(end.getTime() / 1000)],
+            args: [
+              userId,
+              Math.floor(start.getTime() / 1000),
+              Math.floor(end.getTime() / 1000),
+            ],
           });
 
           // Filter to doses for this medication
@@ -123,10 +133,11 @@ async function registerUsageRoutes(ctx: TestContext) {
       }
 
       return results;
-	});
+    }
+  );
 
   // GET /medications - List medications (for checking stock)
-	app.get("/medications", async (_request, _reply) => {
+  app.get("/medications", async (request, reply) => {
     const userId = 1;
 
     const result = await client.execute({
@@ -142,7 +153,9 @@ async function registerUsageRoutes(ctx: TestContext) {
       pillsPerBlister: m.pills_per_blister,
       looseTablets: m.loose_tablets,
       totalPills:
-				(m.pack_count as number) * (m.blisters_per_pack as number) * (m.pills_per_blister as number) +
+        (m.pack_count as number) *
+          (m.blisters_per_pack as number) *
+          (m.pills_per_blister as number) +
         (m.loose_tablets as number),
     }));
   });

backend/src/test/translations.test.ts

@@ -1,8 +1,8 @@
 /**
  * Tests for translations module
  */
-import { describe, expect, it } from "vitest";
-import { getDateLocale, getTranslations, type Language, t } from "../i18n/translations.js";
+import { describe, it, expect } from "vitest";
+import { getTranslations, t, getDateLocale, type Language } from "../i18n/translations.js";
 
 describe("Translations Module", () => {
   describe("getTranslations", () => {
@@ -69,8 +69,8 @@ describe("Translations Module", () => {
     });
 
     it("should replace multiple placeholders", () => {
-			const result = t("{count} {type} running critically low", { count: 3, type: "medications" });
-			expect(result).toBe("3 medications running critically low");
+      const result = t("{count} {type} running low", { count: 3, type: "medications" });
+      expect(result).toBe("3 medications running low");
     });
 
     it("should replace same placeholder multiple times", () => {
@@ -98,7 +98,7 @@ describe("Translations Module", () => {
       
       // Stock reminder subject
       const subject = t(translations.stockReminder.subject, { count: 3, s: "s" });
-			expect(subject).toBe("MedAssist-ng Auto-Reminder: 3 Medications Running Critically Low");
+      expect(subject).toBe("MedAssist-ng Auto-Reminder: 3 Medications Running Low");
       
       // Intake reminder description
       const description = t(translations.intakeReminder.description, { minutes: 30 });
@@ -113,7 +113,7 @@ describe("Translations Module", () => {
       const translations = getTranslations("de");
       
       const subject = t(translations.stockReminder.subject, { count: 2, e: "e" });
-			expect(subject).toBe("MedAssist-ng Auto-Erinnerung: 2 Medikamente kritisch niedrig");
+      expect(subject).toBe("MedAssist-ng Auto-Erinnerung: 2 Medikamente wird knapp");
       
       const takenBy = t(translations.intakeReminder.takenBy, { name: "Daniel" });
       expect(takenBy).toBe("für Daniel");

backend/src/utils/logger.ts

@@ -1,46 +0,0 @@
-/**
- * Simple startup logger that respects LOG_LEVEL environment variable.
- * Used for code that runs before Fastify is initialized (db/client.ts, migrations).
- * Once Fastify is running, use app.log instead.
- */
-
-const LOG_LEVELS: Record<string, number> = {
-	silent: 60,
-	fatal: 60,
-	error: 50,
-	warn: 40,
-	info: 30,
-	debug: 20,
-	trace: 10,
-};
-
-function getLevel(): number {
-	const envLevel = (process.env.LOG_LEVEL || "info").toLowerCase();
-	return LOG_LEVELS[envLevel] ?? LOG_LEVELS.info;
-}
-
-function shouldLog(level: string): boolean {
-	return LOG_LEVELS[level] >= getLevel();
-}
-
-export const log = {
-	debug(msg: string): void {
-		if (shouldLog("debug")) console.log(msg);
-	},
-	info(msg: string): void {
-		if (shouldLog("info")) console.log(msg);
-	},
-	warn(msg: string): void {
-		if (shouldLog("warn")) console.warn(msg);
-	},
-	error(msg: string): void {
-		if (shouldLog("error")) console.error(msg);
-	},
-};
-
-/** Logger interface for services that receive a logger from the caller */
-export type ServiceLogger = {
-	info: (msg: string) => void;
-	debug: (msg: string) => void;
-	error: (msg: string) => void;
-};

backend/src/utils/scheduler-utils.ts

@@ -5,18 +5,8 @@
 
 import { getDateLocale, type Language } from "../i18n/translations.js";
 
-// Legacy type - individual blister schedule (DEPRECATED: use Intake instead)
 export type Blister = { usage: number; every: number; start: string };
 
-// New unified intake type with per-intake takenBy
-export type Intake = {
-	usage: number;
-	every: number;
-	start: string;
-	takenBy: string | null; // Person taking this specific intake (null = use medication-level takenBy)
-	intakeRemindersEnabled: boolean;
-};
-
 // =============================================================================
 // Timezone utilities
 // =============================================================================
@@ -34,7 +24,7 @@ export function formatInTimezone(date: Date, tz?: string): string {
     month: "2-digit",
     year: "numeric",
     hour: "2-digit",
-		minute: "2-digit",
+    minute: "2-digit"
   });
 }
 
@@ -44,7 +34,7 @@ export function getCurrentHourInTimezone(tz?: string): number {
   const timeStr = now.toLocaleString("en-US", { 
     timeZone: tz ?? getTimezone(), 
     hour: "numeric", 
-		hour12: false,
+    hour12: false 
   });
   return parseInt(timeStr, 10);
 }
@@ -69,11 +59,11 @@ export function getNextScheduledTime(reminderHour: number, tz?: string): Date {
     day: "2-digit",
     hour: "2-digit",
     minute: "2-digit",
-		hour12: false,
+    hour12: false
   });
   
   const parts = formatter.formatToParts(now);
-	const getPart = (type: string) => parts.find((p) => p.type === type)?.value || "0";
+  const getPart = (type: string) => parts.find(p => p.type === type)?.value || "0";
   
   const currentHour = parseInt(getPart("hour"), 10);
   const currentMinute = parseInt(getPart("minute"), 10);
@@ -94,7 +84,7 @@ export function getNextScheduledTime(reminderHour: number, tz?: string): Date {
     timeZone: timezone,
     year: "numeric",
     month: "2-digit",
-		day: "2-digit",
+    day: "2-digit"
   });
   const [targetYear, targetMonth, targetDay] = targetFormatter.format(targetDate).split("-").map(Number);
   
@@ -106,7 +96,7 @@ export function getNextScheduledTime(reminderHour: number, tz?: string): Date {
   const checkFormatter = new Intl.DateTimeFormat("en-US", {
     timeZone: timezone,
     hour: "2-digit",
-		hour12: false,
+    hour12: false
   });
   
   // Adjust based on the difference
@@ -129,35 +119,7 @@ export function getMsUntilNextCheck(reminderHour: number, tz?: string): number {
 // Blister/medication parsing utilities
 // =============================================================================
 
-/**
- * Parse an ISO datetime string to local timestamp.
- * Extracts date/time components directly from the string to avoid
- * timezone conversion issues with Z suffix.
- *
- * "2026-01-23T20:55:00" → treated as local time 20:55
- * "2026-01-23T20:55:00.000Z" → also treated as local time 20:55 (Z ignored)
- */
-export function parseLocalDateTime(isoString: string): Date {
-	// Extract components: YYYY-MM-DDTHH:MM:SS (ignore Z and milliseconds)
-	const match = isoString.match(/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):?(\d{2})?/);
-	if (!match) {
-		// Fallback to Date parsing if format doesn't match
-		return new Date(isoString);
-	}
-
-	const [, year, month, day, hour, minute, second] = match;
-	// Create date using local time interpretation (no UTC conversion)
-	return new Date(
-		parseInt(year, 10),
-		parseInt(month, 10) - 1, // Month is 0-indexed
-		parseInt(day, 10),
-		parseInt(hour, 10),
-		parseInt(minute, 10),
-		parseInt(second ?? "0", 10)
-	);
-}
-
-/** Parse blister schedules from JSON columns (DEPRECATED: use parseIntakesJson instead) */
+/** Parse blister schedules from JSON columns */
 export function parseBlisters(row: { usageJson: string; everyJson: string; startJson: string }): Blister[] {
   try {
     const usage = JSON.parse(row.usageJson) as number[];
@@ -174,59 +136,6 @@ export function parseBlisters(row: { usageJson: string; everyJson: string; start
   }
 }
 
-/**
- * Parse intakes from the new unified intakesJson format.
- * Falls back to legacy parallel arrays if intakesJson is empty.
- * @param intakesJson - The new unified JSON string
- * @param legacyRow - Optional legacy row with usageJson, everyJson, startJson for fallback
- * @param medicationIntakeRemindersEnabled - Medication-level intakeRemindersEnabled (fallback for legacy)
- */
-export function parseIntakesJson(
-	intakesJson: string | null | undefined,
-	legacyRow?: { usageJson: string; everyJson: string; startJson: string },
-	medicationIntakeRemindersEnabled?: boolean
-): Intake[] {
-	// Try new format first
-	if (intakesJson) {
-		try {
-			const parsed = JSON.parse(intakesJson);
-			if (Array.isArray(parsed) && parsed.length > 0) {
-				return parsed.map((intake: any) => ({
-					usage: typeof intake.usage === "number" ? intake.usage : 0,
-					every: typeof intake.every === "number" ? intake.every : 1,
-					start: typeof intake.start === "string" ? intake.start : new Date().toISOString(),
-					takenBy: typeof intake.takenBy === "string" && intake.takenBy.trim() ? intake.takenBy.trim() : null,
-					intakeRemindersEnabled:
-						typeof intake.intakeRemindersEnabled === "boolean" ? intake.intakeRemindersEnabled : false,
-				}));
-			}
-		} catch {
-			// Fall through to legacy parsing
-		}
-	}
-
-	// Fallback to legacy parallel arrays
-	if (legacyRow) {
-		const blisters = parseBlisters(legacyRow);
-		return blisters.map((b) => ({
-			usage: b.usage,
-			every: b.every,
-			start: b.start,
-			takenBy: null, // Legacy format has no per-intake takenBy
-			intakeRemindersEnabled: medicationIntakeRemindersEnabled ?? false,
-		}));
-	}
-
-	return [];
-}
-
-/**
- * Convert intakes to legacy blister format (for backward compatibility)
- */
-export function intakesToBlisters(intakes: Intake[]): Blister[] {
-	return intakes.map((i) => ({ usage: i.usage, every: i.every, start: i.start }));
-}
-
 /** Parse takenByJson to array of strings */
 export function parseTakenByJson(takenByJson: string | null | undefined): string[] {
   if (!takenByJson) return [];
@@ -238,28 +147,6 @@ export function parseTakenByJson(takenByJson: string | null | undefined): string
   }
 }
 
-/**
- * Get all unique takenBy values from both medication-level and intake-level.
- * Used for filtering and sharing functionality.
- */
-export function getAllTakenByForMedication(medicationTakenBy: string[], intakes: Intake[]): string[] {
-	const allPeople = new Set<string>(medicationTakenBy);
-	for (const intake of intakes) {
-		if (intake.takenBy) {
-			allPeople.add(intake.takenBy);
-		}
-	}
-	return Array.from(allPeople);
-}
-
-/**
- * Check if a person takes this medication (either via medication-level or intake-level takenBy).
- */
-export function personTakesMedication(person: string, medicationTakenBy: string[], intakes: Intake[]): boolean {
-	if (medicationTakenBy.includes(person)) return true;
-	return intakes.some((intake) => intake.takenBy === person);
-}
-
 // =============================================================================
 // Stock calculation utilities
 // =============================================================================
@@ -294,30 +181,24 @@ export function calculateDepletionInfo(
 
 export type UpcomingIntake = {
   medName: string;
-	medicationId?: number;
-	blisterIndex?: number;
   usage: number;
   intakeTime: Date;
   intakeTimeStr: string;
-	takenBy: string | null; // Single person for this intake (null = no specific person)
+  takenBy: string[];
   pillWeightMg: number | null;
-	doseUnit?: string;
 };
 
 /** 
  * Get all intakes for today (past and future) - used for repeat reminders.
  * Returns all intakes scheduled for today in user's timezone.
- * Now uses per-intake takenBy instead of medication-level.
  */
 export function getTodaysIntakes(
   medName: string, 
-	intakes: Intake[],
-	medicationTakenBy: string[], // Medication-level takenBy as fallback
+  blisters: Blister[], 
+  takenBy: string[], 
   pillWeightMg: number | null, 
   locale: string,
-	tz?: string,
-	medicationId?: number,
-	doseUnit?: string
+  tz?: string
 ): UpcomingIntake[] {
   const timezone = tz ?? getTimezone();
   const now = new Date();
@@ -329,19 +210,14 @@ export function getTodaysIntakes(
   const todayEnd = new Date(now.toLocaleString("en-US", { timeZone: timezone }));
   todayEnd.setHours(23, 59, 59, 999);
   
-	const result: UpcomingIntake[] = [];
+  const intakes: UpcomingIntake[] = [];
   
-	for (let blisterIdx = 0; blisterIdx < intakes.length; blisterIdx++) {
-		const intake = intakes[blisterIdx];
-		const startTime = parseLocalDateTime(intake.start).getTime();
-		const intervalMs = intake.every * 24 * 60 * 60 * 1000;
+  for (const blister of blisters) {
+    const startTime = new Date(blister.start).getTime();
+    const intervalMs = blister.every * 24 * 60 * 60 * 1000;
     
     if (intervalMs <= 0) continue;
     
-		// Determine takenBy for this intake
-		// If intake has its own takenBy, use it; otherwise null (no specific person)
-		const effectiveTakenBy = intake.takenBy || null;
-
     // Find all occurrences that fall within today
     let currentTime = startTime;
     
@@ -356,65 +232,56 @@ export function getTodaysIntakes(
     while (currentTime <= todayEnd.getTime()) {
       if (currentTime >= todayStart.getTime()) {
         const intakeDate = new Date(currentTime);
-				result.push({
+        intakes.push({
           medName,
-					medicationId,
-					blisterIndex: blisterIdx,
-					usage: intake.usage,
+          usage: blister.usage,
           intakeTime: intakeDate,
           intakeTimeStr: intakeDate.toLocaleTimeString(locale, { 
             hour: "2-digit", 
             minute: "2-digit",
-						timeZone: timezone,
+            timeZone: timezone
           }),
-					takenBy: effectiveTakenBy,
+          takenBy,
           pillWeightMg,
-					doseUnit,
         });
       }
       currentTime += intervalMs;
     }
   }
   
-	return result;
+  return intakes;
 }
 
 /** 
  * Get upcoming intakes that fall within the reminder window.
  * Returns intakes that should be notified about right now.
- * Now uses per-intake takenBy instead of medication-level.
  */
 export function getUpcomingIntakes(
   medName: string, 
-	intakes: Intake[],
+  blisters: Blister[], 
   minutesBefore: number, 
-	medicationTakenBy: string[], // Medication-level takenBy as fallback
+  takenBy: string[], 
   pillWeightMg: number | null, 
   locale: string,
   tz?: string,
-	nowOverride?: number,
-	medicationId?: number,
-	doseUnit?: string
+  nowOverride?: number
 ): UpcomingIntake[] {
   const now = nowOverride ?? Date.now();
   const timezone = tz ?? getTimezone();
   
-	// Get the current minute (truncated to minute boundary for precise matching)
-	const currentMinuteStart = Math.floor(now / 60000) * 60000;
-	const currentMinuteEnd = currentMinuteStart + 60000;
+  // Window to detect if "now" is the right time to send reminder
+  // We check if the notify time (intake - minutesBefore) falls within current minute ±1
+  const windowStart = now - 2 * 60 * 1000; // 2 minutes ago (catch slightly late checks)
+  const windowEnd = now + 1 * 60 * 1000; // 1 minute from now
   
   const upcoming: UpcomingIntake[] = [];
   
-	for (let blisterIdx = 0; blisterIdx < intakes.length; blisterIdx++) {
-		const intake = intakes[blisterIdx];
-		const startTime = parseLocalDateTime(intake.start).getTime();
-		const intervalMs = intake.every * 24 * 60 * 60 * 1000;
+  for (const blister of blisters) {
+    const startTime = new Date(blister.start).getTime();
+    const intervalMs = blister.every * 24 * 60 * 60 * 1000;
     
     if (intervalMs <= 0) continue;
     
-		// Determine takenBy for this intake
-		const effectiveTakenBy = intake.takenBy || null;
-
     // Find the next scheduled intake time (could be today or in the future)
     let nextTime = startTime;
     
@@ -428,14 +295,10 @@ export function getUpcomingIntakes(
       // And the next occurrence
       const nextOccurrence = startTime + (intervals + 1) * intervalMs;
       
-			// If today's occurrence notification time falls in current minute and intake hasn't happened
+      // If today's occurrence is within the reminder window, use it
+      // (intake hasn't happened yet, we should remind)
       const currentNotifyTime = currentOccurrence - minutesBefore * 60 * 1000;
-			if (currentNotifyTime >= currentMinuteStart && currentOccurrence > now) {
-				nextTime = currentOccurrence;
-			} else if (currentNotifyTime < currentMinuteStart && currentOccurrence > now) {
-				// CATCH-UP: The notify window was missed (e.g. due to system sleep/restart)
-				// but the intake time is still in the future — include it so the advance
-				// reminder can still be sent rather than falling into a dead zone.
+      if (currentNotifyTime >= windowStart && currentOccurrence > now) {
         nextTime = currentOccurrence;
       } else {
         nextTime = nextOccurrence;
@@ -445,30 +308,19 @@ export function getUpcomingIntakes(
     // Calculate when we should notify for this intake
     const notifyTime = nextTime - minutesBefore * 60 * 1000;
     
-		// Match if:
-		// 1. notifyTime falls within the current minute (normal case), OR
-		// 2. notifyTime is in the past but intakeTime is still in the future (catch-up
-		//    for missed advance reminder window — e.g. scheduler was down during the
-		//    exact notification minute due to system sleep, restart, or heavy load)
-		const isInCurrentMinute = notifyTime >= currentMinuteStart && notifyTime < currentMinuteEnd;
-		const isMissedButStillUpcoming = notifyTime < currentMinuteStart && nextTime > now;
-
-		if (isInCurrentMinute || isMissedButStillUpcoming) {
+    if (notifyTime >= windowStart && notifyTime <= windowEnd) {
       const intakeDate = new Date(nextTime);
       upcoming.push({
         medName,
-				medicationId,
-				blisterIndex: blisterIdx,
-				usage: intake.usage,
+        usage: blister.usage,
         intakeTime: intakeDate,
         intakeTimeStr: intakeDate.toLocaleTimeString(locale, { 
           hour: "2-digit", 
           minute: "2-digit",
-					timeZone: timezone,
+          timeZone: timezone
         }),
-				takenBy: effectiveTakenBy,
+        takenBy,
         pillWeightMg,
-				doseUnit,
       });
     }
   }
@@ -492,8 +344,7 @@ export type ReminderState = {
 export type IntakeReminderEntry = {
   firstSentAt: number;   // Timestamp when first reminder was sent
   lastSentAt: number;    // Timestamp when last reminder was sent  
-	sendCount: number; // How many times NAGGING reminder was sent (not counting advance)
-	advanceSent?: boolean; // Whether the advance reminder (15 min before) was sent
+  sendCount: number;     // How many times reminder was sent
 };
 
 export type IntakeReminderState = {
@@ -564,10 +415,7 @@ export function parseIntakeReminderState(json: string): IntakeReminderState {
 
 /** Clean up old intake reminder entries (older than given milliseconds) */
 /** Clean up old intake reminder entries (using timezone-aware day check) */
-export function cleanOldIntakeReminders(
-	reminders: Record<string, IntakeReminderEntry>,
-	tz: string
-): Record<string, IntakeReminderEntry> {
+export function cleanOldIntakeReminders(reminders: Record<string, IntakeReminderEntry>, tz: string): Record<string, IntakeReminderEntry> {
   // Get start of today in user's timezone
   const now = new Date();
   const todayStart = new Date(now.toLocaleString("en-US", { timeZone: tz }));

backend/src/utils/server-config.ts

@@ -3,10 +3,9 @@
  * Exported separately to allow testing without triggering server start.
  */
 
-import { existsSync, mkdirSync } from "node:fs";
-import { resolve } from "node:path";
+import { existsSync, mkdirSync } from "fs";
+import { resolve } from "path";
 import type { CookieSerializeOptions } from "@fastify/cookie";
-import { getDataDir } from "../db/db-utils.js";
 
 /**
  * Parse comma-separated CORS origins string
@@ -21,7 +20,10 @@ export function parseCorsOrigins(originsStr: string): string[] {
 /**
  * Build base cookie options for access token
  */
-export function buildBaseCookieOptions(accessTtlMinutes: number, isProduction: boolean): CookieSerializeOptions {
+export function buildBaseCookieOptions(
+  accessTtlMinutes: number,
+  isProduction: boolean
+): CookieSerializeOptions {
   return {
     httpOnly: true,
     secure: isProduction,
@@ -65,8 +67,14 @@ export interface AppConfig {
 }
 
 export function buildAppConfig(options: AppConfigOptions): AppConfig {
-	const cookieOptions = buildBaseCookieOptions(options.accessTtlMinutes, options.isProduction);
-	const refreshCookieOptions = buildRefreshCookieOptions(cookieOptions, options.refreshTtlDays);
+  const cookieOptions = buildBaseCookieOptions(
+    options.accessTtlMinutes,
+    options.isProduction
+  );
+  const refreshCookieOptions = buildRefreshCookieOptions(
+    cookieOptions,
+    options.refreshTtlDays
+  );
 
   return {
     accessSecret: options.jwtSecret || "",
@@ -82,7 +90,8 @@ export function buildAppConfig(options: AppConfigOptions): AppConfig {
  * Ensure images directory exists
  */
 export function ensureImagesDirectory(cwd?: string): string {
-	const imagesDir = resolve(getDataDir(cwd), "images");
+  const basePath = cwd || process.cwd();
+  const imagesDir = resolve(basePath, "data/images");
   if (!existsSync(imagesDir)) {
     mkdirSync(imagesDir, { recursive: true });
   }
@@ -101,7 +110,10 @@ export interface JwtConfig {
 }
 
 export function getJwtConfig(authEnabled: boolean, jwtSecret?: string): JwtConfig {
-	const effectiveSecret = authEnabled && jwtSecret ? jwtSecret : "auth-disabled-no-secret-needed";
+  const effectiveSecret =
+    authEnabled && jwtSecret
+      ? jwtSecret
+      : "auth-disabled-no-secret-needed";
 
   return {
     secret: effectiveSecret,

biome.json

@@ -1,54 +0,0 @@
-{
-	"$schema": "https://biomejs.dev/schemas/2.3.12/schema.json",
-	"assist": { "actions": { "source": { "organizeImports": "on" } } },
-	"files": {
-		"includes": ["backend/src/**/*.ts", "frontend/src/**/*.ts", "frontend/src/**/*.tsx", "frontend/src/**/*.css", "frontend/e2e/**/*.ts", "frontend/playwright.config.ts"]
-	},
-	"linter": {
-		"enabled": true,
-		"rules": {
-			"recommended": true,
-			"complexity": {
-				"noForEach": "off"
-			},
-			"suspicious": {
-				"noExplicitAny": "warn",
-				"useIterableCallbackReturn": "off",
-				"noImplicitAnyLet": "warn",
-				"noArrayIndexKey": "warn",
-				"noAssignInExpressions": "off"
-			},
-			"style": {
-				"noNonNullAssertion": "off",
-				"useConst": "error",
-				"noParameterAssign": "off"
-			},
-			"correctness": {
-				"noUnusedVariables": "warn",
-				"noUnusedImports": "warn",
-				"noUnusedFunctionParameters": "warn",
-				"useExhaustiveDependencies": "warn"
-			},
-			"a11y": {
-				"useKeyWithClickEvents": "warn",
-				"noSvgWithoutTitle": "off",
-				"noStaticElementInteractions": "off",
-				"useButtonType": "off",
-				"noLabelWithoutControl": "warn"
-			}
-		}
-	},
-	"formatter": {
-		"enabled": true,
-		"indentStyle": "tab",
-		"indentWidth": 2,
-		"lineWidth": 120
-	},
-	"javascript": {
-		"formatter": {
-			"quoteStyle": "double",
-			"semicolons": "always",
-			"trailingCommas": "es5"
-		}
-	}
-}

docker-compose.dev.yml

@@ -6,11 +6,9 @@ services:
     volumes:
       - ./backend:/app
       - backend_node_modules:/app/node_modules
-      - ./data:/app/data
+      - ./backend/data:/app/data
     env_file:
       - .env
-    environment:
-      - DATA_DIR=/app/data
     ports:
       - "3000:3000"
     security_opt:

docker-compose.yml

@@ -7,7 +7,6 @@ services:
     environment:
       - PUID=${PUID:-1000}
       - PGID=${PGID:-1000}
-      - DATA_DIR=/app/data
     volumes:
       - ./data:/app/data
     ports:
@@ -35,8 +34,6 @@ services:
   frontend:
     image: ghcr.io/danielvolz/medassist-ng-frontend:latest
     container_name: medassist-ng-frontend
-    environment:
-      - BACKEND_URL=backend:3000
     ports:
       - "4174:8080"
     networks:

frontend/.dockerignore

@@ -1,33 +0,0 @@
-# Dependencies
-node_modules/
-
-# Build outputs (rebuilt in Docker)
-dist/
-coverage/
-
-# Development files
-*.log
-npm-debug.log*
-
-# Test files
-src/test/
-*.test.ts
-*.test.tsx
-vitest.config.ts
-
-# IDE
-.vscode/
-.idea/
-
-# OS files
-.DS_Store
-Thumbs.db
-
-# Git
-.git/
-.gitignore
-
-# Docker
-Dockerfile
-.dockerignore
-docker-compose*.yml

frontend/Dockerfile

@@ -32,14 +32,8 @@ RUN npm run build
 # -----------------------------------------------------------------------------
 FROM nginxinc/nginx-unprivileged:1.27-alpine AS runner
 
-# Redirect envsubst output to /tmp (writable under read_only: true)
-# and update nginx main config to include from there instead of /etc/nginx/conf.d/
-ENV NGINX_ENVSUBST_OUTPUT_DIR=/tmp
-RUN sed -i 's|include /etc/nginx/conf.d/\*.conf;|include /tmp/default.conf;|' /etc/nginx/nginx.conf
-
-# Copy custom nginx config as template for envsubst processing
-# nginx-unprivileged automatically substitutes env vars in .template files
-COPY nginx.conf /etc/nginx/templates/default.conf.template
+# Copy custom nginx config (must listen on 8080, not 80)
+COPY nginx.conf /etc/nginx/conf.d/default.conf
 
 # Copy built static files with correct ownership (nginx user = uid 101)
 COPY --from=builder --chown=101:101 /app/dist /usr/share/nginx/html
@@ -50,5 +44,5 @@ EXPOSE 8080
 # Already runs as non-root (nginx user, uid 101)
 USER nginx
 
-# Start nginx (entrypoint processes templates automatically)
+# Start nginx
 CMD ["nginx", "-g", "daemon off;"]

frontend/e2e/auth.setup.ts

@@ -1,76 +0,0 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { expect, test as setup } from "@playwright/test";
-import { TEST_USER } from "./fixtures";
-
-const authFile = path.join(import.meta.dirname, ".auth", "user.json");
-
-/**
- * Global setup for authentication
- * This runs before all tests to ensure a test user exists and stores the authenticated state
- */
-setup("authenticate", async ({ page }) => {
-	// Create .auth directory if it doesn't exist
-	const authDir = path.dirname(authFile);
-	if (!fs.existsSync(authDir)) {
-		fs.mkdirSync(authDir, { recursive: true });
-	}
-
-	await page.goto("/");
-
-	// Wait for the app to fully load (network idle + content visible)
-	await page.waitForLoadState("networkidle");
-	await expect(page.locator("body")).not.toHaveText(/^$/, { timeout: 15000 });
-
-	// Check if auth is disabled (we can access dashboard directly)
-	const dashboardVisible = await page
-		.getByText(/dashboard|medications|schedule/i)
-		.isVisible()
-		.catch(() => false);
-	if (dashboardVisible) {
-		// Auth is disabled - save empty state and return
-		await page.context().storageState({ path: authFile });
-		return;
-	}
-
-	// Check if we need to register (first user setup)
-	const needsSetup = await page
-		.getByText(/create.*first.*user|create.*account|register|first user setup/i)
-		.isVisible()
-		.catch(() => false);
-
-	if (needsSetup) {
-		// Register the test user
-		const usernameField = page.getByLabel(/username/i);
-		const passwordField = page.getByLabel(/password/i).first();
-
-		await usernameField.fill(TEST_USER.username);
-		await passwordField.fill(TEST_USER.password);
-
-		// Look for register/create button
-		const registerButton = page.getByRole("button", { name: /register|create|sign up/i });
-		await registerButton.click();
-
-		// Wait for successful registration and redirect
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 15000 });
-	} else {
-		// Need to login
-		const usernameField = page.getByLabel(/username/i);
-		const passwordField = page.getByLabel(/password/i);
-
-		// Check if we're on login page
-		if (await usernameField.isVisible().catch(() => false)) {
-			await usernameField.fill(TEST_USER.username);
-			await passwordField.fill(TEST_USER.password);
-
-			const loginButton = page.getByRole("button", { name: /sign in|log in|login/i });
-			await loginButton.click();
-
-			// Wait for successful login
-			await expect(page.getByRole("navigation")).toBeVisible({ timeout: 15000 });
-		}
-	}
-
-	// Save the authenticated state
-	await page.context().storageState({ path: authFile });
-});

frontend/e2e/auth.spec.ts

@@ -1,118 +0,0 @@
-import { expect, test } from "@playwright/test";
-
-/**
- * Helper to wait for the app's auth state to be determined
- * The app shows Loading/Initializing until auth state is fetched
- */
-async function waitForAuthReady(page: import("@playwright/test").Page): Promise<void> {
-	// Wait for the loading indicator to disappear
-	await page.waitForLoadState("networkidle");
-	// The app should have loaded something meaningful
-	await expect(page.locator("body")).not.toHaveText(/^$/, { timeout: 10000 });
-}
-
-/**
- * Authentication E2E Tests
- *
- * These tests verify the authentication flow including login, registration,
- * and logout functionality.
- */
-test.describe("Authentication", () => {
-	// Skip auth dependency for these tests since we're testing auth itself
-	test.use({ storageState: { cookies: [], origins: [] } });
-
-	test("should display login page when not authenticated", async ({ page }) => {
-		await page.goto("/");
-		await waitForAuthReady(page);
-
-		// Should show either login form, registration form (first setup), or dashboard (auth disabled)
-		const hasLoginForm = await page
-			.getByLabel(/username/i)
-			.isVisible()
-			.catch(() => false);
-		const hasDashboard = await page
-			.getByText(/dashboard|medications/i)
-			.isVisible()
-			.catch(() => false);
-
-		expect(hasLoginForm || hasDashboard).toBeTruthy();
-	});
-
-	test("should have accessible form fields", async ({ page }) => {
-		await page.goto("/");
-		await waitForAuthReady(page);
-
-		// Check if auth is enabled
-		const hasLoginForm = await page
-			.getByLabel(/username/i)
-			.isVisible()
-			.catch(() => false);
-
-		if (hasLoginForm) {
-			// Username field should be accessible
-			const usernameField = page.getByLabel(/username/i);
-			await expect(usernameField).toBeVisible();
-			await expect(usernameField).toBeEnabled();
-
-			// Password field should be accessible
-			const passwordField = page.getByLabel(/password/i);
-			await expect(passwordField).toBeVisible();
-			await expect(passwordField).toBeEnabled();
-		}
-	});
-
-	test("should show validation error for empty credentials", async ({ page }) => {
-		await page.goto("/");
-		await waitForAuthReady(page);
-
-		const hasLoginForm = await page
-			.getByLabel(/username/i)
-			.isVisible()
-			.catch(() => false);
-
-		if (hasLoginForm) {
-			// Try to submit empty form
-			const submitButton = page.getByRole("button", { name: /sign in|log in|login|register|create/i });
-
-			if (await submitButton.isVisible()) {
-				await submitButton.click();
-
-				// Check for validation - either HTML5 validation or custom error
-				const usernameField = page.getByLabel(/username/i);
-				const isInvalid =
-					(await usernameField.evaluate((el) => (el as HTMLInputElement).validity.valueMissing).catch(() => false)) ||
-					(await page
-						.getByText(/required|invalid|error/i)
-						.isVisible()
-						.catch(() => false));
-
-				expect(isInvalid || true).toBeTruthy(); // Validation varies by implementation
-			}
-		}
-	});
-
-	test("should toggle password visibility", async ({ page }) => {
-		await page.goto("/");
-		await waitForAuthReady(page);
-
-		const passwordField = page.getByLabel(/password/i).first();
-		const hasPasswordField = await passwordField.isVisible().catch(() => false);
-
-		if (hasPasswordField) {
-			// Check initial type is password
-			await expect(passwordField).toHaveAttribute("type", "password");
-
-			// Find and click the toggle button (often an eye icon)
-			const toggleButton = page.getByRole("button", { name: /show|hide|toggle.*password/i });
-			const hasToggle = await toggleButton.isVisible().catch(() => false);
-
-			if (hasToggle) {
-				await toggleButton.click();
-				await expect(passwordField).toHaveAttribute("type", "text");
-
-				await toggleButton.click();
-				await expect(passwordField).toHaveAttribute("type", "password");
-			}
-		}
-	});
-});

frontend/e2e/dashboard.spec.ts

@@ -1,122 +0,0 @@
-import * as path from "node:path";
-import { expect, test } from "@playwright/test";
-
-const authFile = path.join(import.meta.dirname, ".auth", "user.json");
-
-/**
- * Dashboard E2E Tests
- *
- * These tests verify the main dashboard functionality including
- * medication overview and upcoming schedules.
- */
-test.describe("Dashboard", () => {
-	test.use({ storageState: authFile });
-
-	test("should display dashboard page", async ({ page }) => {
-		await page.goto("/dashboard");
-
-		// Wait for app to load
-		await expect(page.locator("body")).not.toContainText(/Loading\.\.\.|Initializing\.\.\./, {
-			timeout: 10000,
-		});
-
-		// Should display navigation
-		await expect(page.getByRole("navigation")).toBeVisible();
-
-		// Should show dashboard content
-		const hasDashboardContent =
-			(await page
-				.getByText(/dashboard|overview|medications/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByText(/no medications/i)
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasDashboardContent).toBeTruthy();
-	});
-
-	test("should have working navigation links", async ({ page }) => {
-		await page.goto("/dashboard");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Check for navigation links - these are the common nav items
-		const navLinks = ["dashboard", "medications", "planner", "settings", "schedule"];
-
-		for (const link of navLinks) {
-			const navLink = page.getByRole("link", { name: new RegExp(link, "i") });
-			const isVisible = await navLink.isVisible().catch(() => false);
-
-			// At least some nav links should be present
-			if (isVisible) {
-				await expect(navLink).toBeEnabled();
-			}
-		}
-	});
-
-	test("should navigate to medications page", async ({ page }) => {
-		await page.goto("/dashboard");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Click medications link
-		const medsLink = page.getByRole("link", { name: /medications/i });
-		if (await medsLink.isVisible()) {
-			await medsLink.click();
-			await expect(page).toHaveURL(/medications/);
-		}
-	});
-
-	test("should navigate to settings page", async ({ page }) => {
-		await page.goto("/dashboard");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Click settings link
-		const settingsLink = page.getByRole("link", { name: /settings/i });
-		if (await settingsLink.isVisible()) {
-			await settingsLink.click();
-			await expect(page).toHaveURL(/settings/);
-		}
-	});
-
-	test("should display medication overview section", async ({ page }) => {
-		await page.goto("/dashboard");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for medication overview or "no medications" message
-		const hasOverview =
-			(await page
-				.getByText(/medication overview|stock/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByText(/no medications/i)
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasOverview).toBeTruthy();
-	});
-
-	test("should display upcoming schedules section", async ({ page }) => {
-		await page.goto("/dashboard");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for schedules section or indication that there are no schedules
-		const hasSchedules =
-			(await page
-				.getByText(/upcoming|schedule|1 month|3 months/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByText(/no medications/i)
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasSchedules).toBeTruthy();
-	});
-});

frontend/e2e/fixtures/index.ts

@@ -1,123 +0,0 @@
-import * as fs from "node:fs";
-import * as path from "node:path";
-import { test as base, expect, type Page } from "@playwright/test";
-
-// Storage state path for authenticated sessions
-const authFile = path.join(import.meta.dirname, "..", ".auth", "user.json");
-
-/**
- * Test user credentials for E2E tests
- * These are used for setting up a test user during the setup phase
- */
-export const TEST_USER = {
-	username: "e2e-test-user",
-	password: "TestPassword123!",
-} as const;
-
-/**
- * Custom test fixture that extends Playwright's base test
- * Provides utility functions for common testing operations
- */
-export const test = base.extend<{
-	/**
-	 * Authenticated page instance - uses stored auth state
-	 */
-	authenticatedPage: Page;
-}>({
-	authenticatedPage: async ({ page }, use) => {
-		// Load auth state if it exists
-		if (fs.existsSync(authFile)) {
-			const storageState = JSON.parse(fs.readFileSync(authFile, "utf-8"));
-			await page.context().addCookies(storageState.cookies || []);
-			// Note: localStorage must be set after navigating to the page
-		}
-
-		await use(page);
-	},
-});
-
-/**
- * Helper to wait for the app to be fully loaded
- */
-export async function waitForAppReady(page: Page): Promise<void> {
-	// Wait for the app to finish loading (no "Loading..." or "Initializing...")
-	await expect(page.getByText(/Loading\.\.\.|Initializing\.\.\./i)).not.toBeVisible({
-		timeout: 10000,
-	});
-}
-
-/**
- * Helper to login with the test user
- */
-export async function loginTestUser(page: Page): Promise<void> {
-	await page.goto("/");
-	await waitForAppReady(page);
-
-	// Check if we're already logged in
-	const isLoggedIn = await page
-		.getByRole("navigation")
-		.isVisible()
-		.catch(() => false);
-	if (isLoggedIn) {
-		return;
-	}
-
-	// Fill login form
-	await page.getByLabel(/username/i).fill(TEST_USER.username);
-	await page.getByLabel(/password/i).fill(TEST_USER.password);
-	await page.getByRole("button", { name: /sign in|log in|login/i }).click();
-
-	// Wait for successful login
-	await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-}
-
-/**
- * Helper to register a new user (for setup)
- */
-export async function registerTestUser(page: Page): Promise<void> {
-	await page.goto("/");
-	await waitForAppReady(page);
-
-	// Check if we're on the registration page (needs setup)
-	const needsSetup = await page
-		.getByText(/create.*account|register|first user/i)
-		.isVisible()
-		.catch(() => false);
-
-	if (needsSetup) {
-		// Fill registration form
-		await page.getByLabel(/username/i).fill(TEST_USER.username);
-		await page
-			.getByLabel(/password/i)
-			.first()
-			.fill(TEST_USER.password);
-
-		// Look for confirm password field if present
-		const confirmPassword = page.getByLabel(/confirm.*password/i);
-		if (await confirmPassword.isVisible().catch(() => false)) {
-			await confirmPassword.fill(TEST_USER.password);
-		}
-
-		// Submit registration
-		await page.getByRole("button", { name: /register|create|sign up/i }).click();
-
-		// Wait for successful registration
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-	}
-}
-
-/**
- * Helper to logout
- */
-export async function logout(page: Page): Promise<void> {
-	// Click on user profile/menu button
-	const userButton = page.getByRole("button", { name: /profile|user|account|menu/i });
-	if (await userButton.isVisible().catch(() => false)) {
-		await userButton.click();
-		await page.getByRole("button", { name: /logout|sign out|log out/i }).click();
-		await expect(page.getByLabel(/username/i)).toBeVisible({ timeout: 5000 });
-	}
-}
-
-// Re-export expect for convenience
-export { expect };

frontend/e2e/medications.spec.ts

@@ -1,201 +0,0 @@
-import * as path from "node:path";
-import { expect, test } from "@playwright/test";
-
-const authFile = path.join(import.meta.dirname, ".auth", "user.json");
-
-/**
- * Helper to wait for the medication form to be visible after clicking add
- */
-async function waitForFormVisible(page: import("@playwright/test").Page): Promise<void> {
-	// Wait for form elements to appear (name field or form container)
-	await page
-		.getByLabel(/commercial.*name|name/i)
-		.first()
-		.waitFor({ state: "visible", timeout: 5000 })
-		.catch(() => {
-			// Form might not be available, that's ok
-		});
-}
-
-/**
- * Medications Page E2E Tests
- *
- * These tests verify the medications management functionality including
- * viewing, adding, editing, and deleting medications.
- */
-test.describe("Medications Page", () => {
-	test.use({ storageState: authFile });
-
-	test("should display medications page", async ({ page }) => {
-		await page.goto("/medications");
-
-		// Wait for app to load
-		await expect(page.locator("body")).not.toContainText(/Loading\.\.\.|Initializing\.\.\./, {
-			timeout: 10000,
-		});
-
-		// Should display navigation
-		await expect(page.getByRole("navigation")).toBeVisible();
-
-		// Page should have medications-related content
-		const hasContent =
-			(await page
-				.getByText(/medications|inventory|add/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByText(/no medications/i)
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasContent).toBeTruthy();
-	});
-
-	test("should have medication form fields", async ({ page }) => {
-		await page.goto("/medications");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for the medication form fields (may be visible immediately or after clicking add)
-		const addButton = page.getByRole("button", { name: /add|new|create/i });
-
-		if (await addButton.isVisible().catch(() => false)) {
-			// Form might be hidden, click add button
-			await addButton.click();
-			await waitForFormVisible(page);
-		}
-
-		// Check for form fields - commercial name is required
-		const hasNameField =
-			(await page
-				.getByLabel(/commercial.*name|name/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByPlaceholder(/ozempic|medication/i)
-				.isVisible()
-				.catch(() => false));
-
-		// The form should have name field at minimum
-		expect(hasNameField).toBeTruthy();
-	});
-
-	test("should validate required fields on submit", async ({ page }) => {
-		await page.goto("/medications");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Find or trigger the add medication form
-		const addButton = page.getByRole("button", { name: /add|new|create/i });
-		if (await addButton.isVisible().catch(() => false)) {
-			await addButton.click();
-			await waitForFormVisible(page);
-		}
-
-		// Try to submit without filling required fields
-		const saveButton = page.getByRole("button", { name: /save|submit|add.*medication/i });
-		if (await saveButton.isVisible().catch(() => false)) {
-			await saveButton.click();
-
-			// Should show validation error or prevent submission
-			const nameField = page.getByLabel(/commercial.*name|name/i).first();
-			if (await nameField.isVisible().catch(() => false)) {
-				const isInvalid =
-					(await nameField.evaluate((el) => (el as HTMLInputElement).validity.valueMissing).catch(() => false)) ||
-					(await page
-						.getByText(/required|invalid|error/i)
-						.isVisible()
-						.catch(() => false));
-
-				expect(isInvalid || true).toBeTruthy();
-			}
-		}
-	});
-
-	test("should allow entering medication details", async ({ page }) => {
-		await page.goto("/medications");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Find or trigger the add medication form
-		const addButton = page.getByRole("button", { name: /add|new|create/i });
-		if (await addButton.isVisible().catch(() => false)) {
-			await addButton.click();
-			await waitForFormVisible(page);
-		}
-
-		// Fill in medication details
-		const nameField = page.getByLabel(/commercial.*name|name/i).first();
-		if (await nameField.isVisible().catch(() => false)) {
-			await nameField.fill("Test Medication");
-
-			// Verify the value was entered
-			await expect(nameField).toHaveValue("Test Medication");
-		}
-
-		// Try to fill generic name if available
-		const genericField = page.getByLabel(/generic/i);
-		if (await genericField.isVisible().catch(() => false)) {
-			await genericField.fill("Test Generic");
-			await expect(genericField).toHaveValue("Test Generic");
-		}
-	});
-
-	test("should display intake schedule section", async ({ page }) => {
-		await page.goto("/medications");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Find or trigger the add medication form
-		const addButton = page.getByRole("button", { name: /add|new|create/i });
-		if (await addButton.isVisible().catch(() => false)) {
-			await addButton.click();
-			await waitForFormVisible(page);
-		}
-
-		// Look for intake schedule section
-		const hasScheduleSection =
-			(await page
-				.getByText(/intake.*schedule|dosage|usage/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByText(/every.*days|pills/i)
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasScheduleSection).toBeTruthy();
-	});
-
-	test("should have cancel functionality", async ({ page }) => {
-		await page.goto("/medications");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Find or trigger the add medication form
-		const addButton = page.getByRole("button", { name: /add|new|create/i });
-		if (await addButton.isVisible().catch(() => false)) {
-			await addButton.click();
-			await waitForFormVisible(page);
-
-			// Fill in some data
-			const nameField = page.getByLabel(/commercial.*name|name/i).first();
-			if (await nameField.isVisible().catch(() => false)) {
-				await nameField.fill("Test Medication");
-			}
-
-			// Look for cancel button
-			const cancelButton = page.getByRole("button", { name: /cancel|close|discard/i });
-			if (await cancelButton.isVisible().catch(() => false)) {
-				await cancelButton.click();
-
-				// Wait for form to be hidden or reset
-				await expect(nameField)
-					.not.toHaveValue("Test Medication")
-					.catch(() => {
-						// Form might be completely hidden, that's also acceptable
-					});
-			}
-		}
-	});
-});

frontend/e2e/settings.spec.ts

@@ -1,159 +0,0 @@
-import * as path from "node:path";
-import { expect, test } from "@playwright/test";
-
-const authFile = path.join(import.meta.dirname, ".auth", "user.json");
-
-/**
- * Settings Page E2E Tests
- *
- * These tests verify the settings functionality including
- * notification settings, language selection, and stock thresholds.
- */
-test.describe("Settings Page", () => {
-	test.use({ storageState: authFile });
-
-	test("should display settings page", async ({ page }) => {
-		await page.goto("/settings");
-
-		// Wait for app to load
-		await expect(page.locator("body")).not.toContainText(/Loading\.\.\.|Initializing\.\.\./, {
-			timeout: 10000,
-		});
-
-		// Should display navigation
-		await expect(page.getByRole("navigation")).toBeVisible();
-
-		// Page should have settings-related content
-		const hasSettingsContent =
-			(await page
-				.getByText(/settings|configuration|notifications/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByText(/language|email|stock/i)
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasSettingsContent).toBeTruthy();
-	});
-
-	test("should display language settings", async ({ page }) => {
-		await page.goto("/settings");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for language setting section
-		const hasLanguageSetting =
-			(await page
-				.getByText(/language/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByRole("combobox", { name: /language/i })
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasLanguageSetting).toBeTruthy();
-	});
-
-	test("should display notification settings", async ({ page }) => {
-		await page.goto("/settings");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for notification settings
-		const hasNotificationSettings =
-			(await page
-				.getByText(/notification|email|push/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByRole("checkbox")
-				.first()
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasNotificationSettings).toBeTruthy();
-	});
-
-	test("should display stock threshold settings", async ({ page }) => {
-		await page.goto("/settings");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for stock threshold settings
-		const hasStockSettings =
-			(await page
-				.getByText(/stock|threshold|days|reminder/i)
-				.isVisible()
-				.catch(() => false)) ||
-			(await page
-				.getByRole("spinbutton")
-				.first()
-				.isVisible()
-				.catch(() => false));
-
-		expect(hasStockSettings).toBeTruthy();
-	});
-
-	test("should have a save button", async ({ page }) => {
-		await page.goto("/settings");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Look for save button
-		const saveButton = page.getByRole("button", { name: /save/i });
-		const hasSaveButton = await saveButton.isVisible().catch(() => false);
-
-		expect(hasSaveButton).toBeTruthy();
-	});
-
-	test("should allow toggling notification checkboxes", async ({ page }) => {
-		await page.goto("/settings");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Find first checkbox and test toggle
-		const checkbox = page.getByRole("checkbox").first();
-		const hasCheckbox = await checkbox.isVisible().catch(() => false);
-
-		if (hasCheckbox) {
-			const initialState = await checkbox.isChecked();
-
-			// Toggle the checkbox
-			await checkbox.click();
-
-			// Wait for checkbox state to change (auto-waiting via assertion)
-			if (initialState) {
-				await expect(checkbox).not.toBeChecked();
-			} else {
-				await expect(checkbox).toBeChecked();
-			}
-
-			// Toggle back
-			await checkbox.click();
-			await expect(checkbox).toHaveJSProperty("checked", initialState);
-		}
-	});
-
-	test("should persist settings page on navigation", async ({ page }) => {
-		await page.goto("/settings");
-
-		await expect(page.getByRole("navigation")).toBeVisible({ timeout: 10000 });
-
-		// Navigate away and back
-		const dashboardLink = page.getByRole("link", { name: /dashboard/i });
-		if (await dashboardLink.isVisible()) {
-			await dashboardLink.click();
-			await expect(page).toHaveURL(/dashboard/);
-
-			// Navigate back to settings
-			const settingsLink = page.getByRole("link", { name: /settings/i });
-			await settingsLink.click();
-			await expect(page).toHaveURL(/settings/);
-
-			// Settings content should still be there
-			await expect(page.getByRole("navigation")).toBeVisible();
-		}
-	});
-});

frontend/e2e/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ESNext",
-    "moduleResolution": "Bundler",
-    "strict": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "noEmit": true,
-    "types": ["node"]
-  },
-  "include": ["**/*.ts"]
-}

frontend/nginx.conf

@@ -12,22 +12,15 @@ server {
     add_header X-XSS-Protection "1; mode=block" always;
     add_header Referrer-Policy "strict-origin-when-cross-origin" always;
 
-    # Allow larger file uploads (for medication images and data import/export)
-    client_max_body_size 50M;
+    # Allow larger file uploads (for medication images)
+    client_max_body_size 10M;
 
     location / {
         try_files $uri /index.html;
     }
 
     location /api/ {
-        # Use variable for runtime DNS resolution (nginx resolves at startup by default)
-        # Docker embedded DNS (127.0.0.11) with 10s cache
-        resolver 127.0.0.11 valid=10s ipv6=off;
-        set $backend_upstream ${BACKEND_URL};
-
-        # Strip /api prefix (nginx doesn't auto-rewrite when using variables in proxy_pass)
-        rewrite ^/api/(.*)$ /$1 break;
-        proxy_pass http://$backend_upstream;
+        proxy_pass http://medassist-ng-backend:3000/;
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;

frontend/package.json

@@ -1,24 +1,13 @@
 {
   "name": "medassist-ng-frontend",
   "private": true,
-  "version": "1.10.0",
+  "version": "1.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
     "preview": "vite preview",
-    "lint": "npx biome check .",
-    "lint:fix": "npx biome check --write .",
-    "format": "npx biome format --write .",
-    "check": "npx biome check . && tsc --noEmit",
-    "test": "vitest",
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "test:e2e": "playwright test",
-    "test:e2e:ui": "playwright test --ui",
-    "test:e2e:headed": "playwright test --headed",
-    "test:e2e:debug": "playwright test --debug",
-    "test:e2e:report": "playwright show-report"
+    "lint": "echo 'add lint config'"
   },
   "dependencies": {
     "i18next": "^24.2.2",
@@ -30,19 +19,11 @@
     "zod": "^3.23.8"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.12",
-    "@playwright/test": "^1.58.1",
-    "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.2",
-    "@testing-library/user-event": "^14.6.1",
     "@types/react": "^18.3.4",
     "@types/react-dom": "^18.3.0",
     "@types/react-router-dom": "^5.3.3",
     "@vitejs/plugin-react": "^4.3.2",
-    "@vitest/coverage-v8": "^4.0.17",
-    "jsdom": "^27.4.0",
     "typescript": "^5.5.4",
-    "vite": "^7.3.0",
-    "vitest": "^4.0.17"
+    "vite": "^7.3.0"
   }
 }

frontend/playwright.config.ts

@@ -1,148 +0,0 @@
-import { defineConfig, devices } from "@playwright/test";
-
-/**
- * Playwright E2E Testing Configuration
- *
- * Run E2E tests with:
- *   npm run test:e2e          - Run tests in headless mode
- *   npm run test:e2e:ui       - Run tests with Playwright UI
- *   npm run test:e2e:headed   - Run tests in headed mode
- *
- * Before running tests, ensure both backend and frontend are running:
- *   docker compose -f docker-compose.dev.yml up
- *
- * Or run them separately:
- *   cd backend && npm run dev
- *   cd frontend && npm run dev
- */
-
-// Base URL for the frontend dev server
-const baseURL = process.env.PLAYWRIGHT_BASE_URL || "http://localhost:5173";
-
-export default defineConfig({
-	// Directory containing test files
-	testDir: "./e2e",
-
-	// Test file pattern
-	testMatch: "**/*.spec.ts",
-
-	// Maximum time one test can run
-	timeout: 30 * 1000,
-
-	// Maximum time to wait for expect assertions
-	expect: {
-		timeout: 5000,
-	},
-
-	// Run tests in parallel
-	fullyParallel: true,
-
-	// Fail the build on CI if you accidentally left test.only in the source code
-	forbidOnly: !!process.env.CI,
-
-	// Retry failed tests (more retries on CI)
-	retries: process.env.CI ? 2 : 0,
-
-	// Opt out of parallel tests on CI
-	workers: process.env.CI ? 1 : undefined,
-
-	// Reporter configuration
-	reporter: process.env.CI
-		? [["html", { outputFolder: "playwright-report" }], ["github"]]
-		: [["html", { outputFolder: "playwright-report" }], ["list"]],
-
-	// Shared settings for all projects
-	use: {
-		// Base URL for page.goto() calls
-		baseURL,
-
-		// Collect trace on first retry
-		trace: "on-first-retry",
-
-		// Capture screenshot on failure
-		screenshot: "only-on-failure",
-
-		// Record video on first retry
-		video: "on-first-retry",
-
-		// Default viewport size
-		viewport: { width: 1280, height: 720 },
-
-		// Wait for network idle before considering navigation complete
-		navigationTimeout: 10000,
-
-		// Accept cookies and local storage
-		actionTimeout: 5000,
-	},
-
-	// Configure projects for multiple browsers
-	projects: [
-		// Setup project for authentication state
-		{
-			name: "setup",
-			testMatch: /.*\.setup\.ts/,
-		},
-
-		// Desktop browsers
-		{
-			name: "chromium",
-			use: {
-				...devices["Desktop Chrome"],
-			},
-			dependencies: ["setup"],
-		},
-
-		{
-			name: "firefox",
-			use: {
-				...devices["Desktop Firefox"],
-			},
-			dependencies: ["setup"],
-		},
-
-		{
-			name: "webkit",
-			use: {
-				...devices["Desktop Safari"],
-			},
-			dependencies: ["setup"],
-		},
-
-		// Mobile browsers (optional)
-		{
-			name: "mobile-chrome",
-			use: {
-				...devices["Pixel 5"],
-			},
-			dependencies: ["setup"],
-		},
-
-		{
-			name: "mobile-safari",
-			use: {
-				...devices["iPhone 12"],
-			},
-			dependencies: ["setup"],
-		},
-	],
-
-	// Directory for test output files (screenshots, traces, videos)
-	outputDir: "test-results/",
-
-	// Web server configuration - automatically start dev server if not running
-	// Commented out by default as you typically run the dev servers separately
-	// webServer: [
-	//   {
-	//     command: 'cd ../backend && npm run dev',
-	//     url: 'http://localhost:3000/health',
-	//     reuseExistingServer: !process.env.CI,
-	//     timeout: 120 * 1000,
-	//   },
-	//   {
-	//     command: 'npm run dev',
-	//     url: 'http://localhost:5173',
-	//     reuseExistingServer: !process.env.CI,
-	//     timeout: 120 * 1000,
-	//   },
-	// ],
-});