From 57f0e2f2630a48ad4addf84c2a392f05e91aacc2 Mon Sep 17 00:00:00 2001
From: Maurice <mauriceboe@icloud.com>
Date: Tue, 20 Oct 2026 19:07:12 +0200
Subject: [PATCH] fix(tours): give the tour entities back their generated form

The format run rewrote two files that check:entities holds byte for byte
to the generator's output; .prettierignore excludes them for that reason.
---
 server/src/db/entities/CollectionTours.entity.ts | 11 ++++-------
 server/src/db/entities/Tours.entity.ts           |  5 ++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/server/src/db/entities/CollectionTours.entity.ts b/server/src/db/entities/CollectionTours.entity.ts
index 0ce885559..4fca82ef0 100644
--- a/server/src/db/entities/CollectionTours.entity.ts
+++ b/server/src/db/entities/CollectionTours.entity.ts
@@ -1,9 +1,9 @@
+import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core';
 import { CollectionToursRepository } from '../repositories/CollectionTours.repository';
 import { DbTimestampType } from '../types';
 import { Collections } from './Collections.entity';
 import { TourTypes } from './TourTypes.entity';
 import { Users } from './Users.entity';
-import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core';
 
 export class CollectionTours {
   [EntityRepositoryType]?: CollectionToursRepository;
@@ -55,8 +55,7 @@ export const CollectionToursSchema = defineEntity({
   repository: () => CollectionToursRepository,
   properties: {
     id: p.integer().primary(),
-    collection: () =>
-      p.manyToOne(Collections).ref().deleteRule('cascade').hidden().index('idx_collection_tours_collection'),
+    collection: () => p.manyToOne(Collections).ref().deleteRule('cascade').hidden().index('idx_collection_tours_collection'),
     collection_id: p.integer().persist(false).index('idx_collection_tours_collection'),
     saved_by: p.integer().nullable().persist(false).index('idx_collection_tours_saved_by'),
     name: p.text(),
@@ -94,9 +93,7 @@ export const CollectionToursSchema = defineEntity({
     source_trip_title: p.text(),
     source_tour_name: p.text(),
     created_at: p.type(DbTimestampType).defaultRaw(`CURRENT_TIMESTAMP`),
-    tourTypeRef: () =>
-      p.manyToOne(TourTypes).ref().joinColumn('tour_type').hidden().index('idx_collection_tours_tour_type'),
-    savedByRef: () =>
-      p.manyToOne(Users).ref().joinColumn('saved_by').nullable().hidden().index('idx_collection_tours_saved_by'),
+    tourTypeRef: () => p.manyToOne(TourTypes).ref().joinColumn('tour_type').hidden().index('idx_collection_tours_tour_type'),
+    savedByRef: () => p.manyToOne(Users).ref().joinColumn('saved_by').nullable().hidden().index('idx_collection_tours_saved_by'),
   },
 });
diff --git a/server/src/db/entities/Tours.entity.ts b/server/src/db/entities/Tours.entity.ts
index 5de9e3c70..dd4ee4041 100644
--- a/server/src/db/entities/Tours.entity.ts
+++ b/server/src/db/entities/Tours.entity.ts
@@ -1,3 +1,4 @@
+import { Collection, EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core';
 import { ToursRepository } from '../repositories/Tours.repository';
 import { DbTimestampType } from '../types';
 import { Places } from './Places.entity';
@@ -9,7 +10,6 @@ import { TourPackingLinks } from './TourPackingLinks.entity';
 import { TourSources } from './TourSources.entity';
 import { TourTypes } from './TourTypes.entity';
 import { TourWaypoints } from './TourWaypoints.entity';
-import { Collection, EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core';
 
 export class Tours {
   [EntityRepositoryType]?: ToursRepository;
@@ -140,8 +140,7 @@ export const ToursSchema = defineEntity({
   checks: [
     {
       name: 'tours_run_pace_seconds_per_km_check',
-      expression:
-        'run_pace_seconds_per_km IS NULL OR (run_pace_seconds_per_km >= 120 AND run_pace_seconds_per_km <= 1200)',
+      expression: 'run_pace_seconds_per_km IS NULL OR (run_pace_seconds_per_km >= 120 AND run_pace_seconds_per_km <= 1200)',
     },
     { name: 'tours_revision_check', expression: 'revision >= 1' },
   ],