From 1bfe57d75caaf36a8c4324506e0e2c2ba595d827 Mon Sep 17 00:00:00 2001 From: Maurice Date: Wed, 7 Oct 2026 15:44:54 +0200 Subject: [PATCH] chore(db): regenerate entities after the dev merge --- server/src/db/entities/Places.entity.ts | 8 +++----- server/src/db/entities/TourTypes.entity.ts | 2 +- server/src/db/entities/TourWaypoints.entity.ts | 2 +- server/src/db/entities/Tours.entity.ts | 2 +- server/src/db/entities/index.ts | 2 +- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/server/src/db/entities/Places.entity.ts b/server/src/db/entities/Places.entity.ts index 8f972638f..6bb49853a 100644 --- a/server/src/db/entities/Places.entity.ts +++ b/server/src/db/entities/Places.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PlacesRepository } from '../repositories/Places.repository'; import { DbTimestampType } from '../types'; import { BudgetItems } from './BudgetItems.entity'; @@ -16,7 +17,6 @@ import { Tags } from './Tags.entity'; import { Tours } from './Tours.entity'; import { TripFiles } from './TripFiles.entity'; import { Trips } from './Trips.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Places { [EntityRepositoryType]?: PlacesRepository; @@ -112,11 +112,9 @@ export const PlacesSchema = defineEntity({ source: p.text().nullable(), email: p.text().nullable(), opening_hours: p.text().nullable(), - place_tags: () => - p.manyToMany(Tags).pivotTable('place_tags').joinColumn('place_id').inverseJoinColumn('tag_id').hidden(), + place_tags: () => p.manyToMany(Tags).pivotTable('place_tags').joinColumn('place_id').inverseJoinColumn('tag_id').hidden(), budget_items_collection: () => p.oneToMany(BudgetItems).mappedBy('place').hidden(), - dawarich_visit_suggestions_collection: () => - p.oneToMany(DawarichVisitSuggestions).mappedBy('acceptedPlace').hidden(), + dawarich_visit_suggestions_collection: () => p.oneToMany(DawarichVisitSuggestions).mappedBy('acceptedPlace').hidden(), day_accommodations_collection: () => p.oneToMany(DayAccommodations).mappedBy('place').hidden(), day_assignments_collection: () => p.oneToMany(DayAssignments).mappedBy('place').hidden(), file_links_collection: () => p.oneToMany(FileLinks).mappedBy('place').hidden(), diff --git a/server/src/db/entities/TourTypes.entity.ts b/server/src/db/entities/TourTypes.entity.ts index fe48f7677..abf6573b5 100644 --- a/server/src/db/entities/TourTypes.entity.ts +++ b/server/src/db/entities/TourTypes.entity.ts @@ -1,6 +1,6 @@ +import { Collection, EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; import { TourTypesRepository } from '../repositories/TourTypes.repository'; import { Tours } from './Tours.entity'; -import { Collection, EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; export class TourTypes { [EntityRepositoryType]?: TourTypesRepository; diff --git a/server/src/db/entities/TourWaypoints.entity.ts b/server/src/db/entities/TourWaypoints.entity.ts index 89958e963..0f6a6ab80 100644 --- a/server/src/db/entities/TourWaypoints.entity.ts +++ b/server/src/db/entities/TourWaypoints.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TourWaypointsRepository } from '../repositories/TourWaypoints.repository'; import { Tours } from './Tours.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TourWaypoints { [EntityRepositoryType]?: TourWaypointsRepository; diff --git a/server/src/db/entities/Tours.entity.ts b/server/src/db/entities/Tours.entity.ts index b23afa95f..beedbaad7 100644 --- a/server/src/db/entities/Tours.entity.ts +++ b/server/src/db/entities/Tours.entity.ts @@ -1,8 +1,8 @@ +import { Collection, EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { ToursRepository } from '../repositories/Tours.repository'; import { Places } from './Places.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; diff --git a/server/src/db/entities/index.ts b/server/src/db/entities/index.ts index 2d8b22d15..60958f950 100644 --- a/server/src/db/entities/index.ts +++ b/server/src/db/entities/index.ts @@ -1,3 +1,4 @@ +import type { EntitySchema } from '@mikro-orm/core'; import { AddonsSchema } from './Addons.entity'; import { AppSettingsSchema } from './AppSettings.entity'; import { AssignmentParticipantsSchema } from './AssignmentParticipants.entity'; @@ -128,7 +129,6 @@ import { VisitedCountriesSchema } from './VisitedCountries.entity'; import { VisitedRegionsSchema } from './VisitedRegions.entity'; import { WebauthnChallengesSchema } from './WebauthnChallenges.entity'; import { WebauthnCredentialsSchema } from './WebauthnCredentials.entity'; -import type { EntitySchema } from '@mikro-orm/core'; export const ALL_ENTITIES: readonly EntitySchema[] = [ AddonsSchema,