mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-22 23:16:46 +00:00
de8caa81a2
* base entities
* update deps
* fix date as string
* rename entities
* migrations + seeders
* feat(db): DbTimestampType keeps DATETIME columns as the CURRENT_TIMESTAMP text
* feat(db): discover entities from an explicit list instead of a glob
* test(db): createTestOrm binds an ORM to a suite's own SQLite handle
* feat(db): dialect helper is the one place SQL functions are spelled
* test(db): dialect helper refuses malformed column references and day counts
* feat(db): snake_case entity shape and the first three repositories (Days, DayNotes, Trips)
* fix(db): repositories mirror the statement's column set and guard their row types
* feat(db): request-context and unit-of-work helpers for the ORM, with concurrency tests
* test(server): integration suites boot on the migrated schema snapshot
* test(server): snapshot harness keeps the legacy id semantics
* fix(test): route MikroORM's dynamic imports through vitest from the setup file, not the ORM config
* test(db): coverage ratchet entries for the ORM foundation
* test(server): websocket suites boot on the migrated schema snapshot
* test(server): coverage's uncovered-file pass goes through the SWC transform
* fix(db): dialect helpers dispatch on the platform; lint gate for the repository layer
* test(server): ORM suites open the schema snapshot; RESET_TABLES derived from the schema
* chore(server): promise safety net and sweep tooling for the async migration
* refactor(realtime, systemNotices, addons, airports, audit, categories, permissions, query-helpers, tags, transit, trip-membership): async DB-touching methods; transactions through UnitOfWork
* fix(server): observe every promise the async sweep left unobserved (timer, handshake, plugin-runtime test)
* test(doc-sync): unit suites await the methods the async sweep made async
* refactor(atlas, school-holidays, settings): async DB-touching methods; transactions through UnitOfWork
* chore(server): lint rule refusing a Promise used as a plain value, and the misses it found
* test(server): suites await the methods Task 1's forced edits made async
* refactor(budget, common, day-notes, days): async DB-touching methods; transactions through UnitOfWork
* test(oauth): controller suite awaits the async service
* chore(server): db-call-graph --unawaited lists calls to async methods whose result is used without await
* refactor(llm-parse, mcp-shared, oauth, place-shadow, route-usage, storage, todo, trip-invite): async DB-touching methods; transactions through UnitOfWork
* refactor(plugins): async DB-touching methods; transactions through UnitOfWork
* chore(server): db-call-graph --sync stops its transitive walk at an async callee
* chore(plugins): drop gate-only asyncs; observe the scheduler's rejection; async event-sink stub
* refactor(notifications, place-photos, backup): async DB-touching methods; transactions through UnitOfWork
* refactor(auth, files): async DB-touching methods; transactions through UnitOfWork
* test(server): suites await the methods earlier sweep groups made async
* refactor(tokens): async DB-touching methods; the auth token handlers await them
* test(files): upload filters fail closed on an excluded or unresolvable type
* refactor(collab, collections, maps): async DB-touching methods; transactions through UnitOfWork
* refactor(memories, photos, packing, share): async DB-touching methods; transactions through UnitOfWork
* chore(server): lint rule also refuses a Promise handed to expect() without resolves/rejects
* refactor(vacay, admin, doc-sync): async DB-touching methods; transactions through UnitOfWork
* fix(vacay): type the loop accumulators the async sweep introduced
* refactor(journey, oidc, place-enrichment, tokens, trip-members): async DB-touching methods; transactions through UnitOfWork
* fix(server): the journey hooks are awaited by their callers, not detached
* refactor(assignments, public-api, accommodations, places): async DB-touching methods; transactions through UnitOfWork
* refactor(trips): rewrite AccommodationsService.createAccommodation .bind alias
Recipe R4 trap named in the Task 12 brief: a .bind alias of an
AssignmentsService/AccommodationsService method is typed any and hides a
missing await from tsc and the promise lint rules. createAccommodation
belongs to this task's group, so rewritten as an arrow forwarding to the
method instead of a bound reference.
* refactor(assignments): drop the unused Trip type alias
* refactor(reservations, booking-import, calendar, integrations, roadtrip): async DB-touching methods; transactions through UnitOfWork
* refactor(roadtrip, reservations): return await on transactional; document the single-flight promises
* refactor(trip-read-model, trips, feeds): async DB-touching methods; transactions through UnitOfWork
* refactor(server): remove DatabaseService.transaction — every transaction runs through UnitOfWork
* refactor(trips, feeds): drop added return annotations; no double await on the feed guard
* fix(server): phase 1 review follow-ups — awaited returns, logged upload-filter rejections, covered handshake/notice branches, call-graph gate in CI, dead test imports
* fix(server): upload filters answer multer once on a throwing callback; positive call-graph gate test
* test(db): entity metadata must match the migrated schema; fix the four drifts it found
* feat(db): primary-relation entities proven (BudgetCategoryOrder, VacayUserSettings)
* test(db): parity gate also holds declared pivot entities; per-field column types; missing-set ratchets both ways
* test(db): numeric ids for the primary-relation spike
* feat(db): re-runnable entity generator encoding the snake_case/DbTimestampType rules
* fix(db): generator guard rails — validation cannot mask hidden()/index loss; typed JSON; loud failures
* fix(db): generator keeps NOT NULL boolean defaults; fails if a JSON interface import survives
* refactor(db): every entity in the snake_case shape; document-sync entities added; one repository per entity
* fix(db): no NaN class-field initialisers; entity generator --check gate in CI; parity normaliser keeps literal case
* chore(db): entity --check reports stray files; class-field census is a ratchet; migrate-encryption typechecked
* feat(db): AppSettings and Users repositories; forFeature wiring pattern
* refactor(permissions): permission flags through AppSettingsRepository
* fix(server): boot-time settings read runs inside an explicit ORM request context
* refactor(audit): audit log writes through AuditLogRepository
* fix(db): PK reads refresh past the identity map; typed owned-lookup generics; e2e ORM module mirrors production config
* docs(db): owned-lookup call-site convention; refresh side effect; e2e ORM module spread notes
* fix(audit): audit rows are native inserts, not a unit-of-work flush; closed test ORMs
* fix(server): non-HTTP entrypoints run inside an ORM request context; permission loads fail closed on context errors
* refactor(categories, tags): repositories replace raw SQL
* refactor(addons): addon catalog and photo providers through repositories
* fix(db): generator captures inline UNIQUE constraints
SqliteSchemaHelper.getIndexes() drops every unnamed sqlite_autoindex_
entry before entity-generator ever sees it, so a table-level
UNIQUE(...) constraint with no separate named CREATE UNIQUE INDEX
(settings' UNIQUE(user_id, key) among ~40 others) never reached the
generated entity's uniques: metadata. Adds a general
RULE9_addImplicitUniqueConstraints (skips a column set identical to
the table's own primary key — AppSettings.key/Addons.id noise) fed by
a PRAGMA index_list/index_info scan, and regenerates every entity.
* chore(addons): well-known gate wraps only the addon read in a request context; drop unused test factories
* fix(platform): well-known gate tolerates a synchronous addon read from the context helper
* fix(db): PK lookups inside patch refresh past the identity map; corrected identity-map notes
* refactor(settings): user and instance settings through repositories
SettingsRepository (getForUser/upsertForUser/getOne/deleteForUser) replaces
the per-user settings table's raw SQL; SettingsService drops DatabaseService
entirely. instance-api-keys.ts's readInstanceApiKey/writeInstanceApiKey/
resolveApiKey take an explicit AppSettingsRepository/UsersRepository instead
of a raw connection.
An earlier version resolved those two repositories itself from the active
MikroORM request context, so none of its six callers needed to change. That
worked in production and e2e (always inside a real request) but broke
service construction in plain unit tests across every calling domain
(addons, auth x2, maps, transit, unsplash - 185 failures on a full run),
since none of them wrap a request context. Each of those six services now
injects its own AppSettingsRepository/UsersRepository and passes them
through explicitly, matching how every other converted repository in this
migration is consumed; their own SQL is untouched (outside Plan 3a).
* test(server): harness constructors follow the Task 5 repository signatures; one test ORM per handle in the plugin host
* fix(db): generator names relation properties in captured UNIQUE constraints
* fix(settings): drop dead wiring and the speculative deleteForUser; strict row assertions
* fix(server): plan 3a review follow-ups — fail closed without an ORM at every choke point; seam and D5 ratchet tests; dead method and DDL copies removed
* fix(server): plan 3a re-review follow-ups — plugin boot activation and the airports backfill inside a request context; the supervisor answers the child before failing closed; BOOT-SWEEP-001 drives the real boot hooks; ws adapter seam pinned
* feat(db): generated entities declare their repository type; test casts dropped
* fix(server): plan 3a re-review 2 follow-ups — absent-ORM boot branch pinned; airports boot hook never rejects; BOOT-SWEEP-001 asserts the seven routes; duplicate comment removed
* feat(server): pre-init photo route and WS handshake run in a request context; InviteTokensRepository
* refactor(auth): users table through UsersRepository; JWT and MFA lookups repository-backed
* refactor(tokens): MCP and API tokens through McpTokensRepository
* refactor(auth): passkeys and registration invites through repositories
* fix(db): row-out repository reads bypass the identity map — stale write-back over nativeUpdate at flush; insertUser via em.insert; settings round-trip pinned
* fix(server): non-numeric route ids answer the legacy not-found, never NaN (tokens, categories, tags); mint path back to two statements; identity-map regression pinned
* refactor(oauth): OAuth server tables through repositories
OauthClientsRepository/OauthTokensRepository/OauthConsentsRepository
replace OauthService's raw SQL (OA1-OA33). revokeChain's recursive CTE
and the oauth_clients join (its FK actually targets client_id, not the
row id the generated relation assumes) go through em.getKysely();
OA19's chain revoke is one nativeUpdate($in); OA12's consent grant is
em.upsert on the (client, user) unique key. revokeAllForUser built now
for Task 5. Every row-out read is disableIdentityMap: true; inserts go
through em.insert.
* fix(auth): non-numeric passkey and invite ids answer the legacy 404, never NaN; invite join type pinned
* fix(db): generator emits the referenced column for non-PK foreign keys; OAuth client joins through the relation; FK parity un-skipped
* refactor(db): TrekRepository base — every repository path validates the request context and reads bypass the identity map by default
* refactor(auth): AuthService and account cleanup through repositories
* refactor(oidc): OIDC identities and settings through repositories
* fix(auth): invite validation keeps expires_at null on the wire; password transaction scopes and reset-token burn pinned
* fix(server): plan 3b close-out — case folding on both sides for identifier lookups (non-ASCII login regression); coverage ratchet restored; repository scaffold and instanceof ratchet on TrekRepository; D-shape tests load-bearing
* refactor(server): trip-access primitives async at every caller
* refactor(trips): trip access through TripsRepository; demo seed in a request context; dialect helpers for the trips cluster
* refactor(days): days and day notes through repositories
* refactor(assignments): day assignments through repositories
* refactor(server): trip-membership, place-shadow, place-enrichment, place-photos and query helpers through repositories
* refactor(trip-members): membership, guests and the trip read model through repositories
* refactor(places): places, tags, ratings and place images through repositories
* fix(server): place-shadow source counts ordered in SQL; identity-map ratchets load-bearing; photo-cache race pinned
* refactor(places): import paths through repositories
* refactor(trips): trips through repositories
* fix(server): trip ids parsed once at the gate for places and assignments; NUL-safe value quoting on the SQLite platform; places parity tests completed
* refactor(trips): trip copy through repositories for the owned tables
* fix(server): plan 3c close-out — non-finite ids bound as NULL, trip id parsed once at every places/days/ws gate
Platform: NulSafeSqlitePlatform now renders a bound NaN as NULL and
+/-Infinity as 9e999/-9e999, matching better-sqlite3's own legacy binding
(rule 22 extension) — the program-wide fail-safe for any caller that still
passes an unguarded Number(untrusted) into a converted statement.
PlacesService.verifyTripAccess and RealtimeGateway.handleJoin stop doing
that: verifyTripAccess parses once with toRowId and threads the parsed id
through create/import/bulk/rating/export.gpx (deleting the seven
toRowId(tripId) ?? -1 sites), and handleJoin gets a Number.isFinite guard.
DaysService gets the same treatment across list/create/getDay/reorder/
insert/resyncAccommodationDays, closing the gap where a hex-spelled trip id
could renumber a real trip's days while the raw-bind inverted-accommodation
guard silently matched nothing.
DatabaseService.getTripTitle is deleted; PlacesService injects
TripsRepository directly and calls getTitle itself.
Template/cheap-item cleanup: DayAssignmentsRepository.listForTimeSort uses
$castTo instead of an unknown bridge; the duplicated TagRow interface in
Places.repository.ts is now imported from Tags.repository.ts;
AssignmentWithPlaceRow extends the guarded DayAssignmentRow instead of
restating its columns; PlaceShadowPicksRepository.totals drops its
unreachable ??-fallback branch; Places.repository.ts's updatePlace types
the NOT NULL name column as string; trip-members.service.ts's
transferOwnership threads one parsed trip id through all three writes and
corrects two stale "raw-bind seam" docstrings that were actually Number()
seams; a dead canAccessTrip mock is removed from reservations.e2e.test.ts.
Tests: the 23 new no-explicit-any warnings in TRIP-SVC-069 are typed
(lint back to 2416); HTTP and WS regression coverage for the non-finite
and non-canonical id shapes across places/days routes, mutation-proved;
TRIP-JOIN-005 asserts the exact concurrent-join settlement instead of
>= 1; a new tests/unit/db/transaction-yield.test.ts pins rule 24's
measured transaction-yield/dirty-read/nested-BEGIN behaviour.
* test(server): plan 3c close-out — copy-source full-row parity, Kysely rollback proofs, identity-map relabels, trips e2e on the snapshot DB
* fix(server): plan 3c close-out — days create/insert answer the guard 404 for non-canonical trip ids instead of 500; exact settlement and cross-request yield ratchets
* feat(server): plan 3d groundwork — dialect helpers, visibility predicate, feed and cron context ratchets
* refactor(roadtrip): roadtrip tables through repositories
* refactor(reservations): reservations, endpoints and travelers through repositories
* refactor(feeds): ICS feed tokens and anonymous feeds through repositories
* refactor(accommodations): stays through repositories inside the existing transactions
* test(server): plan 3d — MCP test helper constructors follow the accommodations and days services
* refactor(trips): trip copy through repositories for the roadtrip, accommodation and reservation tables
* refactor(calendar): calendar reads and reservation visibility through one predicate
* feat(server): plan 3e groundwork — packing visibility predicate, memories access-gate audit
* fix(server): plan 3d close-out — legacy text shape for stored accommodation ids restores the date-change restamp; reservation ids parsed once at the gate; parity tests for the reservation repositories
* refactor(photos): trek photos, memories access and cache sweeps through repositories
* refactor(files): trip files and file links through repositories, with transactions added
* test(server): plan 3e — hand-built FilesService, FilesRpc and AllowedFileTypesService calls follow the repository constructors
* refactor(memories): unified, immich and synology photo sync through repositories
* refactor(collab): notes, polls, messages and links through repositories
* refactor(budget): budget items, members, payers and settlements through repositories
* refactor(todo): todo items through repositories
* refactor(packing): packing items, bags and templates through repositories
* feat(server): plan 3f groundwork — systemNotices DI shape, TRAVELER_OWNS predicate, ntfy/storage-health specs, composite-PK pins
* refactor(school-holidays): country and region catalog through repositories
* refactor(notifications): in-app notifications and channel preferences through repositories
* refactor(notifications): reminder crons, mailer, ntfy and webhook transports through repositories
* fix(server): plan 3e close-out — repository registrations restore the boot; packing assignee and bag updates parse and no-op as legacy; coverage and scoping ratchets for the budget, packing and collab repositories
* refactor(vacay): vacation plans, entries, shares and holiday calendars through repositories
* refactor(system-notices): notice dismissals through a Nest provider and repository
* refactor(atlas): visited countries, regions and bucket list through repositories
* feat(server): plan 3g groundwork — GALLERY_CHRONOLOGICAL_ORDER Kysely ordering, unixEpochToIsoKysely helper, composite-PK DDL pins, JB5/R7 confirmations
* refactor(journey): journey and trip access control, CRUD and the trip-sync engine through repositories
* feat(server): plan 3h groundwork — date-offset dialect helpers, entity/repository fitness confirmations, pre-init and encryption pattern confirmations, survivor re-grep
* fix(server): plan 3f close-out — ntfy operator-scope test on the live send path; vacay date-offset and shift-order parity; todo reminder window; coverage and parity ratchets for the atlas and vacay repositories
* refactor(journey): journey stats, entries, photos, contributors and suggestions through repositories
* refactor(journey): public share links, TREK Studio books and the journal facades through repositories
* refactor(collections): access model, hydration, export/import and list CRUD through repositories
* refactor(server): journey-table survivors in trips, photos, memories, auth-cleanup and plugin-contributions through repositories
* refactor(integrations): dawarich connection, sync, tracks and review-flow through repositories
* refactor(collections): saved places, copy-to-trip, labels and invitations through repositories
* refactor(integrations,booking-import,airports,maps,route-usage): airtrail, booking import, airport backfill, maps cache and route-usage counters through repositories
* refactor(doc-sync): connections, reconciler and controller-SQL relocation through repositories
* test(integrations): add AirTrail saveSettings tx-asymmetry ratchet (Plan 3h Task 4 addendum)
* fix(server): plan 3g close-out — transactional book first-save, skeleton reconcile and share-link create; unknown-key entry patches are no-ops again; parity and authorization pins for the journey repositories
* feat(server): plan 3i groundwork — AuditLogRepository's reserved methods, the demo connection-swap spike, repository-fitness confirmations
* feat(server): plan 3j groundwork — scheduler onto CronRegistrarService, SDK-contract confirmation, repository fitness
* refactor(storage): backend/category config and usage stats through AppSettingsRepository; fix the seed-file test race and the shared-replica migration-flip gap
* refactor(share): public share links, the pre-init photo fallback, and collection-places survivors through repositories
* feat(server): plan 3j — the withCamelCase utility, unwired, pending a contract decision
* refactor(admin): user CRUD, stats, audit log, version check and addon config through repositories
* test(admin): pin createUser's pre-existing non-transactional uniqueness-check race (AD2-4)
* refactor(plugins): the trip-write role gate through a repository, in isolation
* refactor(demo,backup): seed and reset through DemoRepository, live-connection backup statements through MaintenanceRepository, isDemoUserId through an injected DemoService
* fix(server): plan 3h close-out — new-value-wins COALESCE restores stay/reservation propagation; doc-sync state filter truthiness; request-context and parity ratchets for share, doc-sync and the integrations
* refactor(plugins): runtime lifecycle, config CRUD and the uninstall cascade through repositories
* fix(server): plan 3i close-out — DemoModule imported where its service is consumed (e2e restored); admin addons list selects the provider relation; saveDemoBaseline awaited; backup tests on the maintenance repository
* refactor(plugins): outbound OAuth tokens and per-user plugin settings through repositories
* refactor(plugins): install-time gates, the capability-audit hash chain and the registry through repositories
* refactor(plugins): contribution-hook controllers, the small plugin controllers and the plugins-table survivors through repositories
* test(server): plan 4 — collapse mcp tool test harnesses onto the ORM snapshot
* test(server): plan 4 — collapse nest service test harnesses onto the ORM snapshot
* fix(server): plan 3j close-out — serialized audit-chain appends, atomic metadata and scheduler limits, rollback and race proofs for the plugin repositories
* refactor(server): plan 4 — convert the program's orphaned raw-SQL callers
* fix(server): plan 4 — un-skip PARITY-009 (FK deleteRule and index-name parity)
* refactor(server): plan 4 — inline canAccessTrip/isOwner off DatabaseService (trip-domain services)
* refactor(server): plan 4 — inline canAccessTrip/isOwner off DatabaseService (plugins + MCP surfaces)
* fix(server): plan 4 — RULE12 paren-count scanner ignores string literals
The entity generator's RULE12_fixGarbledCheckExpressions CHECK-expression
paren-balance scanner counted every `(`/`)` character regardless of
whether it fell inside a single-quoted SQL string literal. A CHECK
expression like `status IN ('confirmed)', 'tentative')` has a literal `)`
inside its first string value; the scanner would hit depth 0 at that
in-string character and truncate the expression, losing its own real
closing paren. The scanner now tracks single-quote string state (handling
the doubled `''` SQLite escape) and skips parens while inside one.
Latent-bug fix — no shipped entity's CHECK expression has hit this shape
yet (3d's ledger: "nothing affected today").
* refactor(server): plan 4 — unify the trip-access predicate's Kysely copies
TripsRepository.findForViewer/listForUser/activeTrip each hand-wrote the
identical trip-access boolean (t.user_id = ? OR m.user_id IS NOT NULL)
through the Kysely expression builder. Task 7's security review (M1)
evaluated a shared helper and set it aside for time, falling back to the
TRIPREPO-041 cross-method parity test as a regression guard instead.
Extracted the boolean into one generic helper, tripAccessExpr
(_shared/trip-access.ts), following the reservation-visibility.ts
publicReservationExpr precedent: fully generic over <DB, TB> since the
predicate has no correlated subquery, so it composes across
TripSelectKyselyDB and ActiveTripKyselyDB without needing a narrower
fixed-alias shape. The LEFT JOIN itself stays hand-written at each call
site — tripSelectQuery's own docstring already explains why a shared join
helper can't be typed across these differently-joined outer queries.
feeds.service.ts and memories-access.service.ts no longer duplicate this
predicate at all (Task 2's facade-inline sweep already converted both onto
TripsRepository.findAccessible/getFeedTokenIfReachable/
listReachableActiveTrips, which read through the canonical MikroORM
QueryBuilder form, accessibleTripsQuery) — the remaining duplication this
task closes is the three Kysely copies inside this file.
TRIPREPO-041 (64/64 in the file) stays green as the unification's own
regression guard.
* fix(server): plan 4 — trek_photo_cache_meta.cache_key NOT NULL
The column was a bare TEXT PRIMARY KEY, which SQLite does not implicitly
make NOT NULL (unlike an INTEGER PRIMARY KEY rowid alias). Every writer
(TrekPhotoCacheMetaRepository.upsertMeta, the table's only INSERT path)
has always bound a real string — 3e's R5 confirmed this. Appends a new
migration rebuilding the table with cache_key NOT NULL (SQLite has no
ALTER COLUMN, so this follows the same rebuild recipe
Migration20200101020000 uses in the opposite direction) and updates the
entity/generated metadata to match. Schema tightening, not a behaviour
change.
* refactor(server): plan 4 — retire the safely-convertible string-form where conditions (rule 23)
Places.repository.ts's existsInTrip/findInTrip/findRaw/reclaimInputs/
listByTripAndIds and Trips.repository.ts's findPublicForShare all took a
raw `.where('col = ?', [v])` string condition even though their id/trip_id
parameters were already plain `number` (or, for findPublicForShare,
narrowed to `number` here after confirming its one caller,
share.service.ts#getSharedTripData, only ever passes a number sourced
from a Kysely-typed share_tokens row, never an unconverted URL param) —
converted all six to MikroORM's typed `.where({...})` filter object.
The remaining raw string-form conditions in src/db/repositories/** are
NOT converted here: they are the `number | string` raw-bind seam
findAccessible/isOwner's own docstrings describe (trip_id/id threaded
through unconverted from req.params), which structurally requires the
deferred guard-level single toRowId parse to land first — narrowing any
of those methods' signatures now would either break the '0x10'/'007' id
parity those docstrings warn about, or duplicate the deferred item's own
work ahead of it landing.
* refactor(server): plan 4 — trek-photos.repository.ts finishes its rename
3e Task 6 renamed the CLASS (TrekPhotosRepository -> TrekPhotoRegistrationService,
since the name collided with the generated ORM TrekPhotos.repository.ts) but
left the FILE and its test file's names unchanged. Renames both to
trek-photo-registration.service.ts / .test.ts.
The old path is kept as a thin re-export stub (the src/websocket.ts shape)
rather than repointed at every one of its ~20 importers in this pass: several
of those files sit in two sibling tasks' exclusively-owned windows on this
shared branch (Task 3's budget/packing/todo/accommodations/places ripple,
reached through tests/helpers/plugin-host.ts and mcp-test-controllers.ts;
Task 5c's held-back tests/unit/services/{trekPhotoMedia,conflictUpdate}.test.ts)
and are off limits here. Flagged for a follow-up once those tasks land: delete
the stub and repoint every remaining importer at ./trek-photo-registration.service.
* fix(server): plan 4 — plugin discovery's delete+reinsert pairs are atomic
install/discovery.ts#upsert refreshed a plugin's actions and settings-field
descriptors as two independent delete-then-reinsert pairs (DI5-DI8) with no
transaction spanning either pair, let alone both: a crash between a delete
and its own reinsert left that plugin with an EMPTY actions or
settings-field set until the next discovery run, instead of its previous
still-valid rows. Wraps both pairs in one uow.transactional, so a discovery
refresh for a plugin's descriptors is now all-or-nothing.
Deliberate behaviour change, named for the user per the task brief.
DiscoveryRepos grows a UnitOfWork; PluginRegistryService (the other
production caller, registry.service.ts) picks it up the same @Optional()
way PluginRuntimeService already does, with the same guard-throw. Updates
the two hand-constructed test call sites that actually exercise discovery
(discovery.test.ts, registry.test.ts) to pass a real UnitOfWork.
* refactor(server): plan 4 — facade inline sweep part B (rosterUserIds/getPlaceWithTags)
Inline DatabaseService.rosterUserIds onto TripMembersRepository.rosterUserIds
directly in budget.service.ts, budget.mcp.ts and todo.service.ts, and
DatabaseService.getPlaceWithTags onto PlacesRepository.findWithTagsAndRatings
in accommodations.service.ts (placesRepo was already injected there).
BudgetService/BudgetMcp/TodoService collapse their constructors, dropping
the now-fully-unused DatabaseService param (budget.module.ts/todo.module.ts
register TripMembers on forFeature). PackingService keeps DatabaseService as
a vestigial param behind an optional TripMembersRepository with a fallback
in tripRosterIds: an in-flight Task 5c file
(tests/unit/services/conflictUpdate.test.ts) hand-constructs PackingService
positionally without the new repository, so its arity cannot change this
task; the fallback keeps that file's DatabaseService.rosterUserIds spy
working until Task 4 drops the param with the class itself.
* test(server): plan 4 — constructor ripple for the rosterUserIds/getPlaceWithTags inline
Hand-built BudgetService/BudgetMcp/TodoService call sites drop the removed
DatabaseService constructor arg (budgetRepoArgs() now appends a
TripMembersRepository so most spread call sites need no other change);
budget.service.test.ts's rosterHas() helper and svc() factory move from a
spied DatabaseService to a stubbed TripMembersRepository. The
AccommodationsService helper (tests/helpers/accommodations-service.ts) and
its two direct callers drop the same arg. PackingService call sites are
untouched (its new param is optional, so every existing hand-built instance
still resolves rosterUserIds through the DatabaseService fallback).
* fix(server): plan 4 — thread the discovery UnitOfWork through PluginRuntimeService too
Complements the just-landed discovery atomicity fix (DiscoveryRepos.uow):
PluginRuntimeService's own discoveryRepos getter still built the bundle
without a uow field. Threads its already-injected, @Optional() uow through
so its own onApplicationBootstrap/reload/dev-link discovery calls also get
the transactional DI5-DI8 refresh, not just PluginRegistryService's.
No throwing guard here, unlike PluginRegistryService's: several hand-built
partial-DI-graph test instances of this class (boot-registry-order.test.ts,
in a sibling task's held file window) construct it with uow omitted and
exercise onApplicationBootstrap's discovery call directly. Discovery must
never refuse outright just because a test built a partial graph, so it
degrades to the pre-existing untransacted sequence when uow is absent
(DiscoveryRepos.uow's own docstring covers this), the same "boot must
never block app init" defensiveness this file already applies elsewhere.
* fix(server): plan 4 — guard-level single parse: verify + correct the overclaiming verifyTripAccess docstring (L-2)
TripAccessGuard/TripOwnerGuard already parse :tripId exactly once
(Number(), guarded by Number.isFinite) and hand the resolved TripAccess
row to the handler via request[TRIP_REQUEST_KEY], TripOwnerGuard reusing
TripAccessGuard's own lookup when both are on the same route rather than
re-querying — verified by reading both guards directly, no change needed
there.
PlacesService.verifyTripAccess's own docstring separately claimed its
returned `tid` gets "returned... for every downstream call to reuse
(never re-parsing)" (3c's Task 9 review, L-2, carried to Plan 4). Reading
every call site (not assumed) shows this is false: `.tid` has exactly one
reader (PlacesController.requireTrip itself), which discards it — none of
requireTrip's 13 callers read `.tid` off the trip it returns; each passes
the original raw tripId string on to the write/read method it calls next,
which toRowId-parses it again itself. That second parse cannot be
eliminated by this gate alone: the same service methods are called
directly by places.mcp.ts too, an entry point with no requireTrip gate at
all (its own numeric tripId is re-stringified, String(tripId), to call
them), so each method owns its own id validation regardless of entry
point. Threading `tid` all the way through would mean giving every one of
~15 methods a second, number-only call shape for the REST path alone to
use — a real refactor, out of this docstring fix's own scope. Corrected
the docstring to say so plainly instead of repeating the false claim.
* refactor(server): plan 4 — relocate JS7/10/13/14 off the journey-share fallback stub
JourneyShareTokensRepository's own JS7/JS10/JS13/JS14 Kysely reads were a
3g Task 3 fallback (Task 2's JourneyPhotosRepository/JourneyEntriesRepository/
JourneyEntryPhotosRepository were still mid-flight). Now that those
repositories are stable, relocate: JS7/JS10 (photo/asset validation joins)
onto JourneyPhotosRepository (already injected into JourneyShareService as
photosRepo, no constructor change); JS13 (public entry list) onto
JourneyEntriesRepository.listPublicEntries; JS14 (public per-entry photo
read) onto JourneyEntryPhotosRepository.listForPublicJourney, deduped
against that repository's own JP_COLUMNS select list instead of a
hand-duplicated copy. JourneyShareService gains two new @InjectRepository
params (both already registered in journey-domain.module.ts's forFeature),
rippled through mcp-test-controllers.ts and journey-share.service.test.ts
(P04/P05 parity tests now pin the new homes).
* refactor(server): plan 4 — document unreachable ?? default arms after single-row aggregates
3f Task 7's fix wave flagged a cluster of `row?.x ?? default` arms after
unqualified, ungrouped aggregate reads (MAX/COUNT/COALESCE(SUM,0)) as
"same class as OauthClients:147" but left them unexamined per-site. Decided
per site: document, don't delete — TypeScript still types
executeTakeFirst()'s result as `| undefined` even though SQL guarantees
exactly one row for these unqualified aggregates, so the optional chain
can't be removed without a non-null assertion (worse, not safer). Six
sites: JourneyEntries.repository.ts (maxSortOrderForDate JG42,
countStatsPlaces JG67), JourneyEntryPhotos.repository.ts
(maxSortOrderForEntry JG91), JourneyPhotos.repository.ts (maxSortOrder
JG88/JG99), VacayEntries.repository.ts (sumFraction VC1, sumCompFraction
VC2). No behavior change — comments only.
* refactor(server): plan 4 — unify the two user-data-erasure enqueue paths
UserCleanupService.erasePluginUserData (the account-deletion transaction's
own UC2/UC3 enqueue) and PluginRuntimeService.enqueueUserErasure (the
emitUserDeleted sink's post-commit enqueue) independently walked the
identical SELECT id, permissions FROM plugins + JSON.parse + hook:user-data
filter + INSERT OR IGNORE — and both genuinely run for every account
deletion, since every emitUserDeleted call site (auth.service.ts,
admin.service.ts, trip-members.service.ts's guest removal) fires
immediately after deleteUserCompletely.
Extracted the shared filter into enqueueHookUserDataErasures
(nest/plugins/user-erasure-enqueue.ts) and pointed both call sites at it.
UC2/UC3 also come off DatabaseService onto PluginsRepository/
PluginUserErasureQueueRepository in the same change (they were the last
raw statements standing in the way of sharing one implementation) — this
narrows the Plan 3b Task 5 "stays raw, owned by Plan 3j" ruling to UC1
only (plugin_user_config/plugin_oauth_tokens/plugin_oauth_state), which
still stays raw, unaffected. UserCleanupService's orphan-data-directory
scan (a plugin uninstalled with data retained) has no equivalent on the
enqueueUserErasure side and stays there, now via the same repository.
Both enqueue calls still run per deletion (INSERT OR IGNORE keeps this
idempotent) — this unifies the IMPLEMENTATION, not the call count; not
touching the emitUserDeleted event-sink wiring itself was a deliberate,
smaller-blast-radius choice for this task.
* refactor(server): plan 4 — narrow TripMembersRepository.remove/TripsRepository.setOwner to number
Both accepted trip_id: number | string per 3c's carry note (their "stays
loose for other callers" reasoning), pending the guard-level single parse
landing first. Re-checked every caller directly: setOwner's one production
caller (trip-members.service.ts#transferOwnership) already passes trip.id,
a real number resolved earlier in the same transaction; remove's callers
are trips.rpc.ts (num(), already a validated number), trips.mcp.ts (Zod-
typed tool input, already a number) and TripMembersController.removeMember
(the one genuine raw-string caller, :id off the route with no class-level
TripAccessGuard on this controller by design).
TripMembersController.removeMember now parses :id once (toRowId, not
Number() — rule 15's NaN-into-SQL trap) and threads the parsed number to
both its own access check and removeMember, instead of passing the raw
string through twice. TripMembersService.removeMember and both repository
methods narrow to number accordingly; setOwner's WHERE also moves off its
raw-bind escape hatch onto nativeUpdate now that trip_id is typed, and
remove's trip_id half moves onto a typed .where({ trip: trip_id }) filter
(user_id keeps its own raw bind — a different, still-live NaN-safety seam,
unrelated to this narrowing).
TRIPREPO-018 and TMEMREPO-023, which pinned the retired string-bind seam
on setOwner/remove, no longer typecheck against the narrowed signatures
and are removed with an explanatory comment in their place.
* refactor(server): plan 4 — U6 gate-level id parsing for todo item ids
Rule 21's carry from 3e Task 8's review: TodoController.update/.remove
passed the raw :id route string all the way to TodoItemsRepository,
relying on SQLite's column-affinity CAST to match it instead of a typed
filter. Parse :id ONCE at the controller (toRowId, matching Task 8a's
TripAccessGuard/removeMember shape), 404 on a non-canonical id, and thread
the number down through TodoService.updateItem/deleteItem into
TodoItemsRepository.findInTrip/existsInTrip/update/deleteById, all
narrowed from number | string to number. todo.rpc.ts's num()-derived
todoId no longer needs its String() wrapper. tripId stays string | number
— a separate, already-accepted carry (23c292f2f). Two new e2e tests pin
the non-numeric-id 404 at the gate.
* test(server): plan 4 — full-key parity tests for ShareTokensRepository (3h L4)
3h L4's carry: ShareTokensRepository (SH1-SH6/SH17/UC6) had zero tests.
17 cases pinning every read against the legacy statement run raw on the
same connection — findRawByTrip/findTokenByTrip with every nullable
column both null and set, findValidByToken/findTripAndShareMapByToken/
findTripIdByToken's shared token+expiry predicate (valid, future-expiry,
past-expiry, unknown token), plus insertNew/updateFlagsByTrip/deleteByTrip/
deleteByCreator's write correctness (deleteByCreator's cross-trip erasure
kept distinct from deleteByTrip's single-trip scope, per the repository's
own docstring). The listPublicForShare family (the other half of 3h L4)
is a separate, larger carry — not in this file.
* test(server): plan 4 — full-key parity for Reservations share/public-api reads (3d carry)
Task 8b-2 item 1 (partial): the 8 share.service.ts/public-api.service.ts
reads on ReservationsRepository flagged by the 3d Task 7 review as having
no repository-level toEqual(<legacy raw>) coverage (listEndpointsForShare,
listDayPositionsForShare, listPublicForShare, listPublicAccommodationsForShare,
listScheduledForPublicApi, listUnscheduledForPublicApi,
listAccommodationsForPublicApi, listUnplannedPlacesForPublicApi). 12 new
cases against the legacy statement run raw on the same connection.
* test(server): plan 4 — concurrency pins for boundaries-upsert and token-mint races (3d carry)
Task 8b-2 item 2: R7's two remaining un-transacted-statement races flagged
by the 3d Task 7 review (L4) but never pinned — RoadtripDayBoundariesService
.save's belongs-check-then-upsert, and FeedsService.generateTripToken's
read-then-write. Both tests pin today's actual outcome (an atomic ON
CONFLICT upsert survives cleanly; the token mint has a last-write-wins
loser) with the same concurrent-request-shape Promise.all/allSettled
pattern roadtrip.service.test.ts's existing R7 vias pin uses. Not a fix.
* test(server): plan 4 — full-key parity for Days/DayAssignments/Places roadtrip reads (3d carry)
Task 8b-2 item 1 (remainder): the 3 non-share/public-api reads from the 3d
Task 7 review's missing-parity list — DaysRepository.listPlanDays (RPL1),
DayAssignmentsRepository.listRoadtripVisits (RPL2, the correlated-subquery
LEFT JOIN), and PlacesRepository.isTrackInTrip (RT13, the review's
"findTrackInTrip" — the actual method name). Completes the 11-file carry
together with 434113937's 8 share/public-api reads.
* test(server): plan 4 — dedupe overlapping listPlanDays/isTrackInTrip parity blocks
235f03665 landed two versions of the same DaysRepository.listPlanDays and
PlacesRepository.isTrackInTrip parity coverage side by side (a merge
artifact from concurrent work on the same carry item). Keeps one block per
method, drops the duplicate describe/it blocks and their colliding test ids.
* test(server): plan 4 — budget calc suite onto real repositories (3e carry)
* test(server): plan 4 — at-rest encryption pins for AirTrail/doc-sync/webhook secrets (3h L3)
Task 8b-2 item 4: the three credential columns the 3h Task 7 review flagged
as having no at-rest pin — users.airtrail_api_key (AirtrailService#saveSettings),
document_connections.secrets (DocSyncConfigService's whole-secret-map
column), and trip_document_links.webhook_secret (createLink's per-binding
mint). Each test saves through the real service, reads the raw column via
better-sqlite3, asserts it is enc:v1:-prefixed ciphertext that never
contains the plaintext, and asserts the service's own decrypt path rounds
it back to the original value.
* test(server): plan 4 — at-rest encryption pins for AirTrail/doc-sync secrets (3h L3 carry)
Task 8b-2 item 4: the 3h Task 7 review's L3 finding ("users.airtrail_api_key
has no at-rest pin", "document_connections.secrets ... has no enc:v1: check",
"trip_document_links.webhook_secret - no at-rest pin"). Three targets, each
proven by reading the raw column and asserting the stored value is
enc:v1:-prefixed ciphertext that round-trips, never the plaintext:
UsersRepository.setAirtrailSettingsWithKey/getAirtrailConnRow at the
repository layer, AirtrailService.saveSettings/getAirtrailCredentials at the
service layer, and DocSyncConfigService's connection secrets map plus
createLink's webhook secret.
* test(server): plan 4 — drop duplicate AirTrail encryption repository test
Task 8b-2 item 4 follow-up: 6965869dd already covers
UsersRepository.setAirtrailSettingsWithKey/getAirtrailConnRow's at-rest
ciphertext at the service layer (airtrail.service.test.ts's
AIRTRAIL-SVC-ENC-001/002) plus the doc-sync secrets/webhook pins
(DOCSYNC-ENC-001/002); this repository-level file duplicated the same
AirTrail assertion a second time.
* test(server): plan 4 — atlas read-model parity remainder (3f L6 carry)
Task 8b-2 item 3 (atlas half): full-key toEqual(<legacy raw>) coverage for
the atlas read models the 3f Task 7 review's L6 finding listed as missing
(minus AT1/TRAVELER_OWNS-consumer, already landed) — AT2 (Places.
listForTripIds), AT3/AT28 (PlaceRegions.listCountryCodesForPlaceIds/
listForPlaceIds), AT5/AT10/AT43 (VisitedCountries.listCodesForUser/
listForUser), AT21/AT24/AT25 (VisitedRegions.listForUser/
listRegionCodesForCountry/findCountryCode), AT22 (HiddenRegions.listForUser),
AT23/AT40/AT44 (PlaceRegions.listDistinctRegionCodesForCountryAndPlaces/
countPlacesByCountryForTrip/listVisitedCountryCodesForUser), AT30/33/34
(BucketList.listForUser/findById/findForUser), AT41 (Places.
listAddressesForUser), AT42 (Trips.countTripsAndDaysForUser). New standalone
files for HiddenRegions/VisitedCountries/VisitedRegions/PlaceRegions, which
had none. AT6/45/46 (the TRAVELER_OWNS endpoint reads) are proven on ids
only by the existing consumer test — full-row parity for those three is
NOT done here (carried forward, same as the review's own open item).
* test(server): plan 4 — vacay read-model parity remainder (3f L6 carry)
Task 8b-2 item 3 (vacay half): full-key toEqual(<legacy raw>) coverage for
the vacay read models the 3f Task 7 review's L6 finding listed as missing
(minus VC81/82, already landed) — VacayPlans.findByOwner/findById (the
getPlanData/getStats composite's own plan read), VacayYears.listForPlan
(listYears), VacayCompanyHolidays.listForPlan (the company-holidays list),
VacayHolidayCalendars.listForPlan/findById (holiday-calendar reads),
VacayUserSettings.findForUser (user year settings), VacayUserYears.
findForYear (getStats rows, including the NULL vacation_days case the
review named explicitly), and VacayPlanMembers.listAvailableForFusion/
listPendingForPlan/listPendingForUser (the fusion and share pickers). Seven
new standalone files — only VacayShares had a repository-level test before
this. getSharedCalendars itself is a service-level composite over these
same reads plus VacayCompanyHolidays.listDatesForRange (already exercised
elsewhere); its own dedicated test is NOT added here.
* test(server): plan 4 — full-key parity for PackingItemsRepository.listPublicForShare (3h L4)
Task 8b-4a: no repository-level toEqual(<legacy raw>) coverage existed for
the share.service.ts SH13 read. Seeds Common items with every nullable
column both null and set, plus Personal and Shared-with-people items on
both sides of the is_private/owner/recipient predicate, and proves only
the Common tier surfaces.
* test(server): plan 4 — full-key parity for BudgetItemsRepository.listPublicForShare (3h L4)
Task 8b-4a: no repository-level toEqual(<legacy raw>) coverage existed for
the share.service.ts SH14 read. Seeds two items — every nullable column
set and every nullable column null — plus a foreign-trip item, and proves
the ORDER BY category ASC shape (unlike BG72's listAllForTrip, which has
none).
* test(server): plan 4 — full-key parity for CollabMessagesRepository.listPublicForShare (3h L4)
Task 8b-4a: no repository-level toEqual(<legacy raw>) coverage existed for
the share.service.ts SH16 read. Seeds a root message, a reply (reply_to
set), a deleted message (must be excluded) and a foreign-trip message, and
proves the narrower username/avatar-only join shape (no reply_text/
reply_username, unlike joinedQuery).
* test(server): plan 4 — full-key parity for PlacesRepository.listPublicForShare (3h L4)
Task 8b-4a: no repository-level toEqual(<legacy raw>) coverage existed for
the share.service.ts SH12 read. Seeds a categorised place with every
nullable column set and an uncategorised place with every nullable column
null, plus a foreign-trip place, and proves the named 20-column allow-list
never leaks an owner-only column (reservation_status, google_place_id,
…).
* test(server): plan 4 — full-key parity for DayAssignmentsRepository.listPublicForShare (3h L4)
Task 8b-4a: no repository-level toEqual(<legacy raw>) coverage existed for
the SH9 read. Seeds assignments across multiple days (one excluded day_id
never leaks in), every nullable place/assignment column both null and
set, and proves the six owner-only columns SharePublicAssignmentRow omits
(google_place_id, google_ftid, osm_id, amap_poi_id, stop_type,
fill_percent) never appear on the row at all.
* test(server): plan 4 — collapse remaining test harnesses; triage legacy migration tests
* test(server): plan 4 — todo controller test expects the gate-parsed item id (U6 follow-up)
* fix(server): add the missing numbered migration for the booked-night reseat step (#242)
reseatBookedNights (legacy step 242) was never invoked from any shipped
MikroORM migration -- only from the retired db/migrations.ts array --
so an install upgrading through the numbered chain never got the
one-time reorder. Adds Migration20200101040300, which calls the frozen
function through the native better-sqlite3 handle so it runs inside
the migration's own transaction.
orm-driver.ts's BoundSqliteConnection now also captures that handle
onto the field SqliteConnection.getNativeClient() reads, which its
createKyselyDialect() override previously left unset -- needed for
this migration (and any future one) to reach it in production, not
just under the bare test driver.
RESEAT-009 moves off the legacy createTables+runMigrations builder
onto the real Migrator via tests/helpers/migration-step.ts, plus a
new fresh-install guard (RESEAT-011).
* test(server): plan 4 — swap 4 of 5 straggler nest test harnesses off legacy schema builder
day-notes.service.test.ts, public-api-scopes.test.ts,
registration-invites.service.test.ts, trip-invite.service.test.ts onto
createSnapshotTestDb() via the async vi.mock idiom (5a/5b/5c precedent),
dropping their own hand-rolled createTables()+runMigrations() harness.
trip-invite.service.test.ts and registration-invites.service.test.ts
also drop their now-redundant DatabaseService wrapper (its .connection
was always just the same test db handle). expect( assertions unchanged.
user-cleanup.service.test.ts held back: its constructor call was
updated to match UserCleanupService's new EntityManager-based shape,
but deleteUserCompletely() now deadlocks against a real UnitOfWork
(reproduced in isolation, independent of this test file -- see the
report), which looks like a genuine bug in erasePluginUserData's new
MaintenanceRepository(em) call versus UnitOfWork.transactional(), not
a test-harness problem.
* test(server): plan 4 — move auto-backup.test.ts and demo-reset-path.test.ts off createTestDb()
Both build a schema db while 'fs'/'node:fs' are mocked (wholesale in
auto-backup.test.ts, selectively spied in demo-reset-path.test.ts) for
their own archiver/filesystem assertions, which broke
createSnapshotTestDb()'s read of the schema snapshot through
schema-snapshot.ts's own fs import.
auto-backup.test.ts: fs is mocked wholesale, so the snapshot db is now
built via a small helper that points fsMock's three calls at the real
filesystem (fetched through vi.importActual, bypassing the mock) just
long enough to build the db, before the test installs its own
existsSync stub -- never touching schema-snapshot.ts itself.
demo-reset-path.test.ts: fs.existsSync is selectively spied to answer
only for the baseline path, so the db is now built before that spy is
installed instead of after.
* test(server): plan 4 — retire the legacy-runner-only migration hygiene checks
migration-hygiene.test.ts deleted outright: every block in it (the
destructive-op allowlist, the empty-catch guard, the full-chain smoke)
scans or runs the legacy db/migrations.ts array being deleted this
plan, never the numbered src/db/migrations/*.ts chain, so there is
nothing in it to carry forward.
leg-mode-incoming.test.ts: deleted its first describe block (the
legacy-runner column-add + replay-safety smoke, also against
db/migrations.ts); the read-path parity block, already on the modern
createSnapshotTestDb() harness, is untouched.
* chore(server): delete the legacy schema/migration/seed builders
MikroORM's migrations are the only schema source now, including for
tests: src/db/schema.ts, src/db/migrations.ts and src/db/seeds.ts are
gone, along with tests/unit/db/schema-parity.test.ts (the parity gate
that guarded them, already red on 8a's cache_key NOT NULL) and
createTestDb() + its now-dead imports out of tests/helpers/test-db.ts
(its last two callers moved onto createSnapshotTestDb() this plan).
Their three entries drop from eslint.config.mjs's better-sqlite3
allow-list -- the files they exempted no longer exist.
Ruling 7's frozen files (migration-utils.ts, reseat-booked-nights.ts,
document-provider-seed.ts) and every numbered migration in
src/db/migrations/ are untouched.
Precondition grep (server/tests + server/src, from the task brief) is
now empty:
grep -rlE "from ['\"].*db/schema['\"]|from ['\"].*db/migrations['\"]|from ['\"].*db/seeds['\"]" server/tests server/src --include="*.ts"
* docs: plan 4 — the repository layer is the only data access path
DatabaseService/DatabaseModule are gone; queries go through repositories
(server/src/db/repositories/) and UnitOfWork (server/src/nest/database/
unit-of-work.ts) for transactions. MikroORM's migrations are the only
schema source, including for tests — the hand-kept schema.ts/migrations.ts/
seeds.ts test builders and their parity test are deleted. Documents the
db/database.ts (connection only) / db/orm-driver.ts (bound driver) /
UnitOfWork / repository shape, withRequestContext for non-HTTP entrypoints,
the better-sqlite3 ESLint restriction, and the entity generator (gen:entities/
check:entities) as the schema-parity guard. Corrects two stale nest/README.md
mentions (realtime.gateway.ts's now-repository constructor, the BE-Phase 1
trip-access bullet) and marks the legacy src/services/ migration recipe as a
historical changelog rather than current guidance.
* refactor(server): plan 4 — drop the 13 vestigial DatabaseService params/getters
Removes the now-dead DatabaseService injection (or private get db() getter)
from addons.service.ts, trips.service.ts, trip-invite.mcp.ts,
place-photo-cache.service.ts, trek-photo-registration.service.ts,
categories.mcp.ts, journey-domain.service.ts, plugins.service.ts,
plugin-runtime.service.ts, plugin-mcp-tools.service.ts, places.service.ts
and packing.service.ts — every one of them was fully repository-backed
already (Task 2/3's facade inline sweep), just still carrying the param.
PackingService's TripMembersRepository is required now (the
this.db.rosterUserIds fallback is gone with it) and PluginRuntimeService's
uow is no longer @Optional() — both moved ahead of the optional
registry?/hostFactory? params, since TypeScript refuses a required
parameter after an optional one; install/discovery.ts's DiscoveryRepos.uow
is required to match, and its upsert() always runs the descriptor
refresh inside one transaction instead of falling back to an
un-transacted sequence.
user-cleanup.service.ts's UC1 (the one genuinely live raw site, Plan 3b's
"stays raw" plugin-table trio) moves off DatabaseService onto a new
MaintenanceRepository.deletePluginUserData method — the rule-4-permitted
connection.execute() home, built from a directly-injected EntityManager.
Threads the active UnitOfWork.transactional's transaction context through
execute()'s ctx param: without it, a raw connection.execute() call issued
from inside deleteUserCompletely's open transaction contends for the same
single-connection checkout the transaction already holds and deadlocks
(never released, since the transaction is itself awaiting the call).
tests/unit/db/transaction-yield.test.ts's probe B already pinned this
exact hazard class for a raw better-sqlite3 statement; this is the same
mechanism reached through the ORM's connection pool instead.
nest/photos/trek-photos.repository.ts (the Plan 4 Task 8a re-export shim)
is deleted, with every importer repointed to trek-photo-registration.service
directly. The ~7 files that only imported the TripAccess/PlaceWithTags
type re-export from database.service.ts now import them from
Trips.repository.ts/Places.repository.ts directly, the actual single source.
* refactor(server): plan 4 — delete DatabaseService, DatabaseModule and database.tokens.ts
Grep gate confirmed zero src/ importers of DatabaseService left outside
these three files (Task 1/2/3's earlier conversions + this task's own
vestigial-param sweep). Deletes database.service.ts, database.module.ts
and database.tokens.ts, drops DatabaseModule from app.module.ts's imports
and the five other modules that still listed it
(accommodations/calendar/doc-sync/feeds/trip-members) — none of them had
a live DatabaseService injection left, so the import was already dead.
OrmModule is the module that survives DatabaseModule's deletion, per the
Phase 0 ledger's own ruling; untouched.
db/database.ts's `db` Proxy export itself stays, deliberately: ~190 test
files' vi.mock('…/db/database', …) factories return a { db: <mock
handle>, … } shape, and their own `import { db as testDb } from
'…/db/database'` is typed against this file's real exports regardless of
the runtime mock — vi.mock swaps the module at runtime, but tsc resolves
the import statically. Deleting the export would fail typecheck:tests
across the whole suite for a test-harness idiom this task's file set
doesn't own (Track B's territory). src/ has zero remaining importers, so
the ESLint no-restricted-imports gate this task also shrinks still holds
this file to its permanent allow-list entry either way.
* test(server): plan 4 — repoint the test suite off the deleted DatabaseService/DatabaseModule
Mechanical follow-through of the previous two commits across ~110 test
files:
- The 41 tests/e2e/*.e2e.test.ts suites composed DatabaseModule into their
partial Test.createTestingModule graphs; the import and the array entry
are dropped (nothing in any composed domain module injected
DatabaseService any more, so the entry was already dead weight).
- The shared test helpers (mcp-test-controllers.ts, plugin-host.ts,
accommodations-service.ts, notifications.ts, test-addons.ts,
test-uow.ts) each held a DatabaseService/DatabaseService-shaped param
used only for its raw better-sqlite3 handle; every one now takes that
handle directly, and every constructor call site the helpers make
(PackingService, PlacesService, JourneyDomainService,
PlacePhotoCacheService, TrekPhotoRegistrationService, TripsService,
UserCleanupService, AddonsService, PluginsService, PluginRuntimeService)
drops the removed param and, where PluginRuntimeService's uow is
involved, reorders it ahead of the optional registry?/hostFactory?
params to match the real constructor.
- ~60 further unit/integration test files hand-constructed one or more of
those same services directly; same fix, file by file. Four of them
(memories-access.service.test.ts, places.directions.test.ts,
places.service.test.ts, unified-memories.service.test.ts) also drop a
vi.spyOn(DatabaseService.prototype | instance, 'canAccessTrip' | 'isOwner'
| 'rosterUserIds' | 'getPlaceWithTags') spy left over from when those
methods delegated through DatabaseService — dead now that the services
read the owning repository directly.
- database-service.test.ts and database-service.delegation.test.ts tested
DatabaseService directly and are deleted with it.
- tests/unit/db/transaction-yield.test.ts's probe B, which pinned a raw
DatabaseService statement's dirty-read behaviour inside an open
transaction (rule 24), now issues the same raw better-sqlite3
statement directly against the shared test handle — the exact shape
DatabaseService.get/run used to wrap (this.conn.prepare(sql).get/run(),
bypassing MikroORM/Kysely entirely) — so the hazard it documents is
unchanged. Verified still green.
No expect(...) assertion changed in any file; only construction/import
plumbing. typecheck, typecheck:tests and the full touched-file run
(101 files / 2668 tests) are green, plus the compiled boot
(bootstrap.test.ts + boot-sweeps-request-context.test.ts) and one real
e2e boot file (trips.e2e.test.ts).
tests/unit/nest/user-cleanup.service.test.ts is deliberately NOT in this
commit — see the next one.
* test(server): plan 4 — finish user-cleanup.service.test.ts's harness swap; regression-test the UC1 transactional deadlock fix
This file arrived already modified and unstaged in the shared tree —
Task 6 (the parallel legacy-schema-deletion task) had swapped its DB
harness onto createSnapshotTestDb() and updated the UserCleanupService
construction to this task's new EntityManager-first shape while landing
its own commits. Finished here: USER-CLEANUP-005 ("survives a slim
schema without the plugin tables") passed a fake `{} as unknown as
EntityManager`, which doesn't reach the real UC1 path any more (the
previous raw DatabaseService.run swallowed everything in a try/catch
regardless); it now builds a real EntityManager bound to the slim
handle via sharedTestOrm(slim), so the per-statement query against the
missing plugin_user_config/plugin_oauth_tokens/plugin_oauth_state
tables is what's actually being proven caught, not a construction-time
throw.
USER-CLEANUP-006 through -010 (deleteUserCompletely, all of them
exercising UC1 inside the real uow.transactional wrap) are the
regression test for the previous commit's deadlock fix in
user-cleanup.service.ts/MaintenanceRepository.ts: before that fix, every
one of these hung and timed out. Green now, verified directly.
* chore(server): plan 4 — shrink the better-sqlite3 ESLint allow-list
Per ruling 6: database.service.ts's entry comes off (the file is
deleted). The five plugin entries (plugin-route-normalize.ts,
plugin-host-state.ts, install/discovery.ts, settings-defaults.ts,
signature-status.ts) come off too — re-verified none of the five import
better-sqlite3 or DatabaseService any more (3j's own conversion). The
src/demo/** blanket entry was already gone (3i's own task landed it).
reseat-booked-nights.ts and document-provider-seed.ts stay, with the
`// TODO(plan 4)` comment corrected: they're frozen forever (ruling 7),
invoked from inside numbered, already-shipped MikroORM migrations, never
Plan 4's or any future plan's to touch.
Permanent allow-list after this commit: src/db/database.ts,
src/db/orm-driver.ts, src/db/durability.ts (the driver homes),
src/nest/plugins/host/plugin-data.service.ts (3j's R-out-of-scope — a
plugin's own sqlite file is never TREK's schema), src/nest/backup/backup.impl.ts
(3i's R1, exactly the untrusted-upload-file probe), src/db/reseat-booked-nights.ts
and src/db/document-provider-seed.ts (frozen forever). src/db/{schema,migrations,seeds}.ts
entries were already removed by Task 6 when it deleted those files.
0 new lint errors; warning count unchanged at 2123 (well under the 2247
lean-gate ceiling) — every file the shrink touches was already fully
converted.
* refactor(server): plan 4 — U6 gate-level id parsing for budget item/settlement ids
Rule 21's 3e carry, same discipline 218f75d0f applied to todo: every
:id/:settlementId/:userId route param in BudgetController is parsed ONCE at
the gate with toRowId, matching the legacy affinity-seam "not found" outcome
for a malformed id on each route (404 'Budget item not found'/'Settlement
not found', except toggleMemberPaid — the one legacy handler that never
404'd an unknown item/member either, so a malformed id there skips the write
and keeps the same 200 { member } + Number(id)/Number(userId) broadcast
shape it always had).
The parsed numbers thread down through BudgetService's update/updateMembers/
setPayers/toggleMemberPaid/remove/updateSettlement/deleteSettlement (and
their updateBudgetItem/deleteBudgetItem/setItemPayers/getBudgetItem/
applySettlementUpdate/getSettlement internals) into BudgetItemsRepository's
getCurrency/findInTrip/existsInTrip/findForDelete/findById/update/deleteById
and BudgetSettlementsRepository's findWithUsers/findGuard/update/deleteById,
all narrowed from number | string to number; trip_id stays loose, a
separate, already-accepted carry. costs.rpc.ts's num()-derived itemId no
longer needs its String() wrapper on the update/delete calls; budget.mcp.ts
was already Zod-typed to number throughout. Two new e2e tests pin the
non-numeric-id 404 at the gate; controller/service unit tests cover the
narrowed call args and the toggleMemberPaid malformed-id parity case.
* refactor(server): plan 4 — U6 gate-level id parsing for packing item/bag/template ids
Rule 21's 3e carry, same discipline 218f75d0f applied to todo: every
:id/:bagId/:templateId/:userId route param in PackingController is parsed
ONCE at the gate with toRowId, matching the legacy affinity-seam "not found"
outcome for a malformed id on the routes with a pre-ORM Express precedent
(update/remove -> 'Item not found', updateBag/deleteBag/setBagMembers ->
'Bag not found', applyTemplate -> 'Template not found or empty').
#858's sharing/contributors routes (setSharing/clone/addContributor/
removeContributor) are native Nest code with no pre-ORM precedent (landed in
7eabf6066, after the migration) — a malformed id there just 404s the same
way an unknown one already does. removeContributor's :userId used to reach
contributorsRepo.deleteOne through a bare Number.parseInt(), the exact
NaN-into-SQL trap row-id.ts documents; it now parses through toRowId too.
The parsed numbers thread down through PackingService's updateItem/
setItemSharing/addContributor/removeContributor/cloneItem/deleteItem/
getItemPrivacy/updateBag/deleteBag/setBagMembers/applyTemplate, all narrowed
from number | string to number; tripId stays loose, a separate,
already-accepted carry. PackingItemsRepository's getPrivacy/findVisibleInTrip/
update/updateSharing/delete/findById, PackingBagsRepository's findInTrip/
update/findWithAssignee/delete and PackingTemplateItemsRepository.listForApply
narrow the same way. packing.rpc.ts's num()-derived itemId/bagId no longer
need their String() wrappers on the update/delete/updateBag/deleteBag/
setBagMembers calls; packing.mcp.ts was already Zod-typed to number
throughout. Two new e2e tests pin the non-numeric-id 404 at the gate;
controller/rpc unit tests cover the narrowed call args and the
removeContributor malformed-userId parity case.
AdminPackingTemplatesController (/api/admin/packing-templates) is out of
scope — a separate admin-gated surface with its own string-typed template
CRUD, not part of this trip-scoped controller's :id chain.
* test(server): plan 4 review — three pins catch up with the gate-parsed ids and the cache_key NOT NULL (M1–M3)
* fix(server): boot baselines legacy-runner installs before running MikroORM migrations (B1)
An install the retired positional runner migrated has a schema_version row
and no mikro_orm_migrations rows, so its first boot on this branch replayed
all 244 migrations over an already-migrated schema: eight refuse the boot,
and the replay-safe ones overwrite user data (step 26 rewrites every
day_assignments.assignment_time).
runSchemaBootstrap now records the baseline plus every migration whose
"Legacy migration step N" docstring is <= schema_version as executed, in one
transaction through the migrator's own storage, before the ordinary run
applies the rest. The step map is derived from the discovered migrations'
source, never hand-kept, and anything unmappable (a newer or malformed
schema_version, a duplicated, missing or out-of-order step) refuses the boot.
* test(server): boot the app on three legacy-runner fixtures to pin the B1 baseline
SQL dumps of databases the retired runner itself built: schema_version 205
(main at fa406b708), 242 (417d0445b, the runner's last commit) and 82
(v2.9.14, so seven of the eight non-replay-safe migrations still lie ahead
and run for the first time). Each gets canary rows: user-set assignment
times and a booked night.
buildApp() on each asserts the baseline and the applied rest in order, the
assignment times untouched, the booked-night reseat run exactly once on 205
and 82 and not at all on 242, schema_version kept, no half-built *_new
table, a schema identical to a fresh install's, and an idempotent re-run.
* refactor(server): demo-reset reads the live path off getRawConnection, not the db Proxy (m1)
demo-reset.ts was the one src/ consumer of the db Proxy left, reached
through a runtime require that a grep on `from` misses. It now imports
closeDb/getRawConnection/reinitialize statically, the way backup.impl.ts
does, so the Proxy genuinely has no src/ importer (the claim in database.ts
and server/CLAUDE.md now holds). The path test mocks the module with vi.mock
instead of teaching Node's require loader to answer for a .ts file.
* test(server): renumber the duplicate ASSIGNREPO/PLACEREPO test ids Plan 4 introduced (m3)
ASSIGNREPO-031/032 (the legacy-statement parity pair) become 034/035, and
the later PLACEREPO-030..038 block becomes 053..061, the next free ids, so
each id names one test again. No test body changes.
* refactor(server): derive the two restated public row types instead of copying their columns (m4)
JourneyPublicEntryPhotoRow restated JourneyPublicGalleryRow's nineteen
columns with only the parent key changed; it is now that row with
journey_id swapped for entry_id. PublicApiAssignedPlaceRow and its Kysely
table shape restated PlaceRow's columns; both now Pick them off PlaceRow.
Types only. The review's CPD method over Plan 4's new src lines drops from
about 3.4% to 0.64%.
* test(server): full-key parity for TripsRepository.findPublicForShare and VacaySharesRepository.listAvailableForShare (m5)
Neither read had any test reference. Each is now pinned with
toEqual(<legacy statement run raw on the same connection>), the
listPublicForShare family shape: SH7 on a filled and a NULL-heavy trip plus
a missing id (TRIPREPO-067/068), and VC90 over one world exercising every
exclusion (caller, guest, existing share, plan owner, accepted member) and
a missing plan.
* fix(server): the legacy baseline runs createTables() instead of marking it, atomically with the run (N1)
The legacy runner ran the running release's createTables() on every boot
before its pending steps, and about 30 tables exist only there. Marking the
baseline migration as executed left installs older than those tables (below
legacy step 68) failing with "no such table: photo_provider_fields" and, since
the rows were committed before the run, stuck half-baselined for every later
boot.
Only steps 1..N are recorded now, so the baseline's IF NOT EXISTS DDL runs
first, as the legacy boot did. The rows are logged inside the same
transaction as migrator.up({ transaction }), so a failed first boot records
nothing and the next boot baselines again.
A v66 fixture (the runner at 5be2e9b26) boots: 66 recorded, 178 applied,
canaries kept. Its two schema differences from a fresh install
(users.immich_access_token, reservations.accommodation_id INTEGER) come
from the legacy chain itself and are pinned as carried.
* fix(deps): sync the lockfiles with the bumped manifests and follow lucide's icon renames
feat/orm raised react to ^19.3.0 and several plugin-sdk dependencies without
regenerating the lockfiles, so npm ci failed on every CI job. The root
overrides now pin react 19.3.0, both lockfiles are regenerated with npm 11,
and the tests that select lucide icons by their old class names use the
current ones. Two tests cover the Immich prefs reads and the boot restore
branch that the coverage thresholds were missing.
* ci: give the server lint step an 8 GB heap for the type-aware rules
* test(server): keep the no-promise-as-value rule tester out of single-run mode on CI
With CI=true typescript-eslint infers single-run mode, builds the program
from the fixture file on disk and ignores the code each case passes in, so
all 24 invalid cases reported nothing on the runner. Both testers now set
disallowAutomaticSingleRunInference.
* refactor(server): name the new migrations after the first seven words of their purpose, like the rest
* fix(server): keep tsx a production dependency so image key rotation can load it
* test(server): re-pin the repositories branch floor at the measured 89.83%
* test(planner): keep the sidebar fixtures on past dates so the jump to today never fires in jsdom
* test(server): keep console output for failing tests only and teach Nest's logger LOG_LEVEL
* test(client): keep console output for failing tests only and answer the health probe
* test(client): drop the health handler, it races the admin page's first load
* chore(sonar): assert explicitly in two e2e cases, Number.NaN, and ignore S2187 on the legacy-upgrade fixtures
---------
Co-authored-by: Maurice <mauriceboe@icloud.com>
1939 lines
88 KiB
TypeScript
1939 lines
88 KiB
TypeScript
import { describe, it, expect, vi, beforeAll, beforeEach, afterAll } from 'vitest';
|
||
|
||
// ── DB setup (real in-memory SQLite) ─────────────────────────────────────────
|
||
|
||
vi.mock('../../../src/db/database', async () => {
|
||
|
||
const { createSnapshotTestDb } = await import('../../helpers/db-mock');
|
||
const db = createSnapshotTestDb();
|
||
const mock = {
|
||
db,
|
||
closeDb: () => {},
|
||
reinitialize: () => {},
|
||
canAccessTrip: () => null,
|
||
};
|
||
return mock;
|
||
});
|
||
|
||
|
||
vi.mock('../../../src/config', () => ({
|
||
JWT_SECRET: 'test-secret',
|
||
ENCRYPTION_KEY: 'a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2a3b4c5d6a7b8c9d0e1f2',
|
||
updateJwtSecret: () => {},
|
||
}));
|
||
// Mock websocket so notifyPlanUsers doesn't throw
|
||
vi.mock('../../../src/websocket', () => ({ broadcastToUser: vi.fn() }));
|
||
// shareCalendar fires a notification after inserting — keep that out of unit scope
|
||
|
||
import { db as testDb } from '../../../src/db/database';
|
||
import { resetTestDb } from '../../helpers/test-db';
|
||
import { createUser } from '../../helpers/factories';
|
||
|
||
import { VacayService } from '../../../src/nest/vacay/vacay.service';
|
||
import { RealtimeService } from '../../../src/nest/realtime/realtime.service';
|
||
import { notificationsStub } from '../../helpers/notifications';
|
||
import { createTestUnitOfWork } from '../../helpers/test-uow';
|
||
import {
|
||
createTestVacayPlansRepo, createTestVacayPlanMembersRepo, createTestVacayYearsRepo, createTestVacayUserYearsRepo,
|
||
createTestVacayUserColorsRepo, createTestVacayEntriesRepo, createTestVacayCompanyHolidaysRepo,
|
||
createTestVacaySharesRepo, createTestVacayUserSettingsRepo,
|
||
} from '../../helpers/vacay-repos';
|
||
import { createTestVacayHolidayCalendarsRepo, createTestSchoolHolidayRegionsRepo } from '../../helpers/school-holidays-repos';
|
||
|
||
// VACAY-SVC-001 through VACAY-SVC-066 moved 1:1 from the legacy
|
||
// tests/unit/services/vacayService.test.ts (the named-function imports became
|
||
// method calls on a directly constructed VacayService; the legacy
|
||
// updateUserYearSettings is the class's updateYearSettings).
|
||
// VACAY-SVC-067 (vacay.bridge delegation) died with the bridge — its only
|
||
// consumer, the legacy tripService, folded into the DI-native TripsService.
|
||
let svc: VacayService;
|
||
|
||
// ── Lifecycle ─────────────────────────────────────────────────────────────────
|
||
|
||
beforeAll(async () => {
|
||
svc = new VacayService(
|
||
await createTestVacayPlansRepo(testDb), await createTestVacayPlanMembersRepo(testDb),
|
||
await createTestVacayYearsRepo(testDb), await createTestVacayUserYearsRepo(testDb),
|
||
await createTestVacayUserColorsRepo(testDb), await createTestVacayEntriesRepo(testDb),
|
||
await createTestVacayCompanyHolidaysRepo(testDb), await createTestVacayHolidayCalendarsRepo(testDb),
|
||
await createTestVacaySharesRepo(testDb), await createTestVacayUserSettingsRepo(testDb),
|
||
await createTestSchoolHolidayRegionsRepo(testDb),
|
||
new RealtimeService(), notificationsStub(), await createTestUnitOfWork(testDb),
|
||
);
|
||
});
|
||
|
||
beforeEach(() => {
|
||
resetTestDb(testDb);
|
||
// Stub fetch with empty holiday list by default so updatePlan / applyHolidayCalendars
|
||
// never makes real network calls.
|
||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
|
||
ok: true,
|
||
json: async () => [],
|
||
}));
|
||
});
|
||
|
||
afterAll(() => {
|
||
vi.unstubAllGlobals();
|
||
testDb.close();
|
||
});
|
||
|
||
// ── Helpers ───────────────────────────────────────────────────────────────────
|
||
|
||
/** Insert a vacay_plan_members row directly (no service factory for it). */
|
||
function insertMember(planId: number, userId: number, status: 'pending' | 'accepted'): void {
|
||
testDb.prepare(
|
||
"INSERT INTO vacay_plan_members (plan_id, user_id, status) VALUES (?, ?, ?)"
|
||
).run(planId, userId, status);
|
||
}
|
||
|
||
/** Fast helper: create a user and immediately materialise their own plan. */
|
||
async function setupUserWithPlan() {
|
||
const { user } = createUser(testDb);
|
||
const plan = await svc.getOwnPlan(user.id);
|
||
return { user, plan };
|
||
}
|
||
|
||
/**
|
||
* Lift the (default-on) weekend blocking for tests whose dates are derived
|
||
* from the current year and can land on any weekday.
|
||
*/
|
||
function allowWeekends(planId: number) {
|
||
testDb.prepare('UPDATE vacay_plans SET block_weekends = 0 WHERE id = ?').run(planId);
|
||
}
|
||
|
||
// ── getOwnPlan ────────────────────────────────────────────────────────────────
|
||
|
||
describe('getOwnPlan', () => {
|
||
it('VACAY-SVC-001: creates a new plan on first call for a fresh user', async () => {
|
||
const { user } = createUser(testDb);
|
||
const plan = await svc.getOwnPlan(user.id);
|
||
|
||
expect(plan).toBeDefined();
|
||
expect(plan.owner_id).toBe(user.id);
|
||
expect(plan.id).toBeGreaterThan(0);
|
||
});
|
||
|
||
it('VACAY-SVC-002: returns the same plan on a second call (idempotent)', async () => {
|
||
const { user } = createUser(testDb);
|
||
const first = await svc.getOwnPlan(user.id);
|
||
const second = await svc.getOwnPlan(user.id);
|
||
|
||
expect(second.id).toBe(first.id);
|
||
});
|
||
|
||
it('VACAY-SVC-003: seeds the current year row in vacay_years after plan creation', async () => {
|
||
const { user } = createUser(testDb);
|
||
const plan = await svc.getOwnPlan(user.id);
|
||
const yr = new Date().getFullYear();
|
||
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_years WHERE plan_id = ? AND year = ?')
|
||
.get(plan.id, yr);
|
||
|
||
expect(row).toBeDefined();
|
||
});
|
||
|
||
it('VACAY-SVC-004: seeds the current year user_year row with default 30 vacation_days', async () => {
|
||
const { user } = createUser(testDb);
|
||
const plan = await svc.getOwnPlan(user.id);
|
||
const yr = new Date().getFullYear();
|
||
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_user_years WHERE user_id = ? AND plan_id = ? AND year = ?')
|
||
.get(user.id, plan.id, yr) as { vacation_days: number } | undefined;
|
||
|
||
expect(row).toBeDefined();
|
||
expect(row!.vacation_days).toBe(30);
|
||
});
|
||
});
|
||
|
||
// ── getActivePlan ─────────────────────────────────────────────────────────────
|
||
|
||
describe('getActivePlan', () => {
|
||
it('VACAY-SVC-005: returns own plan when user has no accepted membership in another plan', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const active = await svc.getActivePlan(user.id);
|
||
|
||
expect(active.id).toBe(plan.id);
|
||
expect(active.owner_id).toBe(user.id);
|
||
});
|
||
|
||
it('VACAY-SVC-006: returns the shared plan when user has an accepted membership in another plan', async () => {
|
||
const { user: owner, plan: ownerPlan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
// Make sure member also has their own plan materialised first
|
||
await svc.getOwnPlan(member.id);
|
||
|
||
insertMember(ownerPlan.id, member.id, 'accepted');
|
||
|
||
const active = await svc.getActivePlan(member.id);
|
||
expect(active.id).toBe(ownerPlan.id);
|
||
});
|
||
|
||
it('VACAY-SVC-007: pending membership does NOT override own plan as active', async () => {
|
||
const { user: owner, plan: ownerPlan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
await svc.getOwnPlan(member.id);
|
||
|
||
insertMember(ownerPlan.id, member.id, 'pending');
|
||
|
||
const active = await svc.getActivePlan(member.id);
|
||
// Should still point to member's own plan
|
||
expect(active.owner_id).toBe(member.id);
|
||
});
|
||
});
|
||
|
||
// ── getPlanUsers ──────────────────────────────────────────────────────────────
|
||
|
||
describe('getPlanUsers', () => {
|
||
it('VACAY-SVC-008: returns [owner] for a solo plan', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const users = await svc.getPlanUsers(plan.id);
|
||
|
||
expect(users).toHaveLength(1);
|
||
expect(users[0].id).toBe(user.id);
|
||
});
|
||
|
||
it('VACAY-SVC-009: returns [owner, member] after an accepted membership is inserted', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
insertMember(plan.id, member.id, 'accepted');
|
||
|
||
const users = await svc.getPlanUsers(plan.id);
|
||
|
||
expect(users).toHaveLength(2);
|
||
expect(users.map(u => u.id)).toContain(owner.id);
|
||
expect(users.map(u => u.id)).toContain(member.id);
|
||
});
|
||
|
||
it('VACAY-SVC-010: pending membership members are NOT included in plan users', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const { user: pendingUser } = createUser(testDb);
|
||
insertMember(plan.id, pendingUser.id, 'pending');
|
||
|
||
const users = await svc.getPlanUsers(plan.id);
|
||
expect(users.map(u => u.id)).not.toContain(pendingUser.id);
|
||
});
|
||
|
||
it('VACAY-SVC-011: returns empty array for a non-existent plan id', async () => {
|
||
const users = await svc.getPlanUsers(99999);
|
||
expect(users).toEqual([]);
|
||
});
|
||
});
|
||
|
||
// ── migrateHolidayCalendars ───────────────────────────────────────────────────
|
||
|
||
describe('migrateHolidayCalendars', () => {
|
||
it('VACAY-SVC-012: does nothing when holidays_enabled is falsy', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const planRow = { ...plan, holidays_enabled: 0, holidays_region: 'DE' };
|
||
|
||
await svc.migrateHolidayCalendars(plan.id, planRow);
|
||
|
||
const rows = testDb
|
||
.prepare('SELECT * FROM vacay_holiday_calendars WHERE plan_id = ?')
|
||
.all(plan.id);
|
||
expect(rows).toHaveLength(0);
|
||
});
|
||
|
||
it('VACAY-SVC-013: inserts a calendar row when holidays_enabled=1 and holidays_region is set', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const planRow = { ...plan, holidays_enabled: 1, holidays_region: 'DE' };
|
||
|
||
await svc.migrateHolidayCalendars(plan.id, planRow);
|
||
|
||
const rows = testDb
|
||
.prepare('SELECT * FROM vacay_holiday_calendars WHERE plan_id = ?')
|
||
.all(plan.id) as { region: string }[];
|
||
expect(rows).toHaveLength(1);
|
||
expect(rows[0].region).toBe('DE');
|
||
});
|
||
|
||
it('VACAY-SVC-014: does nothing if a calendar row already exists (no duplicate)', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const planRow = { ...plan, holidays_enabled: 1, holidays_region: 'FR' };
|
||
|
||
await svc.migrateHolidayCalendars(plan.id, planRow);
|
||
// Call a second time — should NOT insert another row
|
||
await svc.migrateHolidayCalendars(plan.id, planRow);
|
||
|
||
const rows = testDb
|
||
.prepare('SELECT * FROM vacay_holiday_calendars WHERE plan_id = ?')
|
||
.all(plan.id);
|
||
expect(rows).toHaveLength(1);
|
||
});
|
||
});
|
||
|
||
// ── updatePlan ────────────────────────────────────────────────────────────────
|
||
|
||
describe('updatePlan', () => {
|
||
it('VACAY-SVC-015: updates block_weekends flag', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
await svc.updatePlan(plan.id, { block_weekends: true }, undefined);
|
||
|
||
const updated = testDb
|
||
.prepare('SELECT block_weekends FROM vacay_plans WHERE id = ?')
|
||
.get(plan.id) as { block_weekends: number };
|
||
expect(updated.block_weekends).toBe(1);
|
||
});
|
||
|
||
it('VACAY-SVC-016: updates holidays_enabled flag', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
await svc.updatePlan(plan.id, { holidays_enabled: true }, undefined);
|
||
|
||
const updated = testDb
|
||
.prepare('SELECT holidays_enabled FROM vacay_plans WHERE id = ?')
|
||
.get(plan.id) as { holidays_enabled: number };
|
||
expect(updated.holidays_enabled).toBe(1);
|
||
});
|
||
|
||
it('VACAY-SVC-017: returns the updated plan object with boolean-coerced flags', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.updatePlan(plan.id, { block_weekends: false }, undefined);
|
||
|
||
expect(result.plan.block_weekends).toBe(false);
|
||
expect(typeof result.plan.holidays_enabled).toBe('boolean');
|
||
});
|
||
|
||
it('VACAY-SVC-018: resets carried_over to 0 for all user_years when carry_over_enabled is set to false', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
// Manually set a non-zero carried_over value
|
||
testDb
|
||
.prepare('UPDATE vacay_user_years SET carried_over = 5 WHERE user_id = ? AND plan_id = ? AND year = ?')
|
||
.run(user.id, plan.id, yr);
|
||
|
||
await svc.updatePlan(plan.id, { carry_over_enabled: false }, undefined);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT carried_over FROM vacay_user_years WHERE user_id = ? AND plan_id = ? AND year = ?')
|
||
.get(user.id, plan.id, yr) as { carried_over: number };
|
||
expect(row.carried_over).toBe(0);
|
||
});
|
||
});
|
||
|
||
// ── addHolidayCalendar ────────────────────────────────────────────────────────
|
||
|
||
describe('addHolidayCalendar', () => {
|
||
it('validates manual region references for creates and updates', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
testDb.prepare("INSERT INTO school_holiday_countries (code, name) VALUES ('US', 'USA')").run();
|
||
const inserted = testDb.prepare("INSERT INTO school_holiday_regions (country, name) VALUES ('US', 'Seattle')").run();
|
||
const code = `US-MANUAL-${inserted.lastInsertRowid}`;
|
||
const calendar = await svc.addHolidayCalendar(plan.id, code, null, undefined, 0, undefined, 'school_holiday');
|
||
expect(calendar.region).toBe(code);
|
||
expect((await svc.updateHolidayCalendar(calendar.id, plan.id, { label: 'School' }, undefined))?.region).toBe(code);
|
||
await expect(svc.updateHolidayCalendar(calendar.id, plan.id, { type: 'public_holiday' }, undefined)).rejects.toThrow('Unknown manual');
|
||
for (const region of ['US-MANUAL-0', 'US-MANUAL-999999', `CA-MANUAL-${inserted.lastInsertRowid}`]) {
|
||
await expect(svc.addHolidayCalendar(plan.id, region, null, undefined, 0, undefined, 'school_holiday')).rejects.toThrow('Unknown manual');
|
||
}
|
||
});
|
||
it('VACAY-SVC-019: inserts a new calendar row and returns the calendar object', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
const cal = await svc.addHolidayCalendar(plan.id, 'GB', 'UK Holidays', '#ff0000', 0, undefined);
|
||
|
||
expect(cal).toBeDefined();
|
||
expect(cal.id).toBeGreaterThan(0);
|
||
expect(cal.region).toBe('GB');
|
||
expect(cal.label).toBe('UK Holidays');
|
||
expect(cal.color).toBe('#ff0000');
|
||
});
|
||
|
||
it('VACAY-SVC-020: uses default color #fecaca when no color is provided', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
const cal = await svc.addHolidayCalendar(plan.id, 'US', null, undefined, 0, undefined);
|
||
|
||
expect(cal.color).toBe('#fecaca');
|
||
});
|
||
});
|
||
|
||
// ── updateHolidayCalendar ─────────────────────────────────────────────────────
|
||
|
||
describe('updateHolidayCalendar', () => {
|
||
it('VACAY-SVC-021: changes label and color on an existing calendar', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const cal = await svc.addHolidayCalendar(plan.id, 'DE', 'Germany', '#aabbcc', 0, undefined);
|
||
|
||
const updated = await svc.updateHolidayCalendar(cal.id, plan.id, { label: 'Deutschland', color: '#112233' }, undefined);
|
||
|
||
expect(updated).not.toBeNull();
|
||
expect(updated!.label).toBe('Deutschland');
|
||
expect(updated!.color).toBe('#112233');
|
||
});
|
||
|
||
it('VACAY-SVC-022: returns null when the calendar id does not exist in the plan', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.updateHolidayCalendar(99999, plan.id, { label: 'Nope' }, undefined);
|
||
|
||
expect(result).toBeNull();
|
||
});
|
||
});
|
||
|
||
// ── deleteHolidayCalendar ─────────────────────────────────────────────────────
|
||
|
||
describe('deleteHolidayCalendar', () => {
|
||
it('VACAY-SVC-023: removes the calendar row and returns true on success', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const cal = await svc.addHolidayCalendar(plan.id, 'FR', null, undefined, 0, undefined);
|
||
|
||
const result = await svc.deleteHolidayCalendar(cal.id, plan.id, undefined);
|
||
|
||
expect(result).toBe(true);
|
||
const row = testDb.prepare('SELECT id FROM vacay_holiday_calendars WHERE id = ?').get(cal.id);
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-024: returns false when the calendar does not exist', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.deleteHolidayCalendar(99999, plan.id, undefined);
|
||
|
||
expect(result).toBe(false);
|
||
});
|
||
});
|
||
|
||
// ── setUserColor ──────────────────────────────────────────────────────────────
|
||
|
||
describe('setUserColor', () => {
|
||
it('VACAY-SVC-025: inserts a color for a user in a plan', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
await svc.setUserColor(user.id, plan.id, '#123456', undefined);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT color FROM vacay_user_colors WHERE user_id = ? AND plan_id = ?')
|
||
.get(user.id, plan.id) as { color: string } | undefined;
|
||
expect(row?.color).toBe('#123456');
|
||
});
|
||
|
||
it('VACAY-SVC-026: updates the color when called a second time (upsert)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.setUserColor(user.id, plan.id, '#aaaaaa', undefined);
|
||
|
||
await svc.setUserColor(user.id, plan.id, '#bbbbbb', undefined);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT color FROM vacay_user_colors WHERE user_id = ? AND plan_id = ?')
|
||
.get(user.id, plan.id) as { color: string };
|
||
expect(row.color).toBe('#bbbbbb');
|
||
});
|
||
});
|
||
|
||
// ── listYears / addYear / deleteYear ──────────────────────────────────────────
|
||
|
||
describe('listYears', () => {
|
||
it('VACAY-SVC-027: returns the seeded current year for a freshly created plan', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
const years = await svc.listYears(plan.id);
|
||
|
||
expect(years).toContain(yr);
|
||
});
|
||
});
|
||
|
||
describe('addYear', () => {
|
||
it('VACAY-SVC-028: inserts a new year and creates a user_year record', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const newYear = new Date().getFullYear() + 2;
|
||
|
||
await svc.addYear(plan.id, newYear, undefined);
|
||
|
||
const years = await svc.listYears(plan.id);
|
||
expect(years).toContain(newYear);
|
||
|
||
const userYear = testDb
|
||
.prepare('SELECT * FROM vacay_user_years WHERE user_id = ? AND plan_id = ? AND year = ?')
|
||
.get(user.id, plan.id, newYear) as { vacation_days: number } | undefined;
|
||
expect(userYear).toBeDefined();
|
||
expect(userYear!.vacation_days).toBe(30);
|
||
});
|
||
|
||
it('VACAY-SVC-029: carries over remaining days to the new year when carry_over_enabled is true', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const currentYear = new Date().getFullYear();
|
||
const nextYear = currentYear + 1;
|
||
|
||
// Enable carry-over and seed some entries for the current year
|
||
testDb.prepare('UPDATE vacay_plans SET carry_over_enabled = 1 WHERE id = ?').run(plan.id);
|
||
// Ensure current year row exists with 10 vacation days
|
||
testDb.prepare(`
|
||
INSERT OR REPLACE INTO vacay_user_years (user_id, plan_id, year, vacation_days, carried_over)
|
||
VALUES (?, ?, ?, 10, 0)
|
||
`).run(user.id, plan.id, currentYear);
|
||
// Add 3 entries (used days) in the current year
|
||
for (let day = 1; day <= 3; day++) {
|
||
const dateStr = `${currentYear}-06-0${day}`;
|
||
testDb.prepare('INSERT OR IGNORE INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, user.id, dateStr, '');
|
||
}
|
||
|
||
await svc.addYear(plan.id, nextYear, undefined);
|
||
|
||
const userYear = testDb
|
||
.prepare('SELECT carried_over FROM vacay_user_years WHERE user_id = ? AND plan_id = ? AND year = ?')
|
||
.get(user.id, plan.id, nextYear) as { carried_over: number } | undefined;
|
||
// 10 vacation days - 3 used = 7 carried over
|
||
expect(userYear?.carried_over).toBe(7);
|
||
});
|
||
});
|
||
|
||
describe('deleteYear', () => {
|
||
it('VACAY-SVC-030: removes the year row and its associated entries', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const targetYear = new Date().getFullYear() + 3;
|
||
|
||
await svc.addYear(plan.id, targetYear, undefined);
|
||
// Insert an entry for that year
|
||
testDb
|
||
.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)')
|
||
.run(plan.id, user.id, `${targetYear}-07-15`, '');
|
||
|
||
await svc.deleteYear(plan.id, targetYear, undefined);
|
||
|
||
const yearRow = testDb
|
||
.prepare('SELECT * FROM vacay_years WHERE plan_id = ? AND year = ?')
|
||
.get(plan.id, targetYear);
|
||
expect(yearRow).toBeUndefined();
|
||
|
||
const entries = testDb
|
||
.prepare("SELECT * FROM vacay_entries WHERE plan_id = ? AND date LIKE ?")
|
||
.all(plan.id, `${targetYear}-%`);
|
||
expect(entries).toHaveLength(0);
|
||
});
|
||
|
||
it('VACAY-SVC-030a (VC102 parity): touches only each author\'s OWN leave-year window, not one shared window across a fused plan', async () => {
|
||
// Two members of the SAME plan on genuinely different leave-year shapes
|
||
// (#737): userA stays on the default calendar year, userB is fiscal
|
||
// (Apr 1 start). deleteYear(planId, 2026) must delete userA's entry that
|
||
// falls in A's calendar-2026 window and userB's entry that falls in B's
|
||
// fiscal-2026 window, while leaving each author's OWN neighbouring-period
|
||
// entry untouched — a shortcut that computed ONE shared window (off
|
||
// either the plan or either single author) and reused it across both
|
||
// authors would either strand entries or delete another member's rows on
|
||
// their differently-shaped year.
|
||
const { user: userA, plan } = await setupUserWithPlan();
|
||
const { user: userB } = createUser(testDb);
|
||
await svc.getOwnPlan(userB.id);
|
||
insertMember(plan.id, userB.id, 'accepted');
|
||
await svc.updateYearSettings(userB.id, { year_type: 'fiscal', year_start_month: 4, year_start_day: 1 });
|
||
await svc.addYear(plan.id, 2026, undefined);
|
||
|
||
const insertEntry = (userId: number, date: string) =>
|
||
testDb.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, userId, date, '');
|
||
insertEntry(userA.id, '2026-02-10'); // inside A's CALENDAR 2026 window [2026-01-01, 2027-01-01) — must be deleted
|
||
insertEntry(userA.id, '2025-11-01'); // inside A's CALENDAR 2025 window — must survive
|
||
insertEntry(userB.id, '2026-02-10'); // inside B's FISCAL 2025 window [2025-04-01, 2026-04-01) — must survive
|
||
insertEntry(userB.id, '2026-05-10'); // inside B's FISCAL 2026 window [2026-04-01, 2027-04-01) — must be deleted
|
||
|
||
await svc.deleteYear(plan.id, 2026, undefined);
|
||
|
||
const remaining = testDb.prepare('SELECT user_id, date FROM vacay_entries WHERE plan_id = ? ORDER BY user_id, date').all(plan.id);
|
||
expect(remaining).toEqual([
|
||
{ user_id: userA.id, date: '2025-11-01' },
|
||
{ user_id: userB.id, date: '2026-02-10' },
|
||
]);
|
||
});
|
||
});
|
||
|
||
// ── shiftOwnerEntriesForTripWindow (VC4 restructured date-diff shape) ─────────
|
||
|
||
describe('shiftOwnerEntriesForTripWindow', () => {
|
||
it('VACAY-SVC-030b (VC4 parity): shifts an entry by the exact calendar-day offset between the old and new trip start, across several date-pair shapes incl. a leap-year boundary', async () => {
|
||
// R9's verified restructured shape (task-0-report.md): plain JS
|
||
// Math.round((Date.parse(newStart) - Date.parse(oldStart)) / 86400000)
|
||
// in place of the legacy CAST(julianday(?) - julianday(?) AS INTEGER) —
|
||
// verified there against the SQL on 5 date pairs incl. a leap-year
|
||
// boundary and a negative offset, all matched exactly. This proves the
|
||
// SAME arithmetic end-to-end through the converted service method.
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const cases: [oldStart: string, oldEnd: string, newStart: string, entryDate: string, expectedShifted: string][] = [
|
||
['2026-03-01', '2026-03-10', '2026-03-06', '2026-03-05', '2026-03-10'], // +5 days
|
||
['2024-02-25', '2024-03-05', '2024-02-28', '2024-03-01', '2024-03-04'], // leap-year boundary, +3 days
|
||
['2026-06-10', '2026-06-20', '2026-06-03', '2026-06-15', '2026-06-08'], // -7 days
|
||
];
|
||
for (const [oldStart, oldEnd, newStart, entryDate, expectedShifted] of cases) {
|
||
testDb.prepare('DELETE FROM vacay_entries WHERE plan_id = ?').run(plan.id);
|
||
testDb.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, user.id, entryDate, '');
|
||
|
||
await svc.shiftOwnerEntriesForTripWindow(user.id, oldStart, oldEnd, newStart);
|
||
|
||
const row = testDb.prepare('SELECT date FROM vacay_entries WHERE plan_id = ? AND user_id = ?').get(plan.id, user.id) as { date: string };
|
||
expect(row.date).toBe(expectedShifted);
|
||
}
|
||
});
|
||
|
||
it('VACAY-SVC-030c: a zero offset is a no-op (no write at all)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, user.id, '2026-05-05', '');
|
||
|
||
await svc.shiftOwnerEntriesForTripWindow(user.id, '2026-05-01', '2026-05-10', '2026-05-01');
|
||
|
||
const row = testDb.prepare('SELECT date FROM vacay_entries WHERE plan_id = ? AND user_id = ?').get(plan.id, user.id) as { date: string };
|
||
expect(row.date).toBe('2026-05-05');
|
||
});
|
||
|
||
it('VACAY-SVC-030d (M2 parity): an unparseable start (garbage) resolves as a no-op, same as legacy\'s NULL-julianday offset of 0, instead of writing a NaN date', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, user.id, '2026-05-05', '');
|
||
|
||
await expect(svc.shiftOwnerEntriesForTripWindow(user.id, '2026-05-01', '2026-05-10', 'soon')).resolves.toBeUndefined();
|
||
|
||
const row = testDb.prepare('SELECT date FROM vacay_entries WHERE plan_id = ? AND user_id = ?').get(plan.id, user.id) as { date: string };
|
||
expect(row.date).toBe('2026-05-05');
|
||
});
|
||
|
||
it('VACAY-SVC-030e (M2 parity): a datetime start with no zone suffix is parsed as UTC and truncated, matching base\'s CAST(julianday(...) AS INTEGER) rather than a local-time round', async () => {
|
||
// base: CAST(julianday('2025-06-12T23:30') - julianday('2025-06-10') AS INTEGER) = 2
|
||
// (2 days 23.5 hours, truncated toward zero) — a local-time Date.parse +
|
||
// Math.round of the same pair computed 3 instead (task-7-review.md M2).
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, user.id, '2025-06-15', '');
|
||
|
||
await svc.shiftOwnerEntriesForTripWindow(user.id, '2025-06-10', '2025-06-20', '2025-06-12T23:30');
|
||
|
||
const row = testDb.prepare('SELECT date FROM vacay_entries WHERE plan_id = ? AND user_id = ?').get(plan.id, user.id) as { date: string };
|
||
expect(row.date).toBe('2025-06-17');
|
||
});
|
||
|
||
it('VACAY-SVC-030f (M1 parity): consecutive-day entries inserted in descending-id order shift to the rowid-ordered (legacy) outcome, not the date-index-ordered one', async () => {
|
||
// Legacy's single `UPDATE OR IGNORE` walks rows in rowid order.
|
||
// VacayEntriesRepository.shiftForOwnerWindow's `find` had no `orderBy`, so
|
||
// SQLite returned candidates in (user, plan, date) index order instead —
|
||
// a different per-row collision check skips different rows
|
||
// (task-7-review.md M1). Inserting the latest date first makes the id
|
||
// order run opposite the date order, so the two orderings disagree.
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const insertEntry = (date: string) =>
|
||
testDb.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)').run(plan.id, user.id, date, '');
|
||
const readDates = () =>
|
||
(testDb.prepare('SELECT date FROM vacay_entries WHERE plan_id = ? AND user_id = ? ORDER BY date').all(plan.id, user.id) as { date: string }[]).map(
|
||
(r) => r.date,
|
||
);
|
||
|
||
insertEntry('2026-07-12');
|
||
insertEntry('2026-07-11');
|
||
insertEntry('2026-07-10');
|
||
|
||
await svc.shiftOwnerEntriesForTripWindow(user.id, '2026-07-01', '2026-07-20', '2026-07-02'); // offset +1
|
||
expect(readDates()).toEqual(['2026-07-11', '2026-07-12', '2026-07-13']);
|
||
|
||
testDb.prepare('DELETE FROM vacay_entries WHERE plan_id = ?').run(plan.id);
|
||
insertEntry('2026-07-12');
|
||
insertEntry('2026-07-11');
|
||
insertEntry('2026-07-10');
|
||
|
||
await svc.shiftOwnerEntriesForTripWindow(user.id, '2026-07-02', '2026-07-21', '2026-07-01'); // offset -1
|
||
expect(readDates()).toEqual(['2026-07-09', '2026-07-11', '2026-07-12']);
|
||
});
|
||
});
|
||
|
||
// ── getEntries / toggleEntry ──────────────────────────────────────────────────
|
||
|
||
describe('getEntries', () => {
|
||
it('VACAY-SVC-031: returns empty entries and companyHolidays for a new plan+year', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear().toString();
|
||
|
||
const result = await svc.getEntries(plan.id, yr);
|
||
|
||
expect(result.entries).toEqual([]);
|
||
expect(result.companyHolidays).toEqual([]);
|
||
});
|
||
|
||
it('VACAY-SVC-031a (VC111 parity): full-key toEqual against the legacy statement run raw on the same seeded rows', async () => {
|
||
// A fused plan across all three leave-year-window shapes (#737), every
|
||
// fraction/kind combination, and a member left on the default color to
|
||
// exercise the COALESCE(c.color, '#6366f1') fallback branch too — rule
|
||
// 19's "fully seeded" bar for this read model.
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
allowWeekends(plan.id);
|
||
const { user: userB } = createUser(testDb);
|
||
const { user: userC } = createUser(testDb);
|
||
await svc.getOwnPlan(userB.id);
|
||
await svc.getOwnPlan(userC.id);
|
||
insertMember(plan.id, userB.id, 'accepted');
|
||
insertMember(plan.id, userC.id, 'accepted');
|
||
await svc.updateYearSettings(userB.id, { year_type: 'fiscal', year_start_month: 4, year_start_day: 1 });
|
||
await svc.updateYearSettings(userC.id, { year_type: 'anniversary', hire_date: '2020-06-15' });
|
||
await svc.setUserColor(owner.id, plan.id, '#111111', undefined);
|
||
await svc.setUserColor(userB.id, plan.id, '#222222', undefined);
|
||
// userC keeps whatever color getOwnPlan seeded by default — not
|
||
// re-set here, so its row exercises the LEFT JOIN's COALESCE fallback
|
||
// the same way a row with no vacay_user_colors match would.
|
||
|
||
await svc.toggleEntry(owner.id, plan.id, '2026-02-10', 1, 'vacation');
|
||
await svc.toggleEntry(userB.id, plan.id, '2026-05-05', 0.5, 'vacation');
|
||
await svc.toggleEntry(userC.id, plan.id, '2026-08-20', 1, 'comp');
|
||
|
||
const result = await svc.getEntries(plan.id, '2026', owner.id);
|
||
|
||
const legacy = testDb.prepare(`
|
||
SELECT e.*, u.username as person_name, COALESCE(c.color, '#6366f1') as person_color
|
||
FROM vacay_entries e
|
||
JOIN users u ON e.user_id = u.id
|
||
LEFT JOIN vacay_user_colors c ON c.user_id = e.user_id AND c.plan_id = e.plan_id
|
||
WHERE e.plan_id = ? AND e.date >= ? AND e.date < ?
|
||
`).all(plan.id, '2026-01-01', '2027-01-01') as { id: number }[];
|
||
|
||
expect(legacy).toHaveLength(3);
|
||
const byId = <T extends { id: number }>(rows: T[]) => [...rows].sort((a, b) => a.id - b.id);
|
||
expect(byId(result.entries as { id: number }[])).toEqual(byId(legacy));
|
||
});
|
||
});
|
||
|
||
describe('toggleEntry', () => {
|
||
it('VACAY-SVC-032: adds an entry on first call (action: added)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-08-01', undefined);
|
||
|
||
expect(result.action).toBe('added');
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-08-01');
|
||
expect(row).toBeDefined();
|
||
});
|
||
|
||
it('VACAY-SVC-033: removes the entry on second call (action: removed)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2025-08-04', undefined);
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-08-04', undefined);
|
||
|
||
expect(result.action).toBe('removed');
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-08-04');
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-033a: logs a half day when fraction is 0.5 (#552)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-08-05', 0.5);
|
||
|
||
expect(result).toMatchObject({ action: 'added', fraction: 0.5 });
|
||
const row = testDb
|
||
.prepare('SELECT fraction FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-08-05') as { fraction: number };
|
||
expect(row.fraction).toBe(0.5);
|
||
});
|
||
|
||
it('VACAY-SVC-033b: converts a full day into a half day in place (action: updated)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2025-08-06', 1);
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-08-06', 0.5);
|
||
|
||
expect(result).toMatchObject({ action: 'updated', fraction: 0.5 });
|
||
const row = testDb
|
||
.prepare('SELECT fraction FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-08-06') as { fraction: number };
|
||
expect(row.fraction).toBe(0.5);
|
||
});
|
||
|
||
it('VACAY-SVC-033c: toggling the same half day again clears it (action: removed)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2025-08-07', 0.5);
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-08-07', 0.5);
|
||
|
||
expect(result.action).toBe('removed');
|
||
const row = testDb
|
||
.prepare('SELECT id FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-08-07');
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
// Weekend blocking (I-02): plans default to block_weekends = 1 / weekend_days '0,6'.
|
||
it('VACAY-SVC-033d: rejects a blocked weekend day with error weekend_blocked (I-02)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-07-19', undefined); // Saturday
|
||
|
||
expect(result).toEqual({ error: 'weekend_blocked' });
|
||
const row = testDb
|
||
.prepare('SELECT id FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-07-19');
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-033e: accepts a non-weekend day on a blocking plan', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-07-16', undefined); // Wednesday
|
||
|
||
expect(result).toMatchObject({ action: 'added' });
|
||
});
|
||
|
||
it('VACAY-SVC-033f: accepts a weekend day when block_weekends is off', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare('UPDATE vacay_plans SET block_weekends = 0 WHERE id = ?').run(plan.id);
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-07-19', undefined); // Saturday
|
||
|
||
expect(result).toMatchObject({ action: 'added' });
|
||
});
|
||
|
||
it('VACAY-SVC-033g: honours custom weekend_days (5,6 blocks Friday, frees Sunday)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare("UPDATE vacay_plans SET weekend_days = '5,6' WHERE id = ?").run(plan.id);
|
||
|
||
expect(await svc.toggleEntry(user.id, plan.id, '2025-07-18', undefined)).toEqual({ error: 'weekend_blocked' }); // Friday
|
||
expect(await svc.toggleEntry(user.id, plan.id, '2025-07-20', undefined)).toMatchObject({ action: 'added' }); // Sunday
|
||
});
|
||
|
||
it('VACAY-SVC-033h: a NULL weekend_days column falls back to Sat/Sun', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare('UPDATE vacay_plans SET weekend_days = NULL WHERE id = ?').run(plan.id);
|
||
|
||
expect(await svc.toggleEntry(user.id, plan.id, '2025-07-19', undefined)).toEqual({ error: 'weekend_blocked' }); // Saturday
|
||
});
|
||
|
||
it('VACAY-SVC-033i: still removes an existing entry on a blocked day (stray-data cleanup)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb
|
||
.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note, fraction, kind) VALUES (?, ?, ?, ?, ?, ?)')
|
||
.run(plan.id, user.id, '2025-07-19', '', 1, 'vacation');
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-07-19', 1, 'vacation');
|
||
|
||
expect(result.action).toBe('removed');
|
||
const row = testDb
|
||
.prepare('SELECT id FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-07-19');
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-033j: refuses to convert an existing entry in place on a blocked day', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb
|
||
.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note, fraction, kind) VALUES (?, ?, ?, ?, ?, ?)')
|
||
.run(plan.id, user.id, '2025-07-19', '', 0.5, 'vacation');
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-07-19', 1, 'vacation');
|
||
|
||
expect(result).toEqual({ error: 'weekend_blocked' });
|
||
const row = testDb
|
||
.prepare('SELECT fraction FROM vacay_entries WHERE user_id = ? AND plan_id = ? AND date = ?')
|
||
.get(user.id, plan.id, '2025-07-19') as { fraction: number };
|
||
expect(row.fraction).toBe(0.5);
|
||
});
|
||
});
|
||
|
||
// ── toggleCompanyHoliday ──────────────────────────────────────────────────────
|
||
|
||
describe('toggleCompanyHoliday', () => {
|
||
it('VACAY-SVC-034: adds a company holiday on first call (action: added)', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
const result = await svc.toggleCompanyHoliday(plan.id, '2025-12-25', 'Christmas', undefined);
|
||
|
||
expect(result.action).toBe('added');
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_company_holidays WHERE plan_id = ? AND date = ?')
|
||
.get(plan.id, '2025-12-25');
|
||
expect(row).toBeDefined();
|
||
});
|
||
|
||
it('VACAY-SVC-035: removes the company holiday on second call (action: removed)', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
|
||
await svc.toggleCompanyHoliday(plan.id, '2025-12-26', 'Boxing Day', undefined);
|
||
const result = await svc.toggleCompanyHoliday(plan.id, '2025-12-26', undefined, undefined);
|
||
|
||
expect(result.action).toBe('removed');
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_company_holidays WHERE plan_id = ? AND date = ?')
|
||
.get(plan.id, '2025-12-26');
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-036: adding a company holiday removes any existing vacay_entry on that date', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
|
||
// First add a personal entry on that date
|
||
await svc.toggleEntry(user.id, plan.id, '2025-05-01', undefined);
|
||
|
||
// Now declare it a company holiday — the personal entry should be wiped
|
||
await svc.toggleCompanyHoliday(plan.id, '2025-05-01', 'Labour Day', undefined);
|
||
|
||
const personalEntry = testDb
|
||
.prepare('SELECT * FROM vacay_entries WHERE plan_id = ? AND date = ?')
|
||
.get(plan.id, '2025-05-01');
|
||
expect(personalEntry).toBeUndefined();
|
||
});
|
||
});
|
||
|
||
describe('half company holidays (#2439)', () => {
|
||
const entryOf = (planId: number, date: string) =>
|
||
testDb.prepare('SELECT fraction FROM vacay_entries WHERE plan_id = ? AND date = ?').get(planId, date) as { fraction: number } | undefined;
|
||
const holidayOf = (planId: number, date: string) =>
|
||
testDb.prepare('SELECT fraction FROM vacay_company_holidays WHERE plan_id = ? AND date = ?').get(planId, date) as { fraction: number } | undefined;
|
||
|
||
it('VACAY-SVC-036b: a half company holiday halves a whole vacation day instead of wiping it', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.toggleEntry(user.id, plan.id, '2025-12-24', 1);
|
||
expect(await svc.toggleCompanyHoliday(plan.id, '2025-12-24', 'Christmas Eve', undefined, 0.5)).toEqual({ action: 'added', fraction: 0.5 });
|
||
expect(entryOf(plan.id, '2025-12-24')?.fraction).toBe(0.5);
|
||
expect(holidayOf(plan.id, '2025-12-24')?.fraction).toBe(0.5);
|
||
});
|
||
|
||
it('VACAY-SVC-036c: the other size converts the holiday, the same size clears it', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.toggleCompanyHoliday(plan.id, '2025-12-31', undefined, undefined, 0.5);
|
||
await svc.toggleEntry(user.id, plan.id, '2025-12-31', 0.5);
|
||
expect(await svc.toggleCompanyHoliday(plan.id, '2025-12-31', undefined, undefined, 1)).toEqual({ action: 'updated', fraction: 1 });
|
||
expect(entryOf(plan.id, '2025-12-31')).toBeUndefined();
|
||
expect(await svc.toggleCompanyHoliday(plan.id, '2025-12-31', undefined, undefined, 1)).toEqual({ action: 'removed' });
|
||
expect(holidayOf(plan.id, '2025-12-31')).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-036d: leave on a half company holiday is half a day, whatever was asked', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
testDb.prepare('UPDATE vacay_plans SET company_holidays_enabled = 1 WHERE id = ?').run(plan.id);
|
||
await svc.toggleCompanyHoliday(plan.id, '2025-12-24', undefined, undefined, 0.5);
|
||
expect(await svc.toggleEntry(user.id, plan.id, '2025-12-24', 1)).toMatchObject({ action: 'added', fraction: 0.5 });
|
||
});
|
||
});
|
||
|
||
// ── acceptInvite / declineInvite / cancelInvite ───────────────────────────────
|
||
|
||
describe('acceptInvite', () => {
|
||
it('VACAY-SVC-037: changes membership status to accepted', async () => {
|
||
const { user: owner, plan: ownerPlan } = await setupUserWithPlan();
|
||
const { user: invitee } = createUser(testDb);
|
||
await svc.getOwnPlan(invitee.id); // ensure own plan exists for data migration path
|
||
insertMember(ownerPlan.id, invitee.id, 'pending');
|
||
|
||
const result = await svc.acceptInvite(invitee.id, ownerPlan.id, undefined);
|
||
|
||
expect(result.error).toBeUndefined();
|
||
const row = testDb
|
||
.prepare('SELECT status FROM vacay_plan_members WHERE plan_id = ? AND user_id = ?')
|
||
.get(ownerPlan.id, invitee.id) as { status: string } | undefined;
|
||
expect(row?.status).toBe('accepted');
|
||
});
|
||
|
||
it('VACAY-SVC-038: returns 404 error when there is no pending invite', async () => {
|
||
const { user } = createUser(testDb);
|
||
|
||
const result = await svc.acceptInvite(user.id, 99999, undefined);
|
||
|
||
expect(result.status).toBe(404);
|
||
expect(result.error).toBeDefined();
|
||
});
|
||
|
||
it('VACAY-SVC-039: accepted member becomes visible via getActivePlan', async () => {
|
||
const { user: owner, plan: ownerPlan } = await setupUserWithPlan();
|
||
const { user: invitee } = createUser(testDb);
|
||
await svc.getOwnPlan(invitee.id);
|
||
insertMember(ownerPlan.id, invitee.id, 'pending');
|
||
|
||
await svc.acceptInvite(invitee.id, ownerPlan.id, undefined);
|
||
|
||
const active = await svc.getActivePlan(invitee.id);
|
||
expect(active.id).toBe(ownerPlan.id);
|
||
});
|
||
});
|
||
|
||
describe('declineInvite', () => {
|
||
it('VACAY-SVC-040: removes the pending invite row', async () => {
|
||
const { user: owner, plan: ownerPlan } = await setupUserWithPlan();
|
||
const { user: invitee } = createUser(testDb);
|
||
insertMember(ownerPlan.id, invitee.id, 'pending');
|
||
|
||
await svc.declineInvite(invitee.id, ownerPlan.id, undefined);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_plan_members WHERE plan_id = ? AND user_id = ?')
|
||
.get(ownerPlan.id, invitee.id);
|
||
expect(row).toBeUndefined();
|
||
});
|
||
});
|
||
|
||
describe('cancelInvite', () => {
|
||
it('VACAY-SVC-041: removes the pending invite when owner cancels it', async () => {
|
||
const { user: owner, plan: ownerPlan } = await setupUserWithPlan();
|
||
const { user: target } = createUser(testDb);
|
||
insertMember(ownerPlan.id, target.id, 'pending');
|
||
|
||
await svc.cancelInvite(ownerPlan.id, target.id);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_plan_members WHERE plan_id = ? AND user_id = ?')
|
||
.get(ownerPlan.id, target.id);
|
||
expect(row).toBeUndefined();
|
||
});
|
||
});
|
||
|
||
// ── getAvailableUsers ─────────────────────────────────────────────────────────
|
||
|
||
describe('getAvailableUsers', () => {
|
||
it('VACAY-SVC-042: returns users not already in the plan and not fused elsewhere', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: unrelated } = createUser(testDb);
|
||
await svc.getOwnPlan(unrelated.id);
|
||
|
||
const available = await svc.getAvailableUsers(owner.id, plan.id) as { id: number }[];
|
||
|
||
expect(available.map(u => u.id)).toContain(unrelated.id);
|
||
// Owner themselves should NOT appear (excluded by u.id != ?)
|
||
expect(available.map(u => u.id)).not.toContain(owner.id);
|
||
});
|
||
|
||
it('VACAY-SVC-043: excludes users who already have an accepted membership in any plan', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: alreadyFused } = createUser(testDb);
|
||
const { plan: otherPlan } = await setupUserWithPlan();
|
||
insertMember(otherPlan.id, alreadyFused.id, 'accepted');
|
||
|
||
const available = await svc.getAvailableUsers(owner.id, plan.id) as { id: number }[];
|
||
|
||
expect(available.map(u => u.id)).not.toContain(alreadyFused.id);
|
||
});
|
||
|
||
// #2112 — guests are trip-scoped accounts, and every other directory in the app
|
||
// already leaves them out. Vacay's two pickers did not, so a guest stayed
|
||
// selectable here even after being removed from the trip it was created for.
|
||
it('VACAY-SVC-073: guest accounts are not offered in the plan invite picker', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: guest } = createUser(testDb);
|
||
testDb.prepare('UPDATE users SET is_guest = 1 WHERE id = ?').run(guest.id);
|
||
|
||
const available = await svc.getAvailableUsers(owner.id, plan.id) as { id: number }[];
|
||
|
||
expect(available.map(u => u.id)).not.toContain(guest.id);
|
||
});
|
||
|
||
it('VACAY-SVC-074: guest accounts are not offered in the shared-calendar picker', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: guest } = createUser(testDb);
|
||
testDb.prepare('UPDATE users SET is_guest = 1 WHERE id = ?').run(guest.id);
|
||
|
||
const available = await svc.getShareAvailableUsers(owner.id) as { id: number }[];
|
||
|
||
expect(available.map(u => u.id)).not.toContain(guest.id);
|
||
});
|
||
|
||
it('VACAY-SVC-075: a guest id sent straight to the write paths is refused', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: guest } = createUser(testDb);
|
||
testDb.prepare('UPDATE users SET is_guest = 1 WHERE id = ?').run(guest.id);
|
||
|
||
// The picker is only a list. The id comes back from the client, and the MCP
|
||
// tools reach the same two methods, so refusing has to happen here.
|
||
const invited = await svc.sendInvite(plan.id, owner.id, 'owner', 'owner@example.test', guest.id);
|
||
expect(invited.error).toBe('User not found');
|
||
const shared = await svc.shareCalendar(owner.id, 'owner@example.test', guest.id);
|
||
expect(shared.error).toBe('User not found');
|
||
});
|
||
});
|
||
|
||
// ── getStats ──────────────────────────────────────────────────────────────────
|
||
|
||
describe('getStats', () => {
|
||
it('VACAY-SVC-044: returns per-user stats with correct fields', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats).toHaveLength(1);
|
||
expect(stats[0]).toMatchObject({
|
||
user_id: user.id,
|
||
year: yr,
|
||
vacation_days: 30,
|
||
used: 0,
|
||
remaining: 30,
|
||
});
|
||
});
|
||
|
||
it('VACAY-SVC-044a (L1 parity): a legacy NULL vacation_days/carried_over row passes through on the wire, not defaulted to 30/0', async () => {
|
||
// task-7-review.md L1: `?? 30`/`?? 0` on these nullable columns would show
|
||
// a fabricated default instead of the row's actual NULL — legacy bound
|
||
// them AS-IS. `total_available`/`remaining` still need a number, so the
|
||
// arithmetic null-coalesces separately, reproducing legacy's `null + n =
|
||
// n` coercion without lying about the row on the wire.
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
testDb.prepare('UPDATE vacay_user_years SET vacation_days = NULL, carried_over = NULL WHERE user_id = ? AND plan_id = ? AND year = ?').run(user.id, plan.id, yr);
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats[0].vacation_days).toBeNull();
|
||
expect(stats[0].carried_over).toBeNull();
|
||
expect(stats[0].total_available).toBe(0);
|
||
expect(stats[0].remaining).toBe(0);
|
||
});
|
||
|
||
it('VACAY-SVC-045: used reflects the actual number of entries for that user and year', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-10`, undefined);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-11`, undefined);
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats[0].used).toBe(2);
|
||
expect(stats[0].remaining).toBe(28);
|
||
});
|
||
|
||
it('VACAY-SVC-045a: half days count as 0.5 toward the used total (#552)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-12`, 1); // full day
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-13`, 0.5); // half day
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats[0].used).toBe(1.5);
|
||
expect(stats[0].remaining).toBe(28.5);
|
||
});
|
||
|
||
it('VACAY-SVC-045b: comp/flex days cost nothing (#1074)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-14`, 1, 'vacation');
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-15`, 1, 'comp');
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats[0].used).toBe(1);
|
||
expect(stats[0].remaining).toBe(29);
|
||
});
|
||
|
||
it('VACAY-SVC-045c: a half comp day also costs nothing (#1074)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-16`, 0.5, 'comp');
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats[0].used).toBe(0);
|
||
expect(stats[0].remaining).toBe(30);
|
||
});
|
||
|
||
it('VACAY-SVC-045d: comp_used reports comp days separately, summing fractions (#1074)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-17`, 1, 'comp');
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-18`, 0.5, 'comp');
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-19`, 1, 'vacation');
|
||
|
||
const stats = await svc.getStats(plan.id, yr);
|
||
|
||
expect(stats[0].comp_used).toBe(1.5);
|
||
expect(stats[0].used).toBe(1);
|
||
});
|
||
|
||
it('VACAY-SVC-045e: converting a vacation day to comp refunds it to the entitlement (#1074)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${yr}-09-20`, 1, 'vacation');
|
||
expect((await svc.getStats(plan.id, yr))[0].used).toBe(1);
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, `${yr}-09-20`, 1, 'comp');
|
||
|
||
expect(result).toMatchObject({ action: 'updated', kind: 'comp' });
|
||
expect((await svc.getStats(plan.id, yr))[0].used).toBe(0);
|
||
});
|
||
|
||
it('VACAY-SVC-045g: a rejected weekend toggle leaves used/remaining untouched (I-02)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.toggleEntry(user.id, plan.id, '2025-07-16', 1, 'vacation'); // Wednesday
|
||
const before = (await svc.getStats(plan.id, 2025))[0];
|
||
expect(before.used).toBe(1);
|
||
|
||
const result = await svc.toggleEntry(user.id, plan.id, '2025-07-19', 1, 'vacation'); // Saturday
|
||
|
||
expect(result).toEqual({ error: 'weekend_blocked' });
|
||
const after = (await svc.getStats(plan.id, 2025))[0];
|
||
expect(after.used).toBe(before.used);
|
||
expect(after.remaining).toBe(before.remaining);
|
||
});
|
||
|
||
it('VACAY-SVC-045f: getStats reports the window it counted over (#737)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7, year_start_day: 1 });
|
||
|
||
const stats = await svc.getStats(plan.id, 2026);
|
||
|
||
expect(stats[0]).toMatchObject({ window_start: '2026-07-01', window_end: '2027-07-01' });
|
||
});
|
||
});
|
||
|
||
// ── Configurable vacation year (#737) ─────────────────────────────────────────
|
||
|
||
describe('resolveYearWindow', () => {
|
||
it('VACAY-SVC-045g: defaults to the plain calendar year when nothing is configured', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-01-01', end: '2027-01-01' });
|
||
});
|
||
|
||
it('VACAY-SVC-045h: an explicit calendar setting resolves identically', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'calendar' });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-01-01', end: '2027-01-01' });
|
||
});
|
||
|
||
it('VACAY-SVC-045i: a fiscal year starts on the configured month and day', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 4, year_start_day: 6 });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-04-06', end: '2027-04-06' });
|
||
});
|
||
|
||
it('VACAY-SVC-045j: an anniversary year follows the hire date month and day', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'anniversary', hire_date: '2019-09-16' });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-09-16', end: '2027-09-16' });
|
||
});
|
||
|
||
it('VACAY-SVC-045k: an anniversary year without a hire date falls back to January 1', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'anniversary' });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-01-01', end: '2027-01-01' });
|
||
});
|
||
|
||
it('VACAY-SVC-045k1: an anniversary year ignores a month left behind by a previous fiscal setting', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
// What the settings UI sends when you pick Fiscal/April and then click
|
||
// "Hire date" before typing one — it carries the whole settings object.
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 4, year_start_day: 1 });
|
||
await svc.updateYearSettings(user.id, { year_type: 'anniversary', year_start_month: 4, year_start_day: 1, hire_date: null });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-01-01', end: '2027-01-01' });
|
||
});
|
||
|
||
it('VACAY-SVC-045k2: a Feb 29 hire date resolves to Feb 28, a boundary every year has', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'anniversary', hire_date: '2024-02-29' });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-02-28', end: '2027-02-28' });
|
||
});
|
||
|
||
it('VACAY-SVC-045k3: a fiscal day the month cannot have is clamped down to one it can', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 2, year_start_day: 31 });
|
||
|
||
expect(await svc.resolveYearWindow(user.id, 2026)).toEqual({ start: '2026-02-28', end: '2027-02-28' });
|
||
});
|
||
|
||
it('VACAY-SVC-045l: consecutive periods meet exactly, so the carry-over chain stays intact', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
|
||
expect((await svc.resolveYearWindow(user.id, 2025)).end).toBe((await svc.resolveYearWindow(user.id, 2026)).start);
|
||
});
|
||
});
|
||
|
||
describe('updateUserYearSettings', () => {
|
||
it('VACAY-SVC-045m: upserts, so a second call replaces the first', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7, year_start_day: 1 });
|
||
const saved = await svc.updateYearSettings(user.id, { year_type: 'calendar' });
|
||
|
||
expect(saved.year_type).toBe('calendar');
|
||
expect(testDb.prepare('SELECT COUNT(*) AS n FROM vacay_user_settings WHERE user_id = ?').get(user.id)).toEqual({ n: 1 });
|
||
});
|
||
|
||
it('VACAY-SVC-045n: clamps an out-of-range month and day instead of storing them', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
const saved = await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 99, year_start_day: 0 });
|
||
|
||
expect(saved.year_start_month).toBe(12);
|
||
expect(saved.year_start_day).toBe(1);
|
||
});
|
||
|
||
it('VACAY-SVC-045o: drops a malformed hire date rather than persisting it', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
const saved = await svc.updateYearSettings(user.id, { year_type: 'anniversary', hire_date: 'not-a-date' });
|
||
|
||
expect(saved.hire_date).toBeNull();
|
||
});
|
||
|
||
it('VACAY-SVC-045p: an unknown year type falls back to calendar', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
expect((await svc.updateYearSettings(user.id, { year_type: 'quarterly' })).year_type).toBe('calendar');
|
||
});
|
||
});
|
||
|
||
describe('getYearSettings', () => {
|
||
it('VACAY-SVC-045q: fills in the calendar defaults for a user who never configured anything', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
expect(await svc.getUserYearSettings(user.id)).toBeUndefined();
|
||
expect(await svc.getYearSettings(user.id)).toEqual({
|
||
user_id: user.id, year_type: 'calendar', year_start_month: 1, year_start_day: 1, hire_date: null,
|
||
});
|
||
});
|
||
});
|
||
|
||
describe('currentPeriodYear', () => {
|
||
it('VACAY-SVC-045r: a calendar user is always in the period named after today’s year', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
|
||
expect(await svc.currentPeriodYear(user.id, new Date('2026-03-15T12:00:00'))).toBe(2026);
|
||
});
|
||
|
||
it('VACAY-SVC-045s: before a fiscal year starts, today still belongs to the previous period', async () => {
|
||
const { user } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
|
||
expect(await svc.currentPeriodYear(user.id, new Date('2026-03-15T12:00:00'))).toBe(2025);
|
||
expect(await svc.currentPeriodYear(user.id, new Date('2026-08-15T12:00:00'))).toBe(2026);
|
||
});
|
||
});
|
||
|
||
describe('usage over a shifted window (#737)', () => {
|
||
it('VACAY-SVC-045t: a day in the next calendar year still counts toward the fiscal period', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2026-08-10', 1, 'vacation'); // inside, first half
|
||
await svc.toggleEntry(user.id, plan.id, '2027-02-10', 1, 'vacation'); // inside, second half
|
||
|
||
expect((await svc.getStats(plan.id, 2026))[0].used).toBe(2);
|
||
});
|
||
|
||
it('VACAY-SVC-045u: days outside the window belong to the neighbouring periods, not this one', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2026-06-30', 1, 'vacation'); // last day of the previous period
|
||
await svc.toggleEntry(user.id, plan.id, '2027-07-01', 1, 'vacation'); // first day of the next period
|
||
|
||
expect((await svc.getStats(plan.id, 2026))[0].used).toBe(0);
|
||
expect((await svc.getStats(plan.id, 2025))[0].used).toBe(1);
|
||
expect((await svc.getStats(plan.id, 2027))[0].used).toBe(1);
|
||
});
|
||
|
||
// Periods well past the year seeded with the plan, so addYear really inserts.
|
||
it('VACAY-SVC-045v: carry-over is computed over the previous period, not the previous calendar year', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
testDb.prepare('UPDATE vacay_plans SET carry_over_enabled = 1 WHERE id = ?').run(plan.id);
|
||
testDb.prepare(`
|
||
INSERT OR REPLACE INTO vacay_user_years (user_id, plan_id, year, vacation_days, carried_over)
|
||
VALUES (?, ?, 2030, 10, 0)
|
||
`).run(user.id, plan.id);
|
||
|
||
// Two days inside the 2030 period (Jul 2030 – Jun 2031), one of them in 2031.
|
||
await svc.toggleEntry(user.id, plan.id, '2030-09-02', 1, 'vacation');
|
||
await svc.toggleEntry(user.id, plan.id, '2031-02-03', 1, 'vacation');
|
||
|
||
await svc.addYear(plan.id, 2031, undefined);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT carried_over FROM vacay_user_years WHERE user_id = ? AND plan_id = ? AND year = 2031')
|
||
.get(user.id, plan.id) as { carried_over: number };
|
||
expect(row.carried_over).toBe(8);
|
||
});
|
||
|
||
it('VACAY-SVC-045w: comp days are excluded from the carry-over of a shifted period too', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
testDb.prepare('UPDATE vacay_plans SET carry_over_enabled = 1 WHERE id = ?').run(plan.id);
|
||
testDb.prepare(`
|
||
INSERT OR REPLACE INTO vacay_user_years (user_id, plan_id, year, vacation_days, carried_over)
|
||
VALUES (?, ?, 2030, 10, 0)
|
||
`).run(user.id, plan.id);
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2031-02-03', 1, 'comp');
|
||
|
||
await svc.addYear(plan.id, 2031, undefined);
|
||
|
||
const row = testDb
|
||
.prepare('SELECT carried_over FROM vacay_user_years WHERE user_id = ? AND plan_id = ? AND year = 2031')
|
||
.get(user.id, plan.id) as { carried_over: number };
|
||
expect(row.carried_over).toBe(10);
|
||
});
|
||
|
||
it('VACAY-SVC-045x: deleteYear clears the entries of the period, spanning both calendar years', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
await svc.addYear(plan.id, 2026, undefined);
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2026-08-10', 1, 'vacation'); // inside
|
||
await svc.toggleEntry(user.id, plan.id, '2027-02-10', 1, 'vacation'); // inside, next calendar year
|
||
await svc.toggleEntry(user.id, plan.id, '2026-06-30', 1, 'vacation'); // previous period, must survive
|
||
|
||
await svc.deleteYear(plan.id, 2026, undefined);
|
||
|
||
const left = testDb
|
||
.prepare('SELECT date FROM vacay_entries WHERE plan_id = ? ORDER BY date')
|
||
.all(plan.id) as { date: string }[];
|
||
expect(left.map(r => r.date)).toEqual(['2026-06-30']);
|
||
});
|
||
});
|
||
|
||
describe('getEntries over a window (#737)', () => {
|
||
it('VACAY-SVC-045y: returns both calendar halves of a shifted period for the viewer', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2026-08-10', 1, 'vacation');
|
||
await svc.toggleEntry(user.id, plan.id, '2027-02-10', 1, 'vacation');
|
||
await svc.toggleEntry(user.id, plan.id, '2026-06-30', 1, 'vacation'); // previous period
|
||
|
||
const result = await svc.getEntries(plan.id, '2026', user.id);
|
||
|
||
expect((result.entries as { date: string }[]).map(e => e.date).sort()).toEqual(['2026-08-10', '2027-02-10']);
|
||
});
|
||
|
||
it('VACAY-SVC-045z: without a viewer it stays on the plain calendar year (MCP reads)', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 7 });
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2026-08-10', 1, 'vacation');
|
||
await svc.toggleEntry(user.id, plan.id, '2027-02-10', 1, 'vacation');
|
||
|
||
const result = await svc.getEntries(plan.id, '2026');
|
||
|
||
expect((result.entries as { date: string }[]).map(e => e.date)).toEqual(['2026-08-10']);
|
||
});
|
||
|
||
it('VACAY-SVC-045aa: a start day past the 1st still loads the whole first month, since the grid renders it', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
await svc.updateYearSettings(user.id, { year_type: 'fiscal', year_start_month: 4, year_start_day: 6 });
|
||
|
||
await svc.toggleEntry(user.id, plan.id, '2026-04-02', 1, 'vacation'); // rendered, but counted in the previous period
|
||
|
||
expect(((await svc.getEntries(plan.id, '2026', user.id)).entries as unknown[])).toHaveLength(1);
|
||
expect((await svc.getStats(plan.id, 2026))[0].used).toBe(0);
|
||
expect((await svc.getStats(plan.id, 2025))[0].used).toBe(1);
|
||
});
|
||
});
|
||
|
||
// ── applyHolidayCalendars ─────────────────────────────────────────────────────
|
||
|
||
describe('applyHolidayCalendars', () => {
|
||
it('VACAY-SVC-046: does nothing when holidays_enabled is 0 (fetch is never called)', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
// holidays_enabled defaults to 0
|
||
|
||
await svc.applyHolidayCalendars(plan.id);
|
||
|
||
expect(vi.mocked(fetch)).not.toHaveBeenCalled();
|
||
});
|
||
|
||
it('VACAY-SVC-047: deletes matching vacay_entries for a global holiday date returned by the API', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const yr = new Date().getFullYear();
|
||
|
||
// Enable holidays and add a calendar
|
||
testDb.prepare('UPDATE vacay_plans SET holidays_enabled = 1 WHERE id = ?').run(plan.id);
|
||
await svc.addHolidayCalendar(plan.id, 'DE', null, undefined, 0, undefined);
|
||
|
||
// Add a vacay entry on the holiday date
|
||
const holidayDate = `${yr}-01-01`;
|
||
testDb
|
||
.prepare('INSERT INTO vacay_entries (plan_id, user_id, date, note) VALUES (?, ?, ?, ?)')
|
||
.run(plan.id, user.id, holidayDate, '');
|
||
|
||
// Override fetch to return one global holiday matching that entry
|
||
vi.stubGlobal('fetch', vi.fn().mockResolvedValue({
|
||
ok: true,
|
||
json: async () => [{ date: holidayDate, global: true }],
|
||
}));
|
||
|
||
await svc.applyHolidayCalendars(plan.id);
|
||
|
||
const remaining = testDb
|
||
.prepare('SELECT * FROM vacay_entries WHERE plan_id = ? AND date = ?')
|
||
.all(plan.id, holidayDate);
|
||
expect(remaining).toHaveLength(0);
|
||
});
|
||
});
|
||
|
||
// ── Read-only calendar shares (#444/#667) ─────────────────────────────────────
|
||
|
||
describe('shareCalendar', () => {
|
||
it('VACAY-SVC-048: inserts a share row and returns no error', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: target } = createUser(testDb);
|
||
|
||
const result = await svc.shareCalendar(owner.id, owner.email, target.id);
|
||
|
||
expect(result.error).toBeUndefined();
|
||
const row = testDb
|
||
.prepare('SELECT * FROM vacay_shares WHERE owner_id = ? AND user_id = ?')
|
||
.get(owner.id, target.id);
|
||
expect(row).toBeDefined();
|
||
});
|
||
|
||
it('VACAY-SVC-049: returns 400 when sharing with yourself', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
|
||
const result = await svc.shareCalendar(owner.id, owner.email, owner.id);
|
||
|
||
expect(result).toEqual({ error: 'Cannot share with yourself', status: 400 });
|
||
});
|
||
|
||
it('VACAY-SVC-050: returns 404 when the target user does not exist', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
|
||
const result = await svc.shareCalendar(owner.id, owner.email, 99999);
|
||
|
||
expect(result).toEqual({ error: 'User not found', status: 404 });
|
||
});
|
||
|
||
it('VACAY-SVC-051: returns 400 when the share already exists', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: target } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, target.id);
|
||
|
||
const result = await svc.shareCalendar(owner.id, owner.email, target.id);
|
||
|
||
expect(result).toEqual({ error: 'Already shared', status: 400 });
|
||
});
|
||
|
||
it('VACAY-SVC-052: returns 400 when the target is already a member of the owner plan', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
insertMember(plan.id, member.id, 'accepted');
|
||
|
||
const result = await svc.shareCalendar(owner.id, owner.email, member.id);
|
||
|
||
expect(result).toEqual({ error: 'User is already in your calendar', status: 400 });
|
||
});
|
||
});
|
||
|
||
describe('listShares', () => {
|
||
it('VACAY-SVC-053: outgoing rows carry the target user info', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: target } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, target.id);
|
||
|
||
const result = await svc.listShares(owner.id);
|
||
|
||
expect(result.outgoing).toHaveLength(1);
|
||
expect(result.outgoing[0]).toMatchObject({
|
||
user_id: target.id,
|
||
username: target.username,
|
||
});
|
||
expect(result.outgoing[0]).not.toHaveProperty('email');
|
||
expect(result.incoming).toEqual([]);
|
||
});
|
||
|
||
it('VACAY-SVC-054: incoming rows carry the owner info, their color and a boolean hidden flag', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
await svc.setUserColor(owner.id, plan.id, '#ef4444', undefined);
|
||
const { user: viewer } = await setupUserWithPlan();
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
|
||
const result = await svc.listShares(viewer.id);
|
||
|
||
expect(result.outgoing).toEqual([]);
|
||
expect(result.incoming).toHaveLength(1);
|
||
expect(result.incoming[0]).toMatchObject({
|
||
owner_id: owner.id,
|
||
username: owner.username,
|
||
color: '#ef4444',
|
||
hidden: false,
|
||
});
|
||
expect(result.incoming[0]).not.toHaveProperty('email');
|
||
});
|
||
|
||
it('VACAY-SVC-055: remaps colors when two sharing owners sit on the default indigo', async () => {
|
||
const { user: viewer } = await setupUserWithPlan(); // viewer's own color is #6366f1
|
||
const { user: owner1 } = await setupUserWithPlan(); // default #6366f1
|
||
const { user: owner2 } = await setupUserWithPlan(); // default #6366f1
|
||
await svc.shareCalendar(owner1.id, owner1.email, viewer.id);
|
||
await svc.shareCalendar(owner2.id, owner2.email, viewer.id);
|
||
|
||
const { incoming } = await svc.listShares(viewer.id);
|
||
|
||
expect(incoming).toHaveLength(2);
|
||
// Both collide with the viewer's own indigo, so each gets a distinct free preset
|
||
expect(incoming[0].color).not.toBe('#6366f1');
|
||
expect(incoming[1].color).not.toBe('#6366f1');
|
||
expect(incoming[0].color).not.toBe(incoming[1].color);
|
||
});
|
||
});
|
||
|
||
describe('removeShare', () => {
|
||
it('VACAY-SVC-056: the owner can revoke their share', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
const shareId = (await svc.listShares(owner.id)).outgoing[0].id as number;
|
||
|
||
expect(await svc.removeShare(shareId, owner.id)).toBe(true);
|
||
const row = testDb.prepare('SELECT id FROM vacay_shares WHERE id = ?').get(shareId);
|
||
expect(row).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-057: the recipient can remove a share they received', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
const shareId = (await svc.listShares(viewer.id)).incoming[0].id;
|
||
|
||
expect(await svc.removeShare(shareId, viewer.id)).toBe(true);
|
||
});
|
||
|
||
it('VACAY-SVC-058: a third user cannot remove the share, unknown ids return false', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
const { user: stranger } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
const shareId = (await svc.listShares(owner.id)).outgoing[0].id as number;
|
||
|
||
expect(await svc.removeShare(shareId, stranger.id)).toBe(false);
|
||
const row = testDb.prepare('SELECT id FROM vacay_shares WHERE id = ?').get(shareId);
|
||
expect(row).toBeDefined();
|
||
|
||
expect(await svc.removeShare(99999, owner.id)).toBe(false);
|
||
});
|
||
});
|
||
|
||
describe('setShareHidden', () => {
|
||
it('VACAY-SVC-059: the recipient can hide and unhide the shared calendar', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
const shareId = (await svc.listShares(viewer.id)).incoming[0].id;
|
||
|
||
expect(await svc.setShareHidden(shareId, viewer.id, true)).toBe(true);
|
||
let row = testDb.prepare('SELECT hidden FROM vacay_shares WHERE id = ?').get(shareId) as { hidden: number };
|
||
expect(row.hidden).toBe(1);
|
||
expect((await svc.listShares(viewer.id)).incoming[0].hidden).toBe(true);
|
||
|
||
expect(await svc.setShareHidden(shareId, viewer.id, false)).toBe(true);
|
||
row = testDb.prepare('SELECT hidden FROM vacay_shares WHERE id = ?').get(shareId) as { hidden: number };
|
||
expect(row.hidden).toBe(0);
|
||
});
|
||
|
||
it('VACAY-SVC-060: the owner cannot toggle the recipient hidden flag', async () => {
|
||
const { user: owner } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
const shareId = (await svc.listShares(owner.id)).outgoing[0].id as number;
|
||
|
||
expect(await svc.setShareHidden(shareId, owner.id, true)).toBe(false);
|
||
const row = testDb.prepare('SELECT hidden FROM vacay_shares WHERE id = ?').get(shareId) as { hidden: number };
|
||
expect(row.hidden).toBe(0);
|
||
});
|
||
});
|
||
|
||
describe('getShareAvailableUsers', () => {
|
||
it('VACAY-SVC-061: excludes self, already-shared users and plan members', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
insertMember(plan.id, member.id, 'accepted');
|
||
const { user: shared } = createUser(testDb);
|
||
await svc.shareCalendar(owner.id, owner.email, shared.id);
|
||
const { user: unrelated } = createUser(testDb);
|
||
|
||
const ids = (await svc.getShareAvailableUsers(owner.id) as { id: number }[]).map(u => u.id);
|
||
|
||
expect(ids).toContain(unrelated.id);
|
||
expect(ids).not.toContain(owner.id);
|
||
expect(ids).not.toContain(member.id);
|
||
expect(ids).not.toContain(shared.id);
|
||
});
|
||
});
|
||
|
||
describe('getSharedCalendars', () => {
|
||
it('VACAY-SVC-062: returns only the owner entries of the shared plan, including fractions', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
insertMember(plan.id, member.id, 'accepted');
|
||
const { user: viewer } = await setupUserWithPlan();
|
||
await svc.toggleEntry(owner.id, plan.id, '2025-06-10', 1);
|
||
await svc.toggleEntry(owner.id, plan.id, '2025-06-11', 0.5);
|
||
await svc.toggleEntry(member.id, plan.id, '2025-06-12', 1);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
|
||
const calendars = await svc.getSharedCalendars(viewer.id, '2025');
|
||
|
||
expect(calendars).toHaveLength(1);
|
||
expect(calendars[0].owner_id).toBe(owner.id);
|
||
expect(calendars[0].owner_name).toBe(owner.username);
|
||
expect(calendars[0].hidden).toBe(false);
|
||
expect(calendars[0].entries).toEqual([
|
||
{ date: '2025-06-10', fraction: 1, kind: 'vacation' },
|
||
{ date: '2025-06-11', fraction: 0.5, kind: 'vacation' },
|
||
]);
|
||
});
|
||
|
||
it('VACAY-SVC-063: company holidays stay hidden while the owner plan has them disabled', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
testDb.prepare('UPDATE vacay_plans SET company_holidays_enabled = 0 WHERE id = ?').run(plan.id);
|
||
await svc.toggleCompanyHoliday(plan.id, '2025-12-24', 'Christmas Eve', undefined);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
|
||
const calendars = await svc.getSharedCalendars(viewer.id, '2025');
|
||
|
||
expect(calendars[0].companyHolidays).toEqual([]);
|
||
});
|
||
|
||
it('VACAY-SVC-064: company holidays appear once the owner plan enables them', async () => {
|
||
const { user: owner, plan } = await setupUserWithPlan();
|
||
const { user: viewer } = createUser(testDb);
|
||
testDb.prepare('UPDATE vacay_plans SET company_holidays_enabled = 1 WHERE id = ?').run(plan.id);
|
||
await svc.toggleCompanyHoliday(plan.id, '2025-12-24', 'Christmas Eve', undefined);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
|
||
const calendars = await svc.getSharedCalendars(viewer.id, '2025');
|
||
|
||
expect(calendars[0].companyHolidays).toEqual([{ date: '2025-12-24', fraction: 1 }]);
|
||
});
|
||
|
||
it('VACAY-SVC-065: an owner without any plan yields empty arrays (no lazy creation)', async () => {
|
||
const { user: owner } = createUser(testDb); // never touched vacay — no plan row
|
||
const { user: viewer } = createUser(testDb);
|
||
testDb.prepare('INSERT INTO vacay_shares (owner_id, user_id) VALUES (?, ?)').run(owner.id, viewer.id);
|
||
|
||
const calendars = await svc.getSharedCalendars(viewer.id, '2025');
|
||
|
||
expect(calendars).toHaveLength(1);
|
||
expect(calendars[0].entries).toEqual([]);
|
||
expect(calendars[0].companyHolidays).toEqual([]);
|
||
const plan = testDb.prepare('SELECT id FROM vacay_plans WHERE owner_id = ?').get(owner.id);
|
||
expect(plan).toBeUndefined();
|
||
});
|
||
|
||
it('VACAY-SVC-066: follows an owner fused into another plan', async () => {
|
||
const { user: host, plan: hostPlan } = await setupUserWithPlan();
|
||
const { user: owner } = createUser(testDb);
|
||
await svc.getOwnPlan(owner.id);
|
||
insertMember(hostPlan.id, owner.id, 'accepted');
|
||
const { user: viewer } = createUser(testDb);
|
||
await svc.toggleEntry(owner.id, hostPlan.id, '2025-03-03', 1);
|
||
await svc.shareCalendar(owner.id, owner.email, viewer.id);
|
||
|
||
const calendars = await svc.getSharedCalendars(viewer.id, '2025');
|
||
|
||
expect(calendars).toHaveLength(1);
|
||
expect(calendars[0].entries).toEqual([{ date: '2025-03-03', fraction: 1, kind: 'vacation' }]);
|
||
});
|
||
});
|
||
|
||
// ── Quirk fixes (transactions, fetch hygiene, cache TTL, addYear errors) ──────
|
||
|
||
describe('quirk fixes', () => {
|
||
/** A fresh, fully-functioning VacayService over the same testDb — repository-backed now (Plan 3f Task 5), so a fresh instance no longer needs a `DatabaseService` wrapper, only its own repo set (the holiday-provider cache is instance state, so `applyHolidayCalendars`/`getCountries`/etc.'s TTL tests need a service the earlier tests in this file never touched). */
|
||
async function freshVacayService(): Promise<VacayService> {
|
||
return (await buildVacayServiceWithRepos()).service;
|
||
}
|
||
|
||
/**
|
||
* Same repo set `freshVacayService` builds, but returns the repos
|
||
* themselves too, so a caller can `vi.spyOn` one of them before
|
||
* constructing — the repository-backed replacement for the legacy
|
||
* `failingService`'s `DatabaseService.run` SQL-text-match spy (this file's
|
||
* pre-conversion mechanism could match a raw SQL substring; a repository
|
||
* has no raw SQL text left to match, so this spies on the REPOSITORY
|
||
* METHOD that now issues the statement instead).
|
||
*/
|
||
async function buildVacayServiceWithRepos() {
|
||
const repos = {
|
||
plans: await createTestVacayPlansRepo(testDb),
|
||
members: await createTestVacayPlanMembersRepo(testDb),
|
||
years: await createTestVacayYearsRepo(testDb),
|
||
userYears: await createTestVacayUserYearsRepo(testDb),
|
||
userColors: await createTestVacayUserColorsRepo(testDb),
|
||
entries: await createTestVacayEntriesRepo(testDb),
|
||
companyHolidays: await createTestVacayCompanyHolidaysRepo(testDb),
|
||
holidayCalendars: await createTestVacayHolidayCalendarsRepo(testDb),
|
||
shares: await createTestVacaySharesRepo(testDb),
|
||
userSettings: await createTestVacayUserSettingsRepo(testDb),
|
||
schoolHolidayRegions: await createTestSchoolHolidayRegionsRepo(testDb),
|
||
};
|
||
const service = new VacayService(
|
||
repos.plans, repos.members, repos.years, repos.userYears, repos.userColors, repos.entries,
|
||
repos.companyHolidays, repos.holidayCalendars, repos.shares, repos.userSettings, repos.schoolHolidayRegions,
|
||
new RealtimeService(), notificationsStub(), await createTestUnitOfWork(testDb),
|
||
);
|
||
return { repos, service };
|
||
}
|
||
|
||
/**
|
||
* A VacayService whose one named repository method throws once, for
|
||
* atomicity checks — the `uow.transactional` rollback proof. `match` keeps
|
||
* the three call sites below unchanged (they still name the legacy
|
||
* statement they mean to fail); this maps it onto the repository method
|
||
* that now issues it. `mockImplementationOnce` self-restores after the one
|
||
* throw, so it never leaks into a later test even though `createTestVacay*
|
||
* Repo` memoises one repository instance per entity per `testDb` handle
|
||
* (the same instance `svc`, built once in `beforeAll`, also uses).
|
||
*/
|
||
async function failingService(match: string) {
|
||
const { repos, service } = await buildVacayServiceWithRepos();
|
||
if (match === 'INSERT OR IGNORE INTO vacay_user_years') {
|
||
vi.spyOn(repos.userYears, 'insertIgnore').mockImplementationOnce(() => { throw new Error('boom'); });
|
||
} else if (match === 'DELETE FROM vacay_user_years') {
|
||
vi.spyOn(repos.userYears, 'deleteForYear').mockImplementationOnce(() => { throw new Error('boom'); });
|
||
} else {
|
||
throw new Error(`failingService: no repository mapping for match "${match}"`);
|
||
}
|
||
return service;
|
||
}
|
||
|
||
it('VACAY-SVC-068: acceptInvite is atomic — a failure mid-flow rolls the status flip back', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const { user: member } = createUser(testDb);
|
||
await svc.getOwnPlan(member.id);
|
||
insertMember(plan.id, member.id, 'pending');
|
||
|
||
const broken = await failingService('INSERT OR IGNORE INTO vacay_user_years');
|
||
await expect(broken.acceptInvite(member.id, plan.id, undefined)).rejects.toThrow('boom');
|
||
|
||
const row = testDb.prepare('SELECT status FROM vacay_plan_members WHERE plan_id = ? AND user_id = ?').get(plan.id, member.id) as { status: string };
|
||
expect(row.status).toBe('pending');
|
||
});
|
||
|
||
it('VACAY-SVC-069: deleteYear is atomic — a failure mid-flow keeps the year and its entries', async () => {
|
||
const { user, plan } = await setupUserWithPlan();
|
||
const year = new Date().getFullYear();
|
||
allowWeekends(plan.id);
|
||
await svc.toggleEntry(user.id, plan.id, `${year}-03-03`, 1);
|
||
|
||
const broken = await failingService('DELETE FROM vacay_user_years');
|
||
await expect(broken.deleteYear(plan.id, year, undefined)).rejects.toThrow('boom');
|
||
|
||
expect(testDb.prepare('SELECT id FROM vacay_years WHERE plan_id = ? AND year = ?').get(plan.id, year)).toBeDefined();
|
||
expect(testDb.prepare('SELECT id FROM vacay_entries WHERE plan_id = ?').get(plan.id)).toBeDefined();
|
||
});
|
||
|
||
it('VACAY-SVC-070: getCountries surfaces an upstream non-2xx as the fetch error and caches nothing', async () => {
|
||
const fetchMock = vi.fn().mockResolvedValue({ ok: false, status: 502, json: async () => ({}) });
|
||
vi.stubGlobal('fetch', fetchMock);
|
||
const fresh = await freshVacayService();
|
||
|
||
expect(await fresh.getCountries()).toEqual({ error: 'Failed to fetch countries' });
|
||
// Nothing cached: a retry hits the network again.
|
||
expect(await fresh.getCountries()).toEqual({ error: 'Failed to fetch countries' });
|
||
expect(fetchMock).toHaveBeenCalledTimes(2);
|
||
expect(fetchMock).toHaveBeenCalledWith(expect.any(String), expect.objectContaining({ signal: expect.any(AbortSignal) }));
|
||
});
|
||
|
||
it('VACAY-SVC-070a: getHolidays refuses a year or country that is not a plain code', async () => {
|
||
const fetchMock = vi.fn();
|
||
vi.stubGlobal('fetch', fetchMock);
|
||
const fresh = await freshVacayService();
|
||
|
||
for (const [year, country] of [['../../..', 'DE'], ['2026', 'DE/../../x'], ['20xx', 'DE'], ['2026', 'DEU']]) {
|
||
expect(await fresh.getHolidays(year, country)).toEqual({ error: 'Failed to fetch holidays' });
|
||
}
|
||
expect(fetchMock).not.toHaveBeenCalled();
|
||
});
|
||
|
||
it('VACAY-SVC-070b: getSchoolHolidayRegions refuses a country that is not an alpha-2 code', async () => {
|
||
const fetchMock = vi.fn();
|
||
vi.stubGlobal('fetch', fetchMock);
|
||
const fresh = await freshVacayService();
|
||
|
||
expect(await fresh.getSchoolHolidayRegions('DE&countryIsoCode=FR')).toEqual({
|
||
error: 'Failed to fetch school holiday regions',
|
||
});
|
||
expect(fetchMock).not.toHaveBeenCalled();
|
||
});
|
||
|
||
it('VACAY-SVC-070c: a provider body over the size cap reads as the usual fetch error', async () => {
|
||
const fetchMock = vi.fn().mockResolvedValue({
|
||
ok: true,
|
||
headers: { get: (h: string) => (h === 'content-length' ? String(50 * 1024 * 1024) : null) },
|
||
json: async () => [{ date: '2026-01-01' }],
|
||
});
|
||
vi.stubGlobal('fetch', fetchMock);
|
||
const fresh = await freshVacayService();
|
||
|
||
expect(await fresh.getCountries()).toEqual({ error: 'Failed to fetch countries' });
|
||
expect(await fresh.getHolidays('2026', 'DE')).toEqual({ error: 'Failed to fetch holidays' });
|
||
});
|
||
|
||
it('VACAY-SVC-070d: a chunked provider body past the cap reads as the usual fetch error', async () => {
|
||
// nager.at answers chunked, so there is no content-length for the declared
|
||
// check to look at — only the streaming read stops this being buffered whole.
|
||
const payload = `[${'{"date":"2026-01-01"},'.repeat(200_000)}{"date":"2026-12-24"}]`;
|
||
const fetchMock = vi.fn().mockImplementation(async () => {
|
||
let sent = false;
|
||
return {
|
||
ok: true,
|
||
headers: { get: () => null },
|
||
body: {
|
||
getReader: () => ({
|
||
read: async () => (sent ? { done: true } : ((sent = true), { done: false, value: new TextEncoder().encode(payload) })),
|
||
cancel: async () => undefined,
|
||
}),
|
||
cancel: async () => undefined,
|
||
},
|
||
json: async () => JSON.parse(payload),
|
||
};
|
||
});
|
||
vi.stubGlobal('fetch', fetchMock);
|
||
const fresh = await freshVacayService();
|
||
|
||
expect(await fresh.getHolidays('2026', 'DE')).toEqual({ error: 'Failed to fetch holidays' });
|
||
expect(await fresh.getCountries()).toEqual({ error: 'Failed to fetch countries' });
|
||
});
|
||
|
||
it('VACAY-SVC-071: applyHolidayCalendars honors the cache TTL', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
testDb.prepare('UPDATE vacay_plans SET holidays_enabled = 1 WHERE id = ?').run(plan.id);
|
||
testDb.prepare("INSERT INTO vacay_holiday_calendars (plan_id, region) VALUES (?, 'DE')").run(plan.id);
|
||
const fetchMock = vi.fn().mockResolvedValue({ ok: true, json: async () => [] });
|
||
vi.stubGlobal('fetch', fetchMock);
|
||
const fresh = await freshVacayService();
|
||
|
||
await fresh.applyHolidayCalendars(plan.id);
|
||
const afterFirst = fetchMock.mock.calls.length;
|
||
await fresh.applyHolidayCalendars(plan.id);
|
||
// Within the TTL the cached year list is reused — no new requests.
|
||
expect(fetchMock.mock.calls.length).toBe(afterFirst);
|
||
|
||
vi.useFakeTimers();
|
||
try {
|
||
vi.setSystemTime(Date.now() + 24 * 60 * 60 * 1000 + 1);
|
||
await fresh.applyHolidayCalendars(plan.id);
|
||
expect(fetchMock.mock.calls.length).toBeGreaterThan(afterFirst);
|
||
} finally {
|
||
vi.useRealTimers();
|
||
}
|
||
});
|
||
|
||
it('VACAY-SVC-072: addYear still no-ops on a duplicate year but propagates real errors', async () => {
|
||
const { plan } = await setupUserWithPlan();
|
||
const year = new Date().getFullYear();
|
||
// Duplicate: the seeded current year — silently returns the list, like before.
|
||
expect(await svc.addYear(plan.id, year, undefined)).toContain(year);
|
||
|
||
const broken = await failingService('INSERT OR IGNORE INTO vacay_user_years');
|
||
await expect(broken.addYear(plan.id, year + 1, undefined)).rejects.toThrow('boom');
|
||
// And atomically: the failed year was not half-added.
|
||
expect(testDb.prepare('SELECT id FROM vacay_years WHERE plan_id = ? AND year = ?').get(plan.id, year + 1)).toBeUndefined();
|
||
});
|
||
});
|