mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-10-19 13:36:48 +00:00
Maurice
0d3be17f26
Seven conflicts, six of them the same shape: dev fixed `res.sendFile` to take a root plus a basename, because an absolute path 404s under the Nest ExpressAdapter, and this branch had already replaced those call sites with the storage layer. Nothing on those paths calls sendFile any more, so the storage version stands and dev's fix has nothing left to apply to. The three that needed thought: **migrations.ts** — both sides appended. The array is index-addressed against schema_version, so a slot that has shipped in dev keeps the index it shipped with: journey_books (#1973) stays where it landed and the trip_files prefix strip goes after it. Safe only because this branch has never been published; the note above the slot says so. **journey.controller.ts** — both sides added a constructor dependency, and the controller needs both. StorageModule is already imported and JourneyBookService is already a provider, so the module needed nothing. **journey.controller.test.ts** — dev introduced a `ctl()` factory precisely because naming every dependency at ninety call sites does not survive a third one. Kept the factory and gave it the storage stub, then took this branch's versions of the file cases: they are the ones that await the async storage calls, where dev's still assume a synchronous unlink. The three Studio book cases came across unchanged. The trailing-migration guard now rewinds six slots instead of five and undoes both sides' work. Server and client typecheck clean, and the tests that touch any of this pass.