From b53257deaf2f9aa327b2b7591aa452eaefc7b091 Mon Sep 17 00:00:00 2001
From: Maurice <mauriceboe@icloud.com>
Date: Tue, 20 Oct 2026 17:51:26 +0200
Subject: [PATCH] fix(tours): answer a new tour with its activities and type
 the change save's outcome

createTour now answers activities: [] as the detail read does, and the change save's transaction declares the shape it returns so the strict typecheck can narrow it.
---
 server/src/nest/tours/tour-change-save.service.ts | 12 +++++++++---
 server/src/nest/tours/tours.service.ts            |  2 ++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/server/src/nest/tours/tour-change-save.service.ts b/server/src/nest/tours/tour-change-save.service.ts
index a4bb10ac9..ca757417c 100644
--- a/server/src/nest/tours/tour-change-save.service.ts
+++ b/server/src/nest/tours/tour-change-save.service.ts
@@ -11,7 +11,7 @@ import { asWaypoint } from './tour-change-effects';
 import { TourChangePreviewService } from './tour-change-preview.service';
 import { proposalIdOf } from './tour-change-proposal';
 import { tourWriteOf, writtenStations, writtenTour } from './tour-change-write';
-import { ToursService, type TourCreateCommand } from './tours.service';
+import { ToursService, type TourCreateCommand, type TourRouteDrops } from './tours.service';
 import { InjectRepository } from '@mikro-orm/nestjs';
 import { Injectable } from '@nestjs/common';
 import type { TourChangeSaveRequest, TourDetailResponse, TourListItem, TourWaypoint } from '@trek/shared';
@@ -33,6 +33,9 @@ interface SavedStep {
   revision: number;
 }
 
+/** What the save's transaction answers: the step a save sent alongside recorded first, or its own. */
+type SaveOutcome = { earlier: TourChangeStepRow } | ({ step: SavedStep } & TourRouteDrops);
+
 /**
  * The write of a confirmed change: the points after it and the way on foot
  * the router planned through them. Without a way the walk keeps its stations
@@ -129,7 +132,7 @@ export class TourChangeSaveService {
     const way = await this.footWays.plan(userId, tripId, laid.outcome.points);
     const changed: ChangedTour = { tour: laid.tour, points: laid.outcome.points, way, preparedOn };
     const write = await this.tours.routeWrite(writeOf(changed));
-    const saved = await this.uow.transactional(async () => {
+    const saved = await this.uow.transactional(async (): Promise<SaveOutcome> => {
       // The same proposal saved by a save sent alongside this one while the way was planned.
       const savedMeanwhile = await this.stepsRepo.findSavedProposal(placeId, proposalId, preparedOn);
       if (savedMeanwhile) return { earlier: savedMeanwhile };
@@ -149,7 +152,10 @@ export class TourChangeSaveService {
       return { step: { id, revision }, visitsDropped, stagesDropped };
     });
     if ('earlier' in saved) return alreadySavedAnswer(saved.earlier);
-    const detail = await this.tours.announceRouteUpdate(String(tripId), placeId, saved);
+    const detail = await this.tours.announceRouteUpdate(String(tripId), placeId, {
+      visitsDropped: saved.visitsDropped,
+      stagesDropped: saved.stagesDropped,
+    });
     return savedAnswer(detail, saved.step, changed);
   }
 
diff --git a/server/src/nest/tours/tours.service.ts b/server/src/nest/tours/tours.service.ts
index ff72c3ccb..d5e833bbb 100644
--- a/server/src/nest/tours/tours.service.ts
+++ b/server/src/nest/tours/tours.service.ts
@@ -323,6 +323,8 @@ export class ToursService {
       waypoints,
       provenance: await this.provenanceOf(tid, placeId),
       ...(checked.obstacle_check ? { obstacle_check: checked.obstacle_check } : {}),
+      // ACT-01: answered as the read answers it; a tour just made has no recording assigned yet.
+      activities: [],
     };
   }