From b50812d51d8d722c747e878c83a2e1699d35130f Mon Sep 17 00:00:00 2001 From: jubnl Date: Tue, 6 Oct 2026 21:59:39 +0200 Subject: [PATCH] regenerate entitied --- server/src/db/entities/Addons.entity.ts | 2 +- server/src/db/entities/AppSettings.entity.ts | 2 +- .../entities/AssignmentParticipants.entity.ts | 5 ++--- server/src/db/entities/AuditLog.entity.ts | 2 +- server/src/db/entities/BucketList.entity.ts | 8 +++---- .../db/entities/BudgetCategoryOrder.entity.ts | 2 +- .../db/entities/BudgetItemMembers.entity.ts | 5 ++--- .../db/entities/BudgetItemPayers.entity.ts | 5 ++--- server/src/db/entities/BudgetItems.entity.ts | 2 +- .../db/entities/BudgetSettlements.entity.ts | 2 +- server/src/db/entities/Categories.entity.ts | 2 +- server/src/db/entities/CollabLinks.entity.ts | 2 +- .../entities/CollabMessageReactions.entity.ts | 2 +- .../src/db/entities/CollabMessages.entity.ts | 2 +- server/src/db/entities/CollabNotes.entity.ts | 2 +- .../src/db/entities/CollabPollVotes.entity.ts | 2 +- server/src/db/entities/CollabPolls.entity.ts | 2 +- .../db/entities/CollectionLabels.entity.ts | 5 ++--- .../db/entities/CollectionMembers.entity.ts | 2 +- .../entities/CollectionPlaceRatings.entity.ts | 5 ++--- .../db/entities/CollectionPlaces.entity.ts | 21 ++++--------------- server/src/db/entities/Collections.entity.ts | 2 +- .../db/entities/DawarichConnections.entity.ts | 2 +- .../DawarichVisitSuggestions.entity.ts | 2 +- .../db/entities/DayAccommodations.entity.ts | 2 +- .../src/db/entities/DayAssignments.entity.ts | 2 +- server/src/db/entities/DayNotes.entity.ts | 2 +- server/src/db/entities/Days.entity.ts | 2 +- .../db/entities/DocumentConnections.entity.ts | 2 +- .../entities/DocumentProviderFields.entity.ts | 2 +- .../db/entities/DocumentProviders.entity.ts | 2 +- .../db/entities/DocumentSyncItems.entity.ts | 2 +- server/src/db/entities/FileLinks.entity.ts | 2 +- .../src/db/entities/GoogleApiUsage.entity.ts | 2 +- .../entities/GooglePlacePhotoMeta.entity.ts | 2 +- .../src/db/entities/HiddenCountries.entity.ts | 2 +- .../src/db/entities/HiddenRegions.entity.ts | 2 +- .../src/db/entities/IdempotencyKeys.entity.ts | 2 +- server/src/db/entities/InviteTokens.entity.ts | 2 +- server/src/db/entities/JourneyBooks.entity.ts | 2 +- .../db/entities/JourneyContributors.entity.ts | 5 ++--- .../src/db/entities/JourneyEntries.entity.ts | 2 +- .../db/entities/JourneyEntryPhotos.entity.ts | 2 +- .../src/db/entities/JourneyPhotos.entity.ts | 2 +- .../db/entities/JourneyShareTokens.entity.ts | 2 +- server/src/db/entities/JourneyTrips.entity.ts | 2 +- server/src/db/entities/Journeys.entity.ts | 2 +- server/src/db/entities/McpTokens.entity.ts | 2 +- server/src/db/entities/Migrations.entity.ts | 2 +- .../NotificationChannelPreferences.entity.ts | 2 +- .../src/db/entities/Notifications.entity.ts | 2 +- server/src/db/entities/OauthClients.entity.ts | 2 +- .../src/db/entities/OauthConsents.entity.ts | 11 ++-------- server/src/db/entities/OauthTokens.entity.ts | 19 +++++++---------- server/src/db/entities/PackingBags.entity.ts | 5 ++--- .../PackingCategoryAssignees.entity.ts | 2 +- .../PackingItemContributors.entity.ts | 2 +- server/src/db/entities/PackingItems.entity.ts | 19 +++-------------- .../PackingTemplateCategories.entity.ts | 2 +- .../entities/PackingTemplateItems.entity.ts | 2 +- .../db/entities/PackingTemplates.entity.ts | 2 +- .../db/entities/PasswordResetTokens.entity.ts | 2 +- .../db/entities/PhotoProviderFields.entity.ts | 2 +- .../src/db/entities/PhotoProviders.entity.ts | 2 +- server/src/db/entities/Photos.entity.ts | 2 +- .../db/entities/PlaceDetailsCache.entity.ts | 2 +- server/src/db/entities/PlaceRatings.entity.ts | 2 +- server/src/db/entities/PlaceRegions.entity.ts | 2 +- .../db/entities/PlaceShadowPicks.entity.ts | 2 +- server/src/db/entities/Places.entity.ts | 8 +++---- .../src/db/entities/PluginActions.entity.ts | 2 +- .../entities/PluginCapabilityAudit.entity.ts | 2 +- .../db/entities/PluginEgressHosts.entity.ts | 2 +- .../entities/PluginEntityMetadata.entity.ts | 2 +- .../src/db/entities/PluginErrorLog.entity.ts | 6 ++++-- .../entities/PluginMetaMigrations.entity.ts | 2 +- .../db/entities/PluginOauthState.entity.ts | 2 +- .../db/entities/PluginOauthTokens.entity.ts | 2 +- .../entities/PluginScheduledTasks.entity.ts | 2 +- .../entities/PluginSettingsFields.entity.ts | 2 +- .../db/entities/PluginUserConfig.entity.ts | 2 +- .../entities/PluginUserErasureQueue.entity.ts | 2 +- server/src/db/entities/Plugins.entity.ts | 2 +- .../db/entities/PushSubscriptions.entity.ts | 2 +- .../ReservationDayPositions.entity.ts | 2 +- .../entities/ReservationEndpoints.entity.ts | 5 ++--- .../entities/ReservationTravelers.entity.ts | 5 ++--- server/src/db/entities/Reservations.entity.ts | 2 +- .../entities/RoadtripDayBoundaries.entity.ts | 2 +- .../db/entities/RoadtripDayTracks.entity.ts | 2 +- .../db/entities/RoadtripPreferences.entity.ts | 2 +- server/src/db/entities/RoadtripVias.entity.ts | 2 +- .../src/db/entities/RouteUsageDaily.entity.ts | 2 +- .../src/db/entities/SchemaVersion.entity.ts | 2 +- .../entities/SchoolHolidayCountries.entity.ts | 2 +- .../entities/SchoolHolidayPeriods.entity.ts | 5 ++--- .../entities/SchoolHolidayRegions.entity.ts | 2 +- server/src/db/entities/Settings.entity.ts | 2 +- server/src/db/entities/ShareTokens.entity.ts | 2 +- server/src/db/entities/Tags.entity.ts | 2 +- .../entities/TodoCategoryAssignees.entity.ts | 2 +- server/src/db/entities/TodoItems.entity.ts | 2 +- .../db/entities/TrekPhotoCacheMeta.entity.ts | 2 +- server/src/db/entities/TrekPhotos.entity.ts | 2 +- .../src/db/entities/TripAlbumLinks.entity.ts | 2 +- .../db/entities/TripDocumentLinks.entity.ts | 2 +- server/src/db/entities/TripFiles.entity.ts | 5 ++--- .../db/entities/TripInviteTokens.entity.ts | 2 +- server/src/db/entities/TripMembers.entity.ts | 2 +- server/src/db/entities/TripPhotos.entity.ts | 2 +- server/src/db/entities/Trips.entity.ts | 2 +- .../entities/UserNoticeDismissals.entity.ts | 2 +- server/src/db/entities/Users.entity.ts | 5 ++--- .../entities/VacayCompanyHolidays.entity.ts | 2 +- server/src/db/entities/VacayEntries.entity.ts | 2 +- .../entities/VacayHolidayCalendars.entity.ts | 2 +- .../db/entities/VacayPlanMembers.entity.ts | 2 +- server/src/db/entities/VacayPlans.entity.ts | 2 +- server/src/db/entities/VacayShares.entity.ts | 2 +- .../src/db/entities/VacayUserColors.entity.ts | 2 +- .../db/entities/VacayUserSettings.entity.ts | 2 +- .../src/db/entities/VacayUserYears.entity.ts | 2 +- server/src/db/entities/VacayYears.entity.ts | 2 +- .../db/entities/VisitedCountries.entity.ts | 2 +- .../src/db/entities/VisitedRegions.entity.ts | 2 +- .../db/entities/WebauthnChallenges.entity.ts | 2 +- .../db/entities/WebauthnCredentials.entity.ts | 2 +- server/src/db/entities/index.ts | 2 +- 128 files changed, 159 insertions(+), 211 deletions(-) diff --git a/server/src/db/entities/Addons.entity.ts b/server/src/db/entities/Addons.entity.ts index 3770be535..06d317782 100644 --- a/server/src/db/entities/Addons.entity.ts +++ b/server/src/db/entities/Addons.entity.ts @@ -1,5 +1,5 @@ -import { AddonsRepository } from '../repositories/Addons.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { AddonsRepository } from '../repositories/Addons.repository'; export interface AddonConfig { [key: string]: unknown; diff --git a/server/src/db/entities/AppSettings.entity.ts b/server/src/db/entities/AppSettings.entity.ts index 10bc6ce04..cc57c6318 100644 --- a/server/src/db/entities/AppSettings.entity.ts +++ b/server/src/db/entities/AppSettings.entity.ts @@ -1,5 +1,5 @@ -import { AppSettingsRepository } from '../repositories/AppSettings.repository'; import { EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { AppSettingsRepository } from '../repositories/AppSettings.repository'; export class AppSettings { [EntityRepositoryType]?: AppSettingsRepository; diff --git a/server/src/db/entities/AssignmentParticipants.entity.ts b/server/src/db/entities/AssignmentParticipants.entity.ts index cd262fd04..d1b4dd36a 100644 --- a/server/src/db/entities/AssignmentParticipants.entity.ts +++ b/server/src/db/entities/AssignmentParticipants.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { AssignmentParticipantsRepository } from '../repositories/AssignmentParticipants.repository'; import { DayAssignments } from './DayAssignments.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class AssignmentParticipants { [EntityRepositoryType]?: AssignmentParticipantsRepository; @@ -18,8 +18,7 @@ export const AssignmentParticipantsSchema = defineEntity({ uniques: [{ properties: ['assignment', 'user'] }], properties: { id: p.integer().primary(), - assignment: () => - p.manyToOne(DayAssignments).ref().deleteRule('cascade').hidden().index('idx_assignment_participants_assignment'), + assignment: () => p.manyToOne(DayAssignments).ref().deleteRule('cascade').hidden().index('idx_assignment_participants_assignment'), assignment_id: p.integer().persist(false).index('idx_assignment_participants_assignment'), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden(), user_id: p.integer().persist(false), diff --git a/server/src/db/entities/AuditLog.entity.ts b/server/src/db/entities/AuditLog.entity.ts index 153abf25e..696b57a0a 100644 --- a/server/src/db/entities/AuditLog.entity.ts +++ b/server/src/db/entities/AuditLog.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { AuditLogRepository } from '../repositories/AuditLog.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class AuditLog { [EntityRepositoryType]?: AuditLogRepository; diff --git a/server/src/db/entities/BucketList.entity.ts b/server/src/db/entities/BucketList.entity.ts index a395917b8..3fa087617 100644 --- a/server/src/db/entities/BucketList.entity.ts +++ b/server/src/db/entities/BucketList.entity.ts @@ -1,8 +1,8 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { BucketListRepository } from '../repositories/BucketList.repository'; import { DbTimestampType } from '../types'; import { DawarichVisitSuggestions } from './DawarichVisitSuggestions.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class BucketList { [EntityRepositoryType]?: BucketListRepository; @@ -40,9 +40,7 @@ export const BucketListSchema = defineEntity({ visited_at: p.text().nullable(), visited_source: p.text().nullable(), region_code: p.text().nullable(), - dawarich_visit_suggestions_collection: () => - p.oneToMany(DawarichVisitSuggestions).mappedBy('acceptedBucketListItem').hidden(), - dawarich_visit_suggestions_collection1: () => - p.oneToMany(DawarichVisitSuggestions).mappedBy('matchedBucketListItem').hidden(), + dawarich_visit_suggestions_collection: () => p.oneToMany(DawarichVisitSuggestions).mappedBy('acceptedBucketListItem').hidden(), + dawarich_visit_suggestions_collection1: () => p.oneToMany(DawarichVisitSuggestions).mappedBy('matchedBucketListItem').hidden(), }, }); diff --git a/server/src/db/entities/BudgetCategoryOrder.entity.ts b/server/src/db/entities/BudgetCategoryOrder.entity.ts index d77f0b6ec..3fdbb27d1 100644 --- a/server/src/db/entities/BudgetCategoryOrder.entity.ts +++ b/server/src/db/entities/BudgetCategoryOrder.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { BudgetCategoryOrderRepository } from '../repositories/BudgetCategoryOrder.repository'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class BudgetCategoryOrder { [EntityRepositoryType]?: BudgetCategoryOrderRepository; diff --git a/server/src/db/entities/BudgetItemMembers.entity.ts b/server/src/db/entities/BudgetItemMembers.entity.ts index 390d140eb..507a1cbc2 100644 --- a/server/src/db/entities/BudgetItemMembers.entity.ts +++ b/server/src/db/entities/BudgetItemMembers.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { BudgetItemMembersRepository } from '../repositories/BudgetItemMembers.repository'; import { BudgetItems } from './BudgetItems.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class BudgetItemMembers { [EntityRepositoryType]?: BudgetItemMembersRepository; @@ -20,8 +20,7 @@ export const BudgetItemMembersSchema = defineEntity({ uniques: [{ properties: ['budgetItem', 'user'] }], properties: { id: p.integer().primary(), - budgetItem: () => - p.manyToOne(BudgetItems).ref().deleteRule('cascade').hidden().index('idx_budget_item_members_item'), + budgetItem: () => p.manyToOne(BudgetItems).ref().deleteRule('cascade').hidden().index('idx_budget_item_members_item'), budget_item_id: p.integer().persist(false).index('idx_budget_item_members_item'), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden().index('idx_budget_item_members_user'), user_id: p.integer().persist(false).index('idx_budget_item_members_user'), diff --git a/server/src/db/entities/BudgetItemPayers.entity.ts b/server/src/db/entities/BudgetItemPayers.entity.ts index 6fd03ca1a..5897e81f4 100644 --- a/server/src/db/entities/BudgetItemPayers.entity.ts +++ b/server/src/db/entities/BudgetItemPayers.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { BudgetItemPayersRepository } from '../repositories/BudgetItemPayers.repository'; import { BudgetItems } from './BudgetItems.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class BudgetItemPayers { [EntityRepositoryType]?: BudgetItemPayersRepository; @@ -19,8 +19,7 @@ export const BudgetItemPayersSchema = defineEntity({ uniques: [{ properties: ['budgetItem', 'user'] }], properties: { id: p.integer().primary(), - budgetItem: () => - p.manyToOne(BudgetItems).ref().deleteRule('cascade').hidden().index('idx_budget_item_payers_item'), + budgetItem: () => p.manyToOne(BudgetItems).ref().deleteRule('cascade').hidden().index('idx_budget_item_payers_item'), budget_item_id: p.integer().persist(false).index('idx_budget_item_payers_item'), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden(), user_id: p.integer().persist(false), diff --git a/server/src/db/entities/BudgetItems.entity.ts b/server/src/db/entities/BudgetItems.entity.ts index 00967a047..ad9b2bcc6 100644 --- a/server/src/db/entities/BudgetItems.entity.ts +++ b/server/src/db/entities/BudgetItems.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { BudgetItemsRepository } from '../repositories/BudgetItems.repository'; import { DbTimestampType } from '../types'; import { BudgetItemMembers } from './BudgetItemMembers.entity'; @@ -7,7 +8,6 @@ import { Places } from './Places.entity'; import { Reservations } from './Reservations.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class BudgetItems { [EntityRepositoryType]?: BudgetItemsRepository; diff --git a/server/src/db/entities/BudgetSettlements.entity.ts b/server/src/db/entities/BudgetSettlements.entity.ts index d146aaafc..c0543b20a 100644 --- a/server/src/db/entities/BudgetSettlements.entity.ts +++ b/server/src/db/entities/BudgetSettlements.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { BudgetSettlementsRepository } from '../repositories/BudgetSettlements.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class BudgetSettlements { [EntityRepositoryType]?: BudgetSettlementsRepository; diff --git a/server/src/db/entities/Categories.entity.ts b/server/src/db/entities/Categories.entity.ts index 23b14d7ce..f087532bf 100644 --- a/server/src/db/entities/Categories.entity.ts +++ b/server/src/db/entities/Categories.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CategoriesRepository } from '../repositories/Categories.repository'; import { DbTimestampType } from '../types'; import { CollectionPlaces } from './CollectionPlaces.entity'; import { Places } from './Places.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Categories { [EntityRepositoryType]?: CategoriesRepository; diff --git a/server/src/db/entities/CollabLinks.entity.ts b/server/src/db/entities/CollabLinks.entity.ts index 3d8c7b442..9351f216b 100644 --- a/server/src/db/entities/CollabLinks.entity.ts +++ b/server/src/db/entities/CollabLinks.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollabLinksRepository } from '../repositories/CollabLinks.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollabLinks { [EntityRepositoryType]?: CollabLinksRepository; diff --git a/server/src/db/entities/CollabMessageReactions.entity.ts b/server/src/db/entities/CollabMessageReactions.entity.ts index 5d5ea6c1b..03a08475f 100644 --- a/server/src/db/entities/CollabMessageReactions.entity.ts +++ b/server/src/db/entities/CollabMessageReactions.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollabMessageReactionsRepository } from '../repositories/CollabMessageReactions.repository'; import { DbTimestampType } from '../types'; import { CollabMessages } from './CollabMessages.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollabMessageReactions { [EntityRepositoryType]?: CollabMessageReactionsRepository; diff --git a/server/src/db/entities/CollabMessages.entity.ts b/server/src/db/entities/CollabMessages.entity.ts index 32215e3e6..9b6865bd6 100644 --- a/server/src/db/entities/CollabMessages.entity.ts +++ b/server/src/db/entities/CollabMessages.entity.ts @@ -1,10 +1,10 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollabMessagesRepository } from '../repositories/CollabMessages.repository'; import { DbTimestampType } from '../types'; import { CollabMessageReactions } from './CollabMessageReactions.entity'; import { TripFiles } from './TripFiles.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollabMessages { [EntityRepositoryType]?: CollabMessagesRepository; diff --git a/server/src/db/entities/CollabNotes.entity.ts b/server/src/db/entities/CollabNotes.entity.ts index 5b2136765..4784161f7 100644 --- a/server/src/db/entities/CollabNotes.entity.ts +++ b/server/src/db/entities/CollabNotes.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollabNotesRepository } from '../repositories/CollabNotes.repository'; import { DbTimestampType } from '../types'; import { TripFiles } from './TripFiles.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollabNotes { [EntityRepositoryType]?: CollabNotesRepository; diff --git a/server/src/db/entities/CollabPollVotes.entity.ts b/server/src/db/entities/CollabPollVotes.entity.ts index 9ed7cd7fb..45f877865 100644 --- a/server/src/db/entities/CollabPollVotes.entity.ts +++ b/server/src/db/entities/CollabPollVotes.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollabPollVotesRepository } from '../repositories/CollabPollVotes.repository'; import { DbTimestampType } from '../types'; import { CollabPolls } from './CollabPolls.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollabPollVotes { [EntityRepositoryType]?: CollabPollVotesRepository; diff --git a/server/src/db/entities/CollabPolls.entity.ts b/server/src/db/entities/CollabPolls.entity.ts index e9d463e7c..080d40195 100644 --- a/server/src/db/entities/CollabPolls.entity.ts +++ b/server/src/db/entities/CollabPolls.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollabPollsRepository } from '../repositories/CollabPolls.repository'; import { DbTimestampType } from '../types'; import { CollabPollVotes } from './CollabPollVotes.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollabPolls { [EntityRepositoryType]?: CollabPollsRepository; diff --git a/server/src/db/entities/CollectionLabels.entity.ts b/server/src/db/entities/CollectionLabels.entity.ts index 8057b7b08..fd2b4ebcc 100644 --- a/server/src/db/entities/CollectionLabels.entity.ts +++ b/server/src/db/entities/CollectionLabels.entity.ts @@ -1,8 +1,8 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollectionLabelsRepository } from '../repositories/CollectionLabels.repository'; import { DbTimestampType } from '../types'; import { CollectionPlaces } from './CollectionPlaces.entity'; import { Collections } from './Collections.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollectionLabels { [EntityRepositoryType]?: CollectionLabelsRepository; @@ -21,8 +21,7 @@ export const CollectionLabelsSchema = defineEntity({ repository: () => CollectionLabelsRepository, properties: { id: p.integer().primary(), - collection: () => - p.manyToOne(Collections).ref().deleteRule('cascade').hidden().index('idx_collection_labels_collection'), + collection: () => p.manyToOne(Collections).ref().deleteRule('cascade').hidden().index('idx_collection_labels_collection'), collection_id: p.integer().persist(false).index('idx_collection_labels_collection'), name: p.text(), color: p.text().nullable(), diff --git a/server/src/db/entities/CollectionMembers.entity.ts b/server/src/db/entities/CollectionMembers.entity.ts index 481492e10..c69e4fb01 100644 --- a/server/src/db/entities/CollectionMembers.entity.ts +++ b/server/src/db/entities/CollectionMembers.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollectionMembersRepository } from '../repositories/CollectionMembers.repository'; import { DbTimestampType } from '../types'; import { Collections } from './Collections.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollectionMembers { [EntityRepositoryType]?: CollectionMembersRepository; diff --git a/server/src/db/entities/CollectionPlaceRatings.entity.ts b/server/src/db/entities/CollectionPlaceRatings.entity.ts index b6c331b8a..0ebef9482 100644 --- a/server/src/db/entities/CollectionPlaceRatings.entity.ts +++ b/server/src/db/entities/CollectionPlaceRatings.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollectionPlaceRatingsRepository } from '../repositories/CollectionPlaceRatings.repository'; import { DbTimestampType } from '../types'; import { CollectionPlaces } from './CollectionPlaces.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollectionPlaceRatings { [EntityRepositoryType]?: CollectionPlaceRatingsRepository; @@ -21,8 +21,7 @@ export const CollectionPlaceRatingsSchema = defineEntity({ uniques: [{ properties: ['collectionPlace', 'user'] }], properties: { id: p.integer().primary(), - collectionPlace: () => - p.manyToOne(CollectionPlaces).ref().deleteRule('cascade').hidden().index('idx_collection_place_ratings_place'), + collectionPlace: () => p.manyToOne(CollectionPlaces).ref().deleteRule('cascade').hidden().index('idx_collection_place_ratings_place'), collection_place_id: p.integer().persist(false).index('idx_collection_place_ratings_place'), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden(), user_id: p.integer().persist(false), diff --git a/server/src/db/entities/CollectionPlaces.entity.ts b/server/src/db/entities/CollectionPlaces.entity.ts index bb85c4128..2d76ca8ee 100644 --- a/server/src/db/entities/CollectionPlaces.entity.ts +++ b/server/src/db/entities/CollectionPlaces.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollectionPlacesRepository } from '../repositories/CollectionPlaces.repository'; import { DbTimestampType } from '../types'; import { Categories } from './Categories.entity'; @@ -6,7 +7,6 @@ import { CollectionPlaceRatings } from './CollectionPlaceRatings.entity'; import { Collections } from './Collections.entity'; import { Tags } from './Tags.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class CollectionPlaces { [EntityRepositoryType]?: CollectionPlacesRepository; @@ -50,8 +50,7 @@ export const CollectionPlacesSchema = defineEntity({ repository: () => CollectionPlacesRepository, properties: { id: p.integer().primary(), - collection: () => - p.manyToOne(Collections).ref().deleteRule('cascade').hidden().index('idx_collection_places_collection'), + collection: () => p.manyToOne(Collections).ref().deleteRule('cascade').hidden().index('idx_collection_places_collection'), collection_id: p.integer().persist(false).index('idx_collection_places_collection'), owner: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden(), owner_id: p.integer().persist(false), @@ -80,20 +79,8 @@ export const CollectionPlacesSchema = defineEntity({ created_at: p.type(DbTimestampType).nullable().defaultRaw(`CURRENT_TIMESTAMP`), updated_at: p.type(DbTimestampType).nullable().defaultRaw(`CURRENT_TIMESTAMP`), savedByRef: () => p.manyToOne(Users).ref().joinColumn('saved_by').nullable().hidden(), - collection_place_labels: () => - p - .manyToMany(CollectionLabels) - .pivotTable('collection_place_labels') - .joinColumn('collection_place_id') - .inverseJoinColumn('label_id') - .hidden(), - collection_place_tags: () => - p - .manyToMany(Tags) - .pivotTable('collection_place_tags') - .joinColumn('collection_place_id') - .inverseJoinColumn('tag_id') - .hidden(), + collection_place_labels: () => p.manyToMany(CollectionLabels).pivotTable('collection_place_labels').joinColumn('collection_place_id').inverseJoinColumn('label_id').hidden(), + collection_place_tags: () => p.manyToMany(Tags).pivotTable('collection_place_tags').joinColumn('collection_place_id').inverseJoinColumn('tag_id').hidden(), collection_place_ratings_collection: () => p.oneToMany(CollectionPlaceRatings).mappedBy('collectionPlace').hidden(), }, }); diff --git a/server/src/db/entities/Collections.entity.ts b/server/src/db/entities/Collections.entity.ts index 41a51f7ab..b7718755f 100644 --- a/server/src/db/entities/Collections.entity.ts +++ b/server/src/db/entities/Collections.entity.ts @@ -1,10 +1,10 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { CollectionsRepository } from '../repositories/Collections.repository'; import { DbTimestampType } from '../types'; import { CollectionLabels } from './CollectionLabels.entity'; import { CollectionMembers } from './CollectionMembers.entity'; import { CollectionPlaces } from './CollectionPlaces.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Collections { [EntityRepositoryType]?: CollectionsRepository; diff --git a/server/src/db/entities/DawarichConnections.entity.ts b/server/src/db/entities/DawarichConnections.entity.ts index 0040acb2e..cad8fff72 100644 --- a/server/src/db/entities/DawarichConnections.entity.ts +++ b/server/src/db/entities/DawarichConnections.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DawarichConnectionsRepository } from '../repositories/DawarichConnections.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DawarichConnections { [EntityRepositoryType]?: DawarichConnectionsRepository; diff --git a/server/src/db/entities/DawarichVisitSuggestions.entity.ts b/server/src/db/entities/DawarichVisitSuggestions.entity.ts index 30049d1d0..07b6198ca 100644 --- a/server/src/db/entities/DawarichVisitSuggestions.entity.ts +++ b/server/src/db/entities/DawarichVisitSuggestions.entity.ts @@ -1,9 +1,9 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DawarichVisitSuggestionsRepository } from '../repositories/DawarichVisitSuggestions.repository'; import { BucketList } from './BucketList.entity'; import { Places } from './Places.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DawarichVisitSuggestions { [EntityRepositoryType]?: DawarichVisitSuggestionsRepository; diff --git a/server/src/db/entities/DayAccommodations.entity.ts b/server/src/db/entities/DayAccommodations.entity.ts index 9139b67db..71a86ea1e 100644 --- a/server/src/db/entities/DayAccommodations.entity.ts +++ b/server/src/db/entities/DayAccommodations.entity.ts @@ -1,9 +1,9 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DayAccommodationsRepository } from '../repositories/DayAccommodations.repository'; import { DbTimestampType } from '../types'; import { Days } from './Days.entity'; import { Places } from './Places.entity'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DayAccommodations { [EntityRepositoryType]?: DayAccommodationsRepository; diff --git a/server/src/db/entities/DayAssignments.entity.ts b/server/src/db/entities/DayAssignments.entity.ts index 23f99b428..140edd2d1 100644 --- a/server/src/db/entities/DayAssignments.entity.ts +++ b/server/src/db/entities/DayAssignments.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DayAssignmentsRepository } from '../repositories/DayAssignments.repository'; import { DbTimestampType } from '../types'; import { AssignmentParticipants } from './AssignmentParticipants.entity'; @@ -6,7 +7,6 @@ import { FileLinks } from './FileLinks.entity'; import { Places } from './Places.entity'; import { Reservations } from './Reservations.entity'; import { RoadtripDayBoundaries } from './RoadtripDayBoundaries.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DayAssignments { [EntityRepositoryType]?: DayAssignmentsRepository; diff --git a/server/src/db/entities/DayNotes.entity.ts b/server/src/db/entities/DayNotes.entity.ts index e424909cf..603ec3dff 100644 --- a/server/src/db/entities/DayNotes.entity.ts +++ b/server/src/db/entities/DayNotes.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DayNotesRepository } from '../repositories/DayNotes.repository'; import { DbTimestampType } from '../types'; import { Days } from './Days.entity'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DayNotes { [EntityRepositoryType]?: DayNotesRepository; diff --git a/server/src/db/entities/Days.entity.ts b/server/src/db/entities/Days.entity.ts index a68f8d75c..480e021f3 100644 --- a/server/src/db/entities/Days.entity.ts +++ b/server/src/db/entities/Days.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DaysRepository } from '../repositories/Days.repository'; import { DayAccommodations } from './DayAccommodations.entity'; import { DayAssignments } from './DayAssignments.entity'; @@ -8,7 +9,6 @@ import { Reservations } from './Reservations.entity'; import { RoadtripDayTracks } from './RoadtripDayTracks.entity'; import { RoadtripVias } from './RoadtripVias.entity'; import { Trips } from './Trips.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Days { [EntityRepositoryType]?: DaysRepository; diff --git a/server/src/db/entities/DocumentConnections.entity.ts b/server/src/db/entities/DocumentConnections.entity.ts index 0bfd5211f..62e2b1f98 100644 --- a/server/src/db/entities/DocumentConnections.entity.ts +++ b/server/src/db/entities/DocumentConnections.entity.ts @@ -1,10 +1,10 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DocumentConnectionsRepository } from '../repositories/DocumentConnections.repository'; import { DbTimestampType } from '../types'; import { DocumentProviders } from './DocumentProviders.entity'; import { TripDocumentLinks } from './TripDocumentLinks.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DocumentConnections { [EntityRepositoryType]?: DocumentConnectionsRepository; diff --git a/server/src/db/entities/DocumentProviderFields.entity.ts b/server/src/db/entities/DocumentProviderFields.entity.ts index d4477fc0c..a9a0b8512 100644 --- a/server/src/db/entities/DocumentProviderFields.entity.ts +++ b/server/src/db/entities/DocumentProviderFields.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DocumentProviderFieldsRepository } from '../repositories/DocumentProviderFields.repository'; import { DocumentProviders } from './DocumentProviders.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DocumentProviderFields { [EntityRepositoryType]?: DocumentProviderFieldsRepository; diff --git a/server/src/db/entities/DocumentProviders.entity.ts b/server/src/db/entities/DocumentProviders.entity.ts index f39708f36..683a62280 100644 --- a/server/src/db/entities/DocumentProviders.entity.ts +++ b/server/src/db/entities/DocumentProviders.entity.ts @@ -1,7 +1,7 @@ +import { Collection, EntityRepositoryType, defineEntity, p } from '@mikro-orm/core'; import { DocumentProvidersRepository } from '../repositories/DocumentProviders.repository'; import { DocumentConnections } from './DocumentConnections.entity'; import { DocumentProviderFields } from './DocumentProviderFields.entity'; -import { Collection, EntityRepositoryType, defineEntity, p } from '@mikro-orm/core'; export class DocumentProviders { [EntityRepositoryType]?: DocumentProvidersRepository; diff --git a/server/src/db/entities/DocumentSyncItems.entity.ts b/server/src/db/entities/DocumentSyncItems.entity.ts index c2d59e701..c5f6af221 100644 --- a/server/src/db/entities/DocumentSyncItems.entity.ts +++ b/server/src/db/entities/DocumentSyncItems.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { DocumentSyncItemsRepository } from '../repositories/DocumentSyncItems.repository'; import { TripDocumentLinks } from './TripDocumentLinks.entity'; import { TripFiles } from './TripFiles.entity'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class DocumentSyncItems { [EntityRepositoryType]?: DocumentSyncItemsRepository; diff --git a/server/src/db/entities/FileLinks.entity.ts b/server/src/db/entities/FileLinks.entity.ts index 8903ed5bf..a324b82e8 100644 --- a/server/src/db/entities/FileLinks.entity.ts +++ b/server/src/db/entities/FileLinks.entity.ts @@ -1,3 +1,4 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { FileLinksRepository } from '../repositories/FileLinks.repository'; import { DbTimestampType } from '../types'; import { BudgetItems } from './BudgetItems.entity'; @@ -5,7 +6,6 @@ import { DayAssignments } from './DayAssignments.entity'; import { Places } from './Places.entity'; import { Reservations } from './Reservations.entity'; import { TripFiles } from './TripFiles.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class FileLinks { [EntityRepositoryType]?: FileLinksRepository; diff --git a/server/src/db/entities/GoogleApiUsage.entity.ts b/server/src/db/entities/GoogleApiUsage.entity.ts index 908536a1c..c180b76f4 100644 --- a/server/src/db/entities/GoogleApiUsage.entity.ts +++ b/server/src/db/entities/GoogleApiUsage.entity.ts @@ -1,5 +1,5 @@ -import { GoogleApiUsageRepository } from '../repositories/GoogleApiUsage.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { GoogleApiUsageRepository } from '../repositories/GoogleApiUsage.repository'; export class GoogleApiUsage { [EntityRepositoryType]?: GoogleApiUsageRepository; diff --git a/server/src/db/entities/GooglePlacePhotoMeta.entity.ts b/server/src/db/entities/GooglePlacePhotoMeta.entity.ts index 75603ad79..b84c86f55 100644 --- a/server/src/db/entities/GooglePlacePhotoMeta.entity.ts +++ b/server/src/db/entities/GooglePlacePhotoMeta.entity.ts @@ -1,5 +1,5 @@ -import { GooglePlacePhotoMetaRepository } from '../repositories/GooglePlacePhotoMeta.repository'; import { EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { GooglePlacePhotoMetaRepository } from '../repositories/GooglePlacePhotoMeta.repository'; export class GooglePlacePhotoMeta { [EntityRepositoryType]?: GooglePlacePhotoMetaRepository; diff --git a/server/src/db/entities/HiddenCountries.entity.ts b/server/src/db/entities/HiddenCountries.entity.ts index 3fed16b19..07ef7a8eb 100644 --- a/server/src/db/entities/HiddenCountries.entity.ts +++ b/server/src/db/entities/HiddenCountries.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { HiddenCountriesRepository } from '../repositories/HiddenCountries.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class HiddenCountries { [EntityRepositoryType]?: HiddenCountriesRepository; diff --git a/server/src/db/entities/HiddenRegions.entity.ts b/server/src/db/entities/HiddenRegions.entity.ts index 767c72888..eab7a397f 100644 --- a/server/src/db/entities/HiddenRegions.entity.ts +++ b/server/src/db/entities/HiddenRegions.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { HiddenRegionsRepository } from '../repositories/HiddenRegions.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class HiddenRegions { [EntityRepositoryType]?: HiddenRegionsRepository; diff --git a/server/src/db/entities/IdempotencyKeys.entity.ts b/server/src/db/entities/IdempotencyKeys.entity.ts index a98f33753..4cb740b6a 100644 --- a/server/src/db/entities/IdempotencyKeys.entity.ts +++ b/server/src/db/entities/IdempotencyKeys.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { IdempotencyKeysRepository } from '../repositories/IdempotencyKeys.repository'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class IdempotencyKeys { [EntityRepositoryType]?: IdempotencyKeysRepository; diff --git a/server/src/db/entities/InviteTokens.entity.ts b/server/src/db/entities/InviteTokens.entity.ts index 644ccce0a..dbfcf7bef 100644 --- a/server/src/db/entities/InviteTokens.entity.ts +++ b/server/src/db/entities/InviteTokens.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { InviteTokensRepository } from '../repositories/InviteTokens.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class InviteTokens { [EntityRepositoryType]?: InviteTokensRepository; diff --git a/server/src/db/entities/JourneyBooks.entity.ts b/server/src/db/entities/JourneyBooks.entity.ts index 37119e8f3..29bcdb362 100644 --- a/server/src/db/entities/JourneyBooks.entity.ts +++ b/server/src/db/entities/JourneyBooks.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyBooksRepository } from '../repositories/JourneyBooks.repository'; import { DbTimestampType } from '../types'; import { Journeys } from './Journeys.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyBooks { [EntityRepositoryType]?: JourneyBooksRepository; diff --git a/server/src/db/entities/JourneyContributors.entity.ts b/server/src/db/entities/JourneyContributors.entity.ts index c05cefdcd..f0a60a3cb 100644 --- a/server/src/db/entities/JourneyContributors.entity.ts +++ b/server/src/db/entities/JourneyContributors.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyContributorsRepository } from '../repositories/JourneyContributors.repository'; import { Journeys } from './Journeys.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyContributors { [EntityRepositoryType]?: JourneyContributorsRepository; @@ -22,8 +22,7 @@ export const JourneyContributorsSchema = defineEntity({ properties: { journey: () => p.manyToOne(Journeys).primary().ref().hidden(), journey_id: p.integer().persist(false), - user: () => - p.manyToOne(Users).primary().ref().deleteRule('no action').hidden().index('idx_journey_contributors_user'), + user: () => p.manyToOne(Users).primary().ref().deleteRule('no action').hidden().index('idx_journey_contributors_user'), user_id: p.integer().persist(false).index('idx_journey_contributors_user'), role: p.text(), added_at: p.integer(), diff --git a/server/src/db/entities/JourneyEntries.entity.ts b/server/src/db/entities/JourneyEntries.entity.ts index c804a055e..ee24b7b41 100644 --- a/server/src/db/entities/JourneyEntries.entity.ts +++ b/server/src/db/entities/JourneyEntries.entity.ts @@ -1,10 +1,10 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyEntriesRepository } from '../repositories/JourneyEntries.repository'; import { JourneyEntryPhotos } from './JourneyEntryPhotos.entity'; import { Journeys } from './Journeys.entity'; import { Places } from './Places.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyEntries { [EntityRepositoryType]?: JourneyEntriesRepository; diff --git a/server/src/db/entities/JourneyEntryPhotos.entity.ts b/server/src/db/entities/JourneyEntryPhotos.entity.ts index 1975030cc..4f10cde35 100644 --- a/server/src/db/entities/JourneyEntryPhotos.entity.ts +++ b/server/src/db/entities/JourneyEntryPhotos.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyEntryPhotosRepository } from '../repositories/JourneyEntryPhotos.repository'; import { JourneyEntries } from './JourneyEntries.entity'; import { JourneyPhotos } from './JourneyPhotos.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyEntryPhotos { [EntityRepositoryType]?: JourneyEntryPhotosRepository; diff --git a/server/src/db/entities/JourneyPhotos.entity.ts b/server/src/db/entities/JourneyPhotos.entity.ts index b18208d65..590e21679 100644 --- a/server/src/db/entities/JourneyPhotos.entity.ts +++ b/server/src/db/entities/JourneyPhotos.entity.ts @@ -1,8 +1,8 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyPhotosRepository } from '../repositories/JourneyPhotos.repository'; import { JourneyEntryPhotos } from './JourneyEntryPhotos.entity'; import { Journeys } from './Journeys.entity'; import { TrekPhotos } from './TrekPhotos.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyPhotos { [EntityRepositoryType]?: JourneyPhotosRepository; diff --git a/server/src/db/entities/JourneyShareTokens.entity.ts b/server/src/db/entities/JourneyShareTokens.entity.ts index 2cce312ce..ecc9d9117 100644 --- a/server/src/db/entities/JourneyShareTokens.entity.ts +++ b/server/src/db/entities/JourneyShareTokens.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyShareTokensRepository } from '../repositories/JourneyShareTokens.repository'; import { DbTimestampType } from '../types'; import { Journeys } from './Journeys.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyShareTokens { [EntityRepositoryType]?: JourneyShareTokensRepository; diff --git a/server/src/db/entities/JourneyTrips.entity.ts b/server/src/db/entities/JourneyTrips.entity.ts index 117aafbdc..a55b1ac54 100644 --- a/server/src/db/entities/JourneyTrips.entity.ts +++ b/server/src/db/entities/JourneyTrips.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneyTripsRepository } from '../repositories/JourneyTrips.repository'; import { Journeys } from './Journeys.entity'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class JourneyTrips { [EntityRepositoryType]?: JourneyTripsRepository; diff --git a/server/src/db/entities/Journeys.entity.ts b/server/src/db/entities/Journeys.entity.ts index dca7bc630..d553100b2 100644 --- a/server/src/db/entities/Journeys.entity.ts +++ b/server/src/db/entities/Journeys.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { JourneysRepository } from '../repositories/Journeys.repository'; import { JourneyBooks } from './JourneyBooks.entity'; import { JourneyContributors } from './JourneyContributors.entity'; @@ -6,7 +7,6 @@ import { JourneyPhotos } from './JourneyPhotos.entity'; import { JourneyShareTokens } from './JourneyShareTokens.entity'; import { JourneyTrips } from './JourneyTrips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Journeys { [EntityRepositoryType]?: JourneysRepository; diff --git a/server/src/db/entities/McpTokens.entity.ts b/server/src/db/entities/McpTokens.entity.ts index 7c8040476..d3c8421c2 100644 --- a/server/src/db/entities/McpTokens.entity.ts +++ b/server/src/db/entities/McpTokens.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { McpTokensRepository } from '../repositories/McpTokens.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class McpTokens { [EntityRepositoryType]?: McpTokensRepository; diff --git a/server/src/db/entities/Migrations.entity.ts b/server/src/db/entities/Migrations.entity.ts index a67afc1f4..1c4570f95 100644 --- a/server/src/db/entities/Migrations.entity.ts +++ b/server/src/db/entities/Migrations.entity.ts @@ -1,5 +1,5 @@ -import { MigrationsRepository } from '../repositories/Migrations.repository'; import { EntityRepositoryType, defineEntity, p } from '@mikro-orm/core'; +import { MigrationsRepository } from '../repositories/Migrations.repository'; export class Migrations { [EntityRepositoryType]?: MigrationsRepository; diff --git a/server/src/db/entities/NotificationChannelPreferences.entity.ts b/server/src/db/entities/NotificationChannelPreferences.entity.ts index 56436f0a2..478d1acf6 100644 --- a/server/src/db/entities/NotificationChannelPreferences.entity.ts +++ b/server/src/db/entities/NotificationChannelPreferences.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { NotificationChannelPreferencesRepository } from '../repositories/NotificationChannelPreferences.repository'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class NotificationChannelPreferences { [EntityRepositoryType]?: NotificationChannelPreferencesRepository; diff --git a/server/src/db/entities/Notifications.entity.ts b/server/src/db/entities/Notifications.entity.ts index 2a5450482..775075d67 100644 --- a/server/src/db/entities/Notifications.entity.ts +++ b/server/src/db/entities/Notifications.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { NotificationsRepository } from '../repositories/Notifications.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Notifications { [EntityRepositoryType]?: NotificationsRepository; diff --git a/server/src/db/entities/OauthClients.entity.ts b/server/src/db/entities/OauthClients.entity.ts index 02de4e860..03fb23478 100644 --- a/server/src/db/entities/OauthClients.entity.ts +++ b/server/src/db/entities/OauthClients.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { OauthClientsRepository } from '../repositories/OauthClients.repository'; import { DbTimestampType } from '../types'; import { OauthConsents } from './OauthConsents.entity'; import { OauthTokens } from './OauthTokens.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class OauthClients { [EntityRepositoryType]?: OauthClientsRepository; diff --git a/server/src/db/entities/OauthConsents.entity.ts b/server/src/db/entities/OauthConsents.entity.ts index a1fcd707f..71d867469 100644 --- a/server/src/db/entities/OauthConsents.entity.ts +++ b/server/src/db/entities/OauthConsents.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { OauthConsentsRepository } from '../repositories/OauthConsents.repository'; import { DbTimestampType } from '../types'; import { OauthClients } from './OauthClients.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class OauthConsents { [EntityRepositoryType]?: OauthConsentsRepository; @@ -21,14 +21,7 @@ export const OauthConsentsSchema = defineEntity({ uniques: [{ properties: ['client', 'user'] }], properties: { id: p.integer().primary(), - client: () => - p - .manyToOne(OauthClients) - .ref() - .name('client_id') - .deleteRule('cascade') - .hidden() - .referencedColumnNames('client_id'), + client: () => p.manyToOne(OauthClients).ref().name('client_id').deleteRule('cascade').hidden().referencedColumnNames('client_id'), client_id: p.text().persist(false), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden(), user_id: p.integer().persist(false), diff --git a/server/src/db/entities/OauthTokens.entity.ts b/server/src/db/entities/OauthTokens.entity.ts index 0ee780fbb..b7e912614 100644 --- a/server/src/db/entities/OauthTokens.entity.ts +++ b/server/src/db/entities/OauthTokens.entity.ts @@ -1,8 +1,8 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { OauthTokensRepository } from '../repositories/OauthTokens.repository'; import { DbTimestampType } from '../types'; import { OauthClients } from './OauthClients.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class OauthTokens { [EntityRepositoryType]?: OauthTokensRepository; @@ -27,17 +27,13 @@ export class OauthTokens { export const OauthTokensSchema = defineEntity({ class: OauthTokens, repository: () => OauthTokensRepository, - uniques: [{ properties: ['refresh_token_hash'] }, { properties: ['access_token_hash'] }], + uniques: [ + { properties: ['refresh_token_hash'] }, + { properties: ['access_token_hash'] }, + ], properties: { id: p.integer().primary(), - client: () => - p - .manyToOne(OauthClients) - .ref() - .name('client_id') - .deleteRule('cascade') - .hidden() - .referencedColumnNames('client_id'), + client: () => p.manyToOne(OauthClients).ref().name('client_id').deleteRule('cascade').hidden().referencedColumnNames('client_id'), client_id: p.text().persist(false), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden().index('idx_oauth_tokens_user'), user_id: p.integer().persist(false).index('idx_oauth_tokens_user'), @@ -48,8 +44,7 @@ export const OauthTokensSchema = defineEntity({ refresh_token_expires_at: p.type(DbTimestampType), revoked_at: p.type(DbTimestampType).nullable(), created_at: p.type(DbTimestampType).nullable().defaultRaw(`CURRENT_TIMESTAMP`), - parentToken: () => - p.manyToOne(OauthTokens).ref().deleteRule('no action').nullable().hidden().index('idx_oauth_tokens_parent'), + parentToken: () => p.manyToOne(OauthTokens).ref().deleteRule('no action').nullable().hidden().index('idx_oauth_tokens_parent'), parent_token_id: p.integer().nullable().persist(false).index('idx_oauth_tokens_parent'), audience: p.text().nullable(), oauth_tokens_collection: () => p.oneToMany(OauthTokens).mappedBy('parentToken').hidden(), diff --git a/server/src/db/entities/PackingBags.entity.ts b/server/src/db/entities/PackingBags.entity.ts index e47a3599e..815907046 100644 --- a/server/src/db/entities/PackingBags.entity.ts +++ b/server/src/db/entities/PackingBags.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingBagsRepository } from '../repositories/PackingBags.repository'; import { DbTimestampType } from '../types'; import { PackingItems } from './PackingItems.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingBags { [EntityRepositoryType]?: PackingBagsRepository; @@ -35,8 +35,7 @@ export const PackingBagsSchema = defineEntity({ created_at: p.type(DbTimestampType).nullable().defaultRaw(`CURRENT_TIMESTAMP`), user: () => p.manyToOne(Users).ref().nullable().hidden().defaultRaw(`NULL`), user_id: p.integer().nullable().persist(false).defaultRaw(`NULL`), - packing_bag_members: () => - p.manyToMany(Users).pivotTable('packing_bag_members').joinColumn('bag_id').inverseJoinColumn('user_id').hidden(), + packing_bag_members: () => p.manyToMany(Users).pivotTable('packing_bag_members').joinColumn('bag_id').inverseJoinColumn('user_id').hidden(), packing_items_collection: () => p.oneToMany(PackingItems).mappedBy('bag').hidden(), }, }); diff --git a/server/src/db/entities/PackingCategoryAssignees.entity.ts b/server/src/db/entities/PackingCategoryAssignees.entity.ts index f0b3fa9b6..d88548fef 100644 --- a/server/src/db/entities/PackingCategoryAssignees.entity.ts +++ b/server/src/db/entities/PackingCategoryAssignees.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingCategoryAssigneesRepository } from '../repositories/PackingCategoryAssignees.repository'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingCategoryAssignees { [EntityRepositoryType]?: PackingCategoryAssigneesRepository; diff --git a/server/src/db/entities/PackingItemContributors.entity.ts b/server/src/db/entities/PackingItemContributors.entity.ts index bebc40c74..315927fcb 100644 --- a/server/src/db/entities/PackingItemContributors.entity.ts +++ b/server/src/db/entities/PackingItemContributors.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingItemContributorsRepository } from '../repositories/PackingItemContributors.repository'; import { DbTimestampType } from '../types'; import { PackingItems } from './PackingItems.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingItemContributors { [EntityRepositoryType]?: PackingItemContributorsRepository; diff --git a/server/src/db/entities/PackingItems.entity.ts b/server/src/db/entities/PackingItems.entity.ts index 35f279053..94b422f2b 100644 --- a/server/src/db/entities/PackingItems.entity.ts +++ b/server/src/db/entities/PackingItems.entity.ts @@ -1,10 +1,10 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingItemsRepository } from '../repositories/PackingItems.repository'; import { DbTimestampType } from '../types'; import { PackingBags } from './PackingBags.entity'; import { PackingItemContributors } from './PackingItemContributors.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingItems { [EntityRepositoryType]?: PackingItemsRepository; @@ -51,21 +51,8 @@ export const PackingItemsSchema = defineEntity({ owner: () => p.manyToOne(Users).ref().nullable().hidden(), owner_id: p.integer().nullable().persist(false), packed_quantity: p.integer().nullable(), - packing_item_contributors: () => - p - .manyToMany(Users) - .pivotTable('packing_item_contributors') - .pivotEntity(() => PackingItemContributors) - .joinColumn('item_id') - .inverseJoinColumn('user_id') - .hidden(), - packing_item_recipients: () => - p - .manyToMany(Users) - .pivotTable('packing_item_recipients') - .joinColumn('item_id') - .inverseJoinColumn('user_id') - .hidden(), + packing_item_contributors: () => p.manyToMany(Users).pivotTable('packing_item_contributors').pivotEntity(() => PackingItemContributors).joinColumn('item_id').inverseJoinColumn('user_id').hidden(), + packing_item_recipients: () => p.manyToMany(Users).pivotTable('packing_item_recipients').joinColumn('item_id').inverseJoinColumn('user_id').hidden(), packing_item_contributors_collection: () => p.oneToMany(PackingItemContributors).mappedBy('item').hidden(), }, }); diff --git a/server/src/db/entities/PackingTemplateCategories.entity.ts b/server/src/db/entities/PackingTemplateCategories.entity.ts index b31c1b435..748f4d3d0 100644 --- a/server/src/db/entities/PackingTemplateCategories.entity.ts +++ b/server/src/db/entities/PackingTemplateCategories.entity.ts @@ -1,7 +1,7 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingTemplateCategoriesRepository } from '../repositories/PackingTemplateCategories.repository'; import { PackingTemplateItems } from './PackingTemplateItems.entity'; import { PackingTemplates } from './PackingTemplates.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingTemplateCategories { [EntityRepositoryType]?: PackingTemplateCategoriesRepository; diff --git a/server/src/db/entities/PackingTemplateItems.entity.ts b/server/src/db/entities/PackingTemplateItems.entity.ts index d2a931270..891ee4baa 100644 --- a/server/src/db/entities/PackingTemplateItems.entity.ts +++ b/server/src/db/entities/PackingTemplateItems.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingTemplateItemsRepository } from '../repositories/PackingTemplateItems.repository'; import { PackingTemplateCategories } from './PackingTemplateCategories.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingTemplateItems { [EntityRepositoryType]?: PackingTemplateItemsRepository; diff --git a/server/src/db/entities/PackingTemplates.entity.ts b/server/src/db/entities/PackingTemplates.entity.ts index 95f319b2f..fc35b6231 100644 --- a/server/src/db/entities/PackingTemplates.entity.ts +++ b/server/src/db/entities/PackingTemplates.entity.ts @@ -1,8 +1,8 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PackingTemplatesRepository } from '../repositories/PackingTemplates.repository'; import { DbTimestampType } from '../types'; import { PackingTemplateCategories } from './PackingTemplateCategories.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PackingTemplates { [EntityRepositoryType]?: PackingTemplatesRepository; diff --git a/server/src/db/entities/PasswordResetTokens.entity.ts b/server/src/db/entities/PasswordResetTokens.entity.ts index 4edc5d433..8f015cdfc 100644 --- a/server/src/db/entities/PasswordResetTokens.entity.ts +++ b/server/src/db/entities/PasswordResetTokens.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PasswordResetTokensRepository } from '../repositories/PasswordResetTokens.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PasswordResetTokens { [EntityRepositoryType]?: PasswordResetTokensRepository; diff --git a/server/src/db/entities/PhotoProviderFields.entity.ts b/server/src/db/entities/PhotoProviderFields.entity.ts index 649a8a267..27758e7fc 100644 --- a/server/src/db/entities/PhotoProviderFields.entity.ts +++ b/server/src/db/entities/PhotoProviderFields.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PhotoProviderFieldsRepository } from '../repositories/PhotoProviderFields.repository'; import { PhotoProviders } from './PhotoProviders.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PhotoProviderFields { [EntityRepositoryType]?: PhotoProviderFieldsRepository; diff --git a/server/src/db/entities/PhotoProviders.entity.ts b/server/src/db/entities/PhotoProviders.entity.ts index 714653b29..9cb2dd746 100644 --- a/server/src/db/entities/PhotoProviders.entity.ts +++ b/server/src/db/entities/PhotoProviders.entity.ts @@ -1,6 +1,6 @@ +import { Collection, EntityRepositoryType, defineEntity, p } from '@mikro-orm/core'; import { PhotoProvidersRepository } from '../repositories/PhotoProviders.repository'; import { PhotoProviderFields } from './PhotoProviderFields.entity'; -import { Collection, EntityRepositoryType, defineEntity, p } from '@mikro-orm/core'; export class PhotoProviders { [EntityRepositoryType]?: PhotoProvidersRepository; diff --git a/server/src/db/entities/Photos.entity.ts b/server/src/db/entities/Photos.entity.ts index 1c2c079e4..d64376d2a 100644 --- a/server/src/db/entities/Photos.entity.ts +++ b/server/src/db/entities/Photos.entity.ts @@ -1,9 +1,9 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PhotosRepository } from '../repositories/Photos.repository'; import { DbTimestampType } from '../types'; import { Days } from './Days.entity'; import { Places } from './Places.entity'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Photos { [EntityRepositoryType]?: PhotosRepository; diff --git a/server/src/db/entities/PlaceDetailsCache.entity.ts b/server/src/db/entities/PlaceDetailsCache.entity.ts index 337e36d13..90adba03d 100644 --- a/server/src/db/entities/PlaceDetailsCache.entity.ts +++ b/server/src/db/entities/PlaceDetailsCache.entity.ts @@ -1,5 +1,5 @@ -import { PlaceDetailsCacheRepository } from '../repositories/PlaceDetailsCache.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { PlaceDetailsCacheRepository } from '../repositories/PlaceDetailsCache.repository'; export class PlaceDetailsCache { [EntityRepositoryType]?: PlaceDetailsCacheRepository; diff --git a/server/src/db/entities/PlaceRatings.entity.ts b/server/src/db/entities/PlaceRatings.entity.ts index ed02c8026..dbaa519d7 100644 --- a/server/src/db/entities/PlaceRatings.entity.ts +++ b/server/src/db/entities/PlaceRatings.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PlaceRatingsRepository } from '../repositories/PlaceRatings.repository'; import { DbTimestampType } from '../types'; import { Places } from './Places.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PlaceRatings { [EntityRepositoryType]?: PlaceRatingsRepository; diff --git a/server/src/db/entities/PlaceRegions.entity.ts b/server/src/db/entities/PlaceRegions.entity.ts index 6d5fd072e..11beadcf7 100644 --- a/server/src/db/entities/PlaceRegions.entity.ts +++ b/server/src/db/entities/PlaceRegions.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PlaceRegionsRepository } from '../repositories/PlaceRegions.repository'; import { Places } from './Places.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PlaceRegions { [EntityRepositoryType]?: PlaceRegionsRepository; diff --git a/server/src/db/entities/PlaceShadowPicks.entity.ts b/server/src/db/entities/PlaceShadowPicks.entity.ts index 5ad952e5f..d26ef5ee3 100644 --- a/server/src/db/entities/PlaceShadowPicks.entity.ts +++ b/server/src/db/entities/PlaceShadowPicks.entity.ts @@ -1,5 +1,5 @@ -import { PlaceShadowPicksRepository } from '../repositories/PlaceShadowPicks.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PlaceShadowPicksRepository } from '../repositories/PlaceShadowPicks.repository'; export class PlaceShadowPicks { [EntityRepositoryType]?: PlaceShadowPicksRepository; diff --git a/server/src/db/entities/Places.entity.ts b/server/src/db/entities/Places.entity.ts index 4b85caca0..2f867ab74 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'; @@ -15,7 +16,6 @@ import { RoadtripDayTracks } from './RoadtripDayTracks.entity'; import { Tags } from './Tags.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; @@ -110,11 +110,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/PluginActions.entity.ts b/server/src/db/entities/PluginActions.entity.ts index ddde8cd1e..84caeece3 100644 --- a/server/src/db/entities/PluginActions.entity.ts +++ b/server/src/db/entities/PluginActions.entity.ts @@ -1,5 +1,5 @@ -import { PluginActionsRepository } from '../repositories/PluginActions.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { PluginActionsRepository } from '../repositories/PluginActions.repository'; export class PluginActions { [EntityRepositoryType]?: PluginActionsRepository; diff --git a/server/src/db/entities/PluginCapabilityAudit.entity.ts b/server/src/db/entities/PluginCapabilityAudit.entity.ts index 2f4b6bc0d..10c034cb2 100644 --- a/server/src/db/entities/PluginCapabilityAudit.entity.ts +++ b/server/src/db/entities/PluginCapabilityAudit.entity.ts @@ -1,5 +1,5 @@ -import { PluginCapabilityAuditRepository } from '../repositories/PluginCapabilityAudit.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PluginCapabilityAuditRepository } from '../repositories/PluginCapabilityAudit.repository'; export class PluginCapabilityAudit { [EntityRepositoryType]?: PluginCapabilityAuditRepository; diff --git a/server/src/db/entities/PluginEgressHosts.entity.ts b/server/src/db/entities/PluginEgressHosts.entity.ts index 27db9f4d4..e5b6398a7 100644 --- a/server/src/db/entities/PluginEgressHosts.entity.ts +++ b/server/src/db/entities/PluginEgressHosts.entity.ts @@ -1,5 +1,5 @@ -import { PluginEgressHostsRepository } from '../repositories/PluginEgressHosts.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PluginEgressHostsRepository } from '../repositories/PluginEgressHosts.repository'; export class PluginEgressHosts { [EntityRepositoryType]?: PluginEgressHostsRepository; diff --git a/server/src/db/entities/PluginEntityMetadata.entity.ts b/server/src/db/entities/PluginEntityMetadata.entity.ts index 489f58edd..818bf41e3 100644 --- a/server/src/db/entities/PluginEntityMetadata.entity.ts +++ b/server/src/db/entities/PluginEntityMetadata.entity.ts @@ -1,5 +1,5 @@ -import { PluginEntityMetadataRepository } from '../repositories/PluginEntityMetadata.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PluginEntityMetadataRepository } from '../repositories/PluginEntityMetadata.repository'; export class PluginEntityMetadata { [EntityRepositoryType]?: PluginEntityMetadataRepository; diff --git a/server/src/db/entities/PluginErrorLog.entity.ts b/server/src/db/entities/PluginErrorLog.entity.ts index f161ae336..e3b8f8143 100644 --- a/server/src/db/entities/PluginErrorLog.entity.ts +++ b/server/src/db/entities/PluginErrorLog.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; import { PluginErrorLogRepository } from '../repositories/PluginErrorLog.repository'; import { DbTimestampType } from '../types'; -import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; export class PluginErrorLog { [EntityRepositoryType]?: PluginErrorLogRepository; @@ -15,7 +15,9 @@ export class PluginErrorLog { export const PluginErrorLogSchema = defineEntity({ class: PluginErrorLog, repository: () => PluginErrorLogRepository, - indexes: [{ name: 'idx_plugin_error_log_plugin', properties: ['plugin_id', 'ts'] }], + indexes: [ + { name: 'idx_plugin_error_log_plugin', properties: ['plugin_id', 'ts'] }, + ], properties: { id: p.integer().primary(), plugin_id: p.text(), diff --git a/server/src/db/entities/PluginMetaMigrations.entity.ts b/server/src/db/entities/PluginMetaMigrations.entity.ts index d0c28015b..48fffae11 100644 --- a/server/src/db/entities/PluginMetaMigrations.entity.ts +++ b/server/src/db/entities/PluginMetaMigrations.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; import { PluginMetaMigrationsRepository } from '../repositories/PluginMetaMigrations.repository'; import { DbTimestampType } from '../types'; -import { EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; export class PluginMetaMigrations { [EntityRepositoryType]?: PluginMetaMigrationsRepository; diff --git a/server/src/db/entities/PluginOauthState.entity.ts b/server/src/db/entities/PluginOauthState.entity.ts index 995c09b19..2893eda14 100644 --- a/server/src/db/entities/PluginOauthState.entity.ts +++ b/server/src/db/entities/PluginOauthState.entity.ts @@ -1,5 +1,5 @@ -import { PluginOauthStateRepository } from '../repositories/PluginOauthState.repository'; import { EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { PluginOauthStateRepository } from '../repositories/PluginOauthState.repository'; export class PluginOauthState { [EntityRepositoryType]?: PluginOauthStateRepository; diff --git a/server/src/db/entities/PluginOauthTokens.entity.ts b/server/src/db/entities/PluginOauthTokens.entity.ts index ce4685513..14108533c 100644 --- a/server/src/db/entities/PluginOauthTokens.entity.ts +++ b/server/src/db/entities/PluginOauthTokens.entity.ts @@ -1,5 +1,5 @@ -import { PluginOauthTokensRepository } from '../repositories/PluginOauthTokens.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { PluginOauthTokensRepository } from '../repositories/PluginOauthTokens.repository'; export class PluginOauthTokens { [EntityRepositoryType]?: PluginOauthTokensRepository; diff --git a/server/src/db/entities/PluginScheduledTasks.entity.ts b/server/src/db/entities/PluginScheduledTasks.entity.ts index 5be17bb3d..9597eed7e 100644 --- a/server/src/db/entities/PluginScheduledTasks.entity.ts +++ b/server/src/db/entities/PluginScheduledTasks.entity.ts @@ -1,5 +1,5 @@ -import { PluginScheduledTasksRepository } from '../repositories/PluginScheduledTasks.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PluginScheduledTasksRepository } from '../repositories/PluginScheduledTasks.repository'; export class PluginScheduledTasks { [EntityRepositoryType]?: PluginScheduledTasksRepository; diff --git a/server/src/db/entities/PluginSettingsFields.entity.ts b/server/src/db/entities/PluginSettingsFields.entity.ts index 6dfb54e40..0100d4515 100644 --- a/server/src/db/entities/PluginSettingsFields.entity.ts +++ b/server/src/db/entities/PluginSettingsFields.entity.ts @@ -1,5 +1,5 @@ -import { PluginSettingsFieldsRepository } from '../repositories/PluginSettingsFields.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PluginSettingsFieldsRepository } from '../repositories/PluginSettingsFields.repository'; export class PluginSettingsFields { [EntityRepositoryType]?: PluginSettingsFieldsRepository; diff --git a/server/src/db/entities/PluginUserConfig.entity.ts b/server/src/db/entities/PluginUserConfig.entity.ts index 66fed13a0..b6ae59582 100644 --- a/server/src/db/entities/PluginUserConfig.entity.ts +++ b/server/src/db/entities/PluginUserConfig.entity.ts @@ -1,5 +1,5 @@ -import { PluginUserConfigRepository } from '../repositories/PluginUserConfig.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { PluginUserConfigRepository } from '../repositories/PluginUserConfig.repository'; export class PluginUserConfig { [EntityRepositoryType]?: PluginUserConfigRepository; diff --git a/server/src/db/entities/PluginUserErasureQueue.entity.ts b/server/src/db/entities/PluginUserErasureQueue.entity.ts index 369176777..585b5eb70 100644 --- a/server/src/db/entities/PluginUserErasureQueue.entity.ts +++ b/server/src/db/entities/PluginUserErasureQueue.entity.ts @@ -1,5 +1,5 @@ -import { PluginUserErasureQueueRepository } from '../repositories/PluginUserErasureQueue.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { PluginUserErasureQueueRepository } from '../repositories/PluginUserErasureQueue.repository'; export class PluginUserErasureQueue { [EntityRepositoryType]?: PluginUserErasureQueueRepository; diff --git a/server/src/db/entities/Plugins.entity.ts b/server/src/db/entities/Plugins.entity.ts index 7288e9541..53d060d15 100644 --- a/server/src/db/entities/Plugins.entity.ts +++ b/server/src/db/entities/Plugins.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; import { PluginsRepository } from '../repositories/Plugins.repository'; import { DbTimestampType } from '../types'; -import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; export class Plugins { [EntityRepositoryType]?: PluginsRepository; diff --git a/server/src/db/entities/PushSubscriptions.entity.ts b/server/src/db/entities/PushSubscriptions.entity.ts index 0f5ea493e..e346ae97d 100644 --- a/server/src/db/entities/PushSubscriptions.entity.ts +++ b/server/src/db/entities/PushSubscriptions.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { PushSubscriptionsRepository } from '../repositories/PushSubscriptions.repository'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class PushSubscriptions { [EntityRepositoryType]?: PushSubscriptionsRepository; diff --git a/server/src/db/entities/ReservationDayPositions.entity.ts b/server/src/db/entities/ReservationDayPositions.entity.ts index ab1033e9f..5dddf729e 100644 --- a/server/src/db/entities/ReservationDayPositions.entity.ts +++ b/server/src/db/entities/ReservationDayPositions.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { ReservationDayPositionsRepository } from '../repositories/ReservationDayPositions.repository'; import { Days } from './Days.entity'; import { Reservations } from './Reservations.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class ReservationDayPositions { [EntityRepositoryType]?: ReservationDayPositionsRepository; diff --git a/server/src/db/entities/ReservationEndpoints.entity.ts b/server/src/db/entities/ReservationEndpoints.entity.ts index 1aafe0b39..825307730 100644 --- a/server/src/db/entities/ReservationEndpoints.entity.ts +++ b/server/src/db/entities/ReservationEndpoints.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { ReservationEndpointsRepository } from '../repositories/ReservationEndpoints.repository'; import { DbTimestampType } from '../types'; import { Reservations } from './Reservations.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class ReservationEndpoints { [EntityRepositoryType]?: ReservationEndpointsRepository; @@ -25,8 +25,7 @@ export const ReservationEndpointsSchema = defineEntity({ repository: () => ReservationEndpointsRepository, properties: { id: p.integer().primary(), - reservation: () => - p.manyToOne(Reservations).ref().deleteRule('cascade').hidden().index('idx_reservation_endpoints_reservation_id'), + reservation: () => p.manyToOne(Reservations).ref().deleteRule('cascade').hidden().index('idx_reservation_endpoints_reservation_id'), reservation_id: p.integer().persist(false).index('idx_reservation_endpoints_reservation_id'), role: p.text(), sequence: p.integer().default(0), diff --git a/server/src/db/entities/ReservationTravelers.entity.ts b/server/src/db/entities/ReservationTravelers.entity.ts index deb79bdff..0ac8313e1 100644 --- a/server/src/db/entities/ReservationTravelers.entity.ts +++ b/server/src/db/entities/ReservationTravelers.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { ReservationTravelersRepository } from '../repositories/ReservationTravelers.repository'; import { Reservations } from './Reservations.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class ReservationTravelers { [EntityRepositoryType]?: ReservationTravelersRepository; @@ -18,8 +18,7 @@ export const ReservationTravelersSchema = defineEntity({ uniques: [{ properties: ['reservation', 'user'] }], properties: { id: p.integer().primary(), - reservation: () => - p.manyToOne(Reservations).ref().deleteRule('cascade').hidden().index('idx_reservation_travelers_res'), + reservation: () => p.manyToOne(Reservations).ref().deleteRule('cascade').hidden().index('idx_reservation_travelers_res'), reservation_id: p.integer().persist(false).index('idx_reservation_travelers_res'), user: () => p.manyToOne(Users).ref().deleteRule('cascade').hidden().index('idx_reservation_travelers_user'), user_id: p.integer().persist(false).index('idx_reservation_travelers_user'), diff --git a/server/src/db/entities/Reservations.entity.ts b/server/src/db/entities/Reservations.entity.ts index 2d3e66b80..8c946b908 100644 --- a/server/src/db/entities/Reservations.entity.ts +++ b/server/src/db/entities/Reservations.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { ReservationsRepository } from '../repositories/Reservations.repository'; import { DbTimestampType } from '../types'; import { BudgetItems } from './BudgetItems.entity'; @@ -10,7 +11,6 @@ import { ReservationEndpoints } from './ReservationEndpoints.entity'; import { ReservationTravelers } from './ReservationTravelers.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 Reservations { [EntityRepositoryType]?: ReservationsRepository; diff --git a/server/src/db/entities/RoadtripDayBoundaries.entity.ts b/server/src/db/entities/RoadtripDayBoundaries.entity.ts index 6ed2f8837..1edce45ea 100644 --- a/server/src/db/entities/RoadtripDayBoundaries.entity.ts +++ b/server/src/db/entities/RoadtripDayBoundaries.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { RoadtripDayBoundariesRepository } from '../repositories/RoadtripDayBoundaries.repository'; import { DayAssignments } from './DayAssignments.entity'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class RoadtripDayBoundaries { [EntityRepositoryType]?: RoadtripDayBoundariesRepository; diff --git a/server/src/db/entities/RoadtripDayTracks.entity.ts b/server/src/db/entities/RoadtripDayTracks.entity.ts index 2c9379358..7c0387499 100644 --- a/server/src/db/entities/RoadtripDayTracks.entity.ts +++ b/server/src/db/entities/RoadtripDayTracks.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { RoadtripDayTracksRepository } from '../repositories/RoadtripDayTracks.repository'; import { Days } from './Days.entity'; import { Places } from './Places.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class RoadtripDayTracks { [EntityRepositoryType]?: RoadtripDayTracksRepository; diff --git a/server/src/db/entities/RoadtripPreferences.entity.ts b/server/src/db/entities/RoadtripPreferences.entity.ts index d5340a58c..d5879c332 100644 --- a/server/src/db/entities/RoadtripPreferences.entity.ts +++ b/server/src/db/entities/RoadtripPreferences.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { RoadtripPreferencesRepository } from '../repositories/RoadtripPreferences.repository'; import { Trips } from './Trips.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class RoadtripPreferences { [EntityRepositoryType]?: RoadtripPreferencesRepository; diff --git a/server/src/db/entities/RoadtripVias.entity.ts b/server/src/db/entities/RoadtripVias.entity.ts index bab6b65af..477a07124 100644 --- a/server/src/db/entities/RoadtripVias.entity.ts +++ b/server/src/db/entities/RoadtripVias.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { RoadtripViasRepository } from '../repositories/RoadtripVias.repository'; import { Days } from './Days.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class RoadtripVias { [EntityRepositoryType]?: RoadtripViasRepository; diff --git a/server/src/db/entities/RouteUsageDaily.entity.ts b/server/src/db/entities/RouteUsageDaily.entity.ts index 7e0d257c9..fea8f7edc 100644 --- a/server/src/db/entities/RouteUsageDaily.entity.ts +++ b/server/src/db/entities/RouteUsageDaily.entity.ts @@ -1,5 +1,5 @@ -import { RouteUsageDailyRepository } from '../repositories/RouteUsageDaily.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { RouteUsageDailyRepository } from '../repositories/RouteUsageDaily.repository'; export class RouteUsageDaily { [EntityRepositoryType]?: RouteUsageDailyRepository; diff --git a/server/src/db/entities/SchemaVersion.entity.ts b/server/src/db/entities/SchemaVersion.entity.ts index bb8db0d7f..48e8e4cc7 100644 --- a/server/src/db/entities/SchemaVersion.entity.ts +++ b/server/src/db/entities/SchemaVersion.entity.ts @@ -1,5 +1,5 @@ -import { SchemaVersionRepository } from '../repositories/SchemaVersion.repository'; import { EntityRepositoryType, type Opt, defineEntity, p } from '@mikro-orm/core'; +import { SchemaVersionRepository } from '../repositories/SchemaVersion.repository'; export class SchemaVersion { [EntityRepositoryType]?: SchemaVersionRepository; diff --git a/server/src/db/entities/SchoolHolidayCountries.entity.ts b/server/src/db/entities/SchoolHolidayCountries.entity.ts index 82b4a80ce..73e041190 100644 --- a/server/src/db/entities/SchoolHolidayCountries.entity.ts +++ b/server/src/db/entities/SchoolHolidayCountries.entity.ts @@ -1,6 +1,6 @@ +import { Collection, EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; import { SchoolHolidayCountriesRepository } from '../repositories/SchoolHolidayCountries.repository'; import { SchoolHolidayRegions } from './SchoolHolidayRegions.entity'; -import { Collection, EntityRepositoryType, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; export class SchoolHolidayCountries { [EntityRepositoryType]?: SchoolHolidayCountriesRepository; diff --git a/server/src/db/entities/SchoolHolidayPeriods.entity.ts b/server/src/db/entities/SchoolHolidayPeriods.entity.ts index 837c803e8..628ec39e7 100644 --- a/server/src/db/entities/SchoolHolidayPeriods.entity.ts +++ b/server/src/db/entities/SchoolHolidayPeriods.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { SchoolHolidayPeriodsRepository } from '../repositories/SchoolHolidayPeriods.repository'; import { SchoolHolidayRegions } from './SchoolHolidayRegions.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class SchoolHolidayPeriods { [EntityRepositoryType]?: SchoolHolidayPeriodsRepository; @@ -23,8 +23,7 @@ export const SchoolHolidayPeriodsSchema = defineEntity({ ], properties: { id: p.integer().primary(), - region: () => - p.manyToOne(SchoolHolidayRegions).ref().deleteRule('cascade').hidden().index('idx_school_holiday_periods_region'), + region: () => p.manyToOne(SchoolHolidayRegions).ref().deleteRule('cascade').hidden().index('idx_school_holiday_periods_region'), region_id: p.integer().persist(false).index('idx_school_holiday_periods_region'), name: p.text(), start_date: p.text(), diff --git a/server/src/db/entities/SchoolHolidayRegions.entity.ts b/server/src/db/entities/SchoolHolidayRegions.entity.ts index f0589e66d..154fbc607 100644 --- a/server/src/db/entities/SchoolHolidayRegions.entity.ts +++ b/server/src/db/entities/SchoolHolidayRegions.entity.ts @@ -1,7 +1,7 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { SchoolHolidayRegionsRepository } from '../repositories/SchoolHolidayRegions.repository'; import { SchoolHolidayCountries } from './SchoolHolidayCountries.entity'; import { SchoolHolidayPeriods } from './SchoolHolidayPeriods.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class SchoolHolidayRegions { [EntityRepositoryType]?: SchoolHolidayRegionsRepository; diff --git a/server/src/db/entities/Settings.entity.ts b/server/src/db/entities/Settings.entity.ts index a265134bb..6de914911 100644 --- a/server/src/db/entities/Settings.entity.ts +++ b/server/src/db/entities/Settings.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { SettingsRepository } from '../repositories/Settings.repository'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Settings { [EntityRepositoryType]?: SettingsRepository; diff --git a/server/src/db/entities/ShareTokens.entity.ts b/server/src/db/entities/ShareTokens.entity.ts index 941b023af..2ac1b161e 100644 --- a/server/src/db/entities/ShareTokens.entity.ts +++ b/server/src/db/entities/ShareTokens.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { ShareTokensRepository } from '../repositories/ShareTokens.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class ShareTokens { [EntityRepositoryType]?: ShareTokensRepository; diff --git a/server/src/db/entities/Tags.entity.ts b/server/src/db/entities/Tags.entity.ts index 6fb052984..7c58f8e7e 100644 --- a/server/src/db/entities/Tags.entity.ts +++ b/server/src/db/entities/Tags.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TagsRepository } from '../repositories/Tags.repository'; import { DbTimestampType } from '../types'; import { CollectionPlaces } from './CollectionPlaces.entity'; import { Places } from './Places.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Tags { [EntityRepositoryType]?: TagsRepository; diff --git a/server/src/db/entities/TodoCategoryAssignees.entity.ts b/server/src/db/entities/TodoCategoryAssignees.entity.ts index d193dc33e..76003274d 100644 --- a/server/src/db/entities/TodoCategoryAssignees.entity.ts +++ b/server/src/db/entities/TodoCategoryAssignees.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TodoCategoryAssigneesRepository } from '../repositories/TodoCategoryAssignees.repository'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TodoCategoryAssignees { [EntityRepositoryType]?: TodoCategoryAssigneesRepository; diff --git a/server/src/db/entities/TodoItems.entity.ts b/server/src/db/entities/TodoItems.entity.ts index 64530ef26..206b2331e 100644 --- a/server/src/db/entities/TodoItems.entity.ts +++ b/server/src/db/entities/TodoItems.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TodoItemsRepository } from '../repositories/TodoItems.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TodoItems { [EntityRepositoryType]?: TodoItemsRepository; diff --git a/server/src/db/entities/TrekPhotoCacheMeta.entity.ts b/server/src/db/entities/TrekPhotoCacheMeta.entity.ts index 62fa40e7c..6907a3888 100644 --- a/server/src/db/entities/TrekPhotoCacheMeta.entity.ts +++ b/server/src/db/entities/TrekPhotoCacheMeta.entity.ts @@ -1,5 +1,5 @@ -import { TrekPhotoCacheMetaRepository } from '../repositories/TrekPhotoCacheMeta.repository'; import { EntityRepositoryType, type Opt, PrimaryKeyProp, defineEntity, p } from '@mikro-orm/core'; +import { TrekPhotoCacheMetaRepository } from '../repositories/TrekPhotoCacheMeta.repository'; export class TrekPhotoCacheMeta { [EntityRepositoryType]?: TrekPhotoCacheMetaRepository; diff --git a/server/src/db/entities/TrekPhotos.entity.ts b/server/src/db/entities/TrekPhotos.entity.ts index a9a0994af..6c2c969de 100644 --- a/server/src/db/entities/TrekPhotos.entity.ts +++ b/server/src/db/entities/TrekPhotos.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TrekPhotosRepository } from '../repositories/TrekPhotos.repository'; import { DbTimestampType } from '../types'; import { JourneyPhotos } from './JourneyPhotos.entity'; import { TripPhotos } from './TripPhotos.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TrekPhotos { [EntityRepositoryType]?: TrekPhotosRepository; diff --git a/server/src/db/entities/TripAlbumLinks.entity.ts b/server/src/db/entities/TripAlbumLinks.entity.ts index 94c704abe..df41280c2 100644 --- a/server/src/db/entities/TripAlbumLinks.entity.ts +++ b/server/src/db/entities/TripAlbumLinks.entity.ts @@ -1,9 +1,9 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripAlbumLinksRepository } from '../repositories/TripAlbumLinks.repository'; import { DbTimestampType } from '../types'; import { TripPhotos } from './TripPhotos.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TripAlbumLinks { [EntityRepositoryType]?: TripAlbumLinksRepository; diff --git a/server/src/db/entities/TripDocumentLinks.entity.ts b/server/src/db/entities/TripDocumentLinks.entity.ts index ee116f0ad..c366ad487 100644 --- a/server/src/db/entities/TripDocumentLinks.entity.ts +++ b/server/src/db/entities/TripDocumentLinks.entity.ts @@ -1,10 +1,10 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripDocumentLinksRepository } from '../repositories/TripDocumentLinks.repository'; import { DbTimestampType } from '../types'; import { DocumentConnections } from './DocumentConnections.entity'; import { DocumentSyncItems } from './DocumentSyncItems.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TripDocumentLinks { [EntityRepositoryType]?: TripDocumentLinksRepository; diff --git a/server/src/db/entities/TripFiles.entity.ts b/server/src/db/entities/TripFiles.entity.ts index f61bba545..2a8493ce3 100644 --- a/server/src/db/entities/TripFiles.entity.ts +++ b/server/src/db/entities/TripFiles.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripFilesRepository } from '../repositories/TripFiles.repository'; import { DbTimestampType } from '../types'; import { CollabMessages } from './CollabMessages.entity'; @@ -8,7 +9,6 @@ import { Places } from './Places.entity'; import { Reservations } from './Reservations.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TripFiles { [EntityRepositoryType]?: TripFilesRepository; @@ -59,8 +59,7 @@ export const TripFilesSchema = defineEntity({ uploaded_by: p.integer().nullable().persist(false), starred: p.integer().nullable(), deleted_at: p.text().nullable(), - message: () => - p.manyToOne(CollabMessages).ref().deleteRule('cascade').nullable().hidden().index('idx_trip_files_message_id'), + message: () => p.manyToOne(CollabMessages).ref().deleteRule('cascade').nullable().hidden().index('idx_trip_files_message_id'), message_id: p.integer().nullable().persist(false).index('idx_trip_files_message_id'), uploadedByRef: () => p.manyToOne(Users).ref().joinColumn('uploaded_by').nullable().hidden(), document_sync_items_collection: () => p.oneToMany(DocumentSyncItems).mappedBy('file').hidden(), diff --git a/server/src/db/entities/TripInviteTokens.entity.ts b/server/src/db/entities/TripInviteTokens.entity.ts index 7381afbda..b669c2514 100644 --- a/server/src/db/entities/TripInviteTokens.entity.ts +++ b/server/src/db/entities/TripInviteTokens.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripInviteTokensRepository } from '../repositories/TripInviteTokens.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TripInviteTokens { [EntityRepositoryType]?: TripInviteTokensRepository; diff --git a/server/src/db/entities/TripMembers.entity.ts b/server/src/db/entities/TripMembers.entity.ts index 5d9904401..a08f68207 100644 --- a/server/src/db/entities/TripMembers.entity.ts +++ b/server/src/db/entities/TripMembers.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripMembersRepository } from '../repositories/TripMembers.repository'; import { DbTimestampType } from '../types'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TripMembers { [EntityRepositoryType]?: TripMembersRepository; diff --git a/server/src/db/entities/TripPhotos.entity.ts b/server/src/db/entities/TripPhotos.entity.ts index 4c1594ed3..25e6384d9 100644 --- a/server/src/db/entities/TripPhotos.entity.ts +++ b/server/src/db/entities/TripPhotos.entity.ts @@ -1,10 +1,10 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripPhotosRepository } from '../repositories/TripPhotos.repository'; import { DbTimestampType } from '../types'; import { TrekPhotos } from './TrekPhotos.entity'; import { TripAlbumLinks } from './TripAlbumLinks.entity'; import { Trips } from './Trips.entity'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class TripPhotos { [EntityRepositoryType]?: TripPhotosRepository; diff --git a/server/src/db/entities/Trips.entity.ts b/server/src/db/entities/Trips.entity.ts index 1d76b68f1..903e0931a 100644 --- a/server/src/db/entities/Trips.entity.ts +++ b/server/src/db/entities/Trips.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { TripsRepository } from '../repositories/Trips.repository'; import { DbTimestampType } from '../types'; import { BudgetCategoryOrder } from './BudgetCategoryOrder.entity'; @@ -34,7 +35,6 @@ import { TripInviteTokens } from './TripInviteTokens.entity'; import { TripMembers } from './TripMembers.entity'; import { TripPhotos } from './TripPhotos.entity'; import { Users } from './Users.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Trips { [EntityRepositoryType]?: TripsRepository; diff --git a/server/src/db/entities/UserNoticeDismissals.entity.ts b/server/src/db/entities/UserNoticeDismissals.entity.ts index f3cc2319f..b70ee9d95 100644 --- a/server/src/db/entities/UserNoticeDismissals.entity.ts +++ b/server/src/db/entities/UserNoticeDismissals.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { UserNoticeDismissalsRepository } from '../repositories/UserNoticeDismissals.repository'; import { Users } from './Users.entity'; -import { EntityRepositoryType, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class UserNoticeDismissals { [EntityRepositoryType]?: UserNoticeDismissalsRepository; diff --git a/server/src/db/entities/Users.entity.ts b/server/src/db/entities/Users.entity.ts index 1e4d6f3c7..572eacbd7 100644 --- a/server/src/db/entities/Users.entity.ts +++ b/server/src/db/entities/Users.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { UsersRepository } from '../repositories/Users.repository'; import { DbTimestampType } from '../types'; import { AssignmentParticipants } from './AssignmentParticipants.entity'; @@ -70,7 +71,6 @@ import { VisitedCountries } from './VisitedCountries.entity'; import { VisitedRegions } from './VisitedRegions.entity'; import { WebauthnChallenges } from './WebauthnChallenges.entity'; import { WebauthnCredentials } from './WebauthnCredentials.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class Users { [EntityRepositoryType]?: UsersRepository; @@ -284,8 +284,7 @@ export const UsersSchema = defineEntity({ journey_share_tokens_collection: () => p.oneToMany(JourneyShareTokens).mappedBy('createdByRef').hidden(), journeys_collection: () => p.oneToMany(Journeys).mappedBy('user').hidden(), mcp_tokens_collection: () => p.oneToMany(McpTokens).mappedBy('user').hidden(), - notification_channel_preferences_collection: () => - p.oneToMany(NotificationChannelPreferences).mappedBy('user').hidden(), + notification_channel_preferences_collection: () => p.oneToMany(NotificationChannelPreferences).mappedBy('user').hidden(), notifications_collection: () => p.oneToMany(Notifications).mappedBy('sender').hidden(), notifications_collection1: () => p.oneToMany(Notifications).mappedBy('recipient').hidden(), oauth_clients_collection: () => p.oneToMany(OauthClients).mappedBy('user').hidden(), diff --git a/server/src/db/entities/VacayCompanyHolidays.entity.ts b/server/src/db/entities/VacayCompanyHolidays.entity.ts index c9c6010d7..97b7f7716 100644 --- a/server/src/db/entities/VacayCompanyHolidays.entity.ts +++ b/server/src/db/entities/VacayCompanyHolidays.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayCompanyHolidaysRepository } from '../repositories/VacayCompanyHolidays.repository'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayCompanyHolidays { [EntityRepositoryType]?: VacayCompanyHolidaysRepository; diff --git a/server/src/db/entities/VacayEntries.entity.ts b/server/src/db/entities/VacayEntries.entity.ts index d2be55fc0..75260d407 100644 --- a/server/src/db/entities/VacayEntries.entity.ts +++ b/server/src/db/entities/VacayEntries.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayEntriesRepository } from '../repositories/VacayEntries.repository'; import { Users } from './Users.entity'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayEntries { [EntityRepositoryType]?: VacayEntriesRepository; diff --git a/server/src/db/entities/VacayHolidayCalendars.entity.ts b/server/src/db/entities/VacayHolidayCalendars.entity.ts index 3d0ec8c8e..67e9e2af4 100644 --- a/server/src/db/entities/VacayHolidayCalendars.entity.ts +++ b/server/src/db/entities/VacayHolidayCalendars.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayHolidayCalendarsRepository } from '../repositories/VacayHolidayCalendars.repository'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayHolidayCalendars { [EntityRepositoryType]?: VacayHolidayCalendarsRepository; diff --git a/server/src/db/entities/VacayPlanMembers.entity.ts b/server/src/db/entities/VacayPlanMembers.entity.ts index f0f8a2d19..f211ed439 100644 --- a/server/src/db/entities/VacayPlanMembers.entity.ts +++ b/server/src/db/entities/VacayPlanMembers.entity.ts @@ -1,8 +1,8 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayPlanMembersRepository } from '../repositories/VacayPlanMembers.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayPlanMembers { [EntityRepositoryType]?: VacayPlanMembersRepository; diff --git a/server/src/db/entities/VacayPlans.entity.ts b/server/src/db/entities/VacayPlans.entity.ts index 6b18ee83d..86e25320b 100644 --- a/server/src/db/entities/VacayPlans.entity.ts +++ b/server/src/db/entities/VacayPlans.entity.ts @@ -1,3 +1,4 @@ +import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayPlansRepository } from '../repositories/VacayPlans.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; @@ -8,7 +9,6 @@ import { VacayPlanMembers } from './VacayPlanMembers.entity'; import { VacayUserColors } from './VacayUserColors.entity'; import { VacayUserYears } from './VacayUserYears.entity'; import { VacayYears } from './VacayYears.entity'; -import { Collection, EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayPlans { [EntityRepositoryType]?: VacayPlansRepository; diff --git a/server/src/db/entities/VacayShares.entity.ts b/server/src/db/entities/VacayShares.entity.ts index 76e789a84..e12ae50f3 100644 --- a/server/src/db/entities/VacayShares.entity.ts +++ b/server/src/db/entities/VacayShares.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacaySharesRepository } from '../repositories/VacayShares.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayShares { [EntityRepositoryType]?: VacaySharesRepository; diff --git a/server/src/db/entities/VacayUserColors.entity.ts b/server/src/db/entities/VacayUserColors.entity.ts index 3aaafca46..f251f3b60 100644 --- a/server/src/db/entities/VacayUserColors.entity.ts +++ b/server/src/db/entities/VacayUserColors.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayUserColorsRepository } from '../repositories/VacayUserColors.repository'; import { Users } from './Users.entity'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayUserColors { [EntityRepositoryType]?: VacayUserColorsRepository; diff --git a/server/src/db/entities/VacayUserSettings.entity.ts b/server/src/db/entities/VacayUserSettings.entity.ts index 834e5609d..b5260e1a0 100644 --- a/server/src/db/entities/VacayUserSettings.entity.ts +++ b/server/src/db/entities/VacayUserSettings.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayUserSettingsRepository } from '../repositories/VacayUserSettings.repository'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayUserSettings { [EntityRepositoryType]?: VacayUserSettingsRepository; diff --git a/server/src/db/entities/VacayUserYears.entity.ts b/server/src/db/entities/VacayUserYears.entity.ts index 4a49d7cfd..5bc9b4569 100644 --- a/server/src/db/entities/VacayUserYears.entity.ts +++ b/server/src/db/entities/VacayUserYears.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayUserYearsRepository } from '../repositories/VacayUserYears.repository'; import { Users } from './Users.entity'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayUserYears { [EntityRepositoryType]?: VacayUserYearsRepository; diff --git a/server/src/db/entities/VacayYears.entity.ts b/server/src/db/entities/VacayYears.entity.ts index ab6b3658e..d11c5873d 100644 --- a/server/src/db/entities/VacayYears.entity.ts +++ b/server/src/db/entities/VacayYears.entity.ts @@ -1,6 +1,6 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VacayYearsRepository } from '../repositories/VacayYears.repository'; import { VacayPlans } from './VacayPlans.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VacayYears { [EntityRepositoryType]?: VacayYearsRepository; diff --git a/server/src/db/entities/VisitedCountries.entity.ts b/server/src/db/entities/VisitedCountries.entity.ts index 4465c64f2..e2426c81d 100644 --- a/server/src/db/entities/VisitedCountries.entity.ts +++ b/server/src/db/entities/VisitedCountries.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VisitedCountriesRepository } from '../repositories/VisitedCountries.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VisitedCountries { [EntityRepositoryType]?: VisitedCountriesRepository; diff --git a/server/src/db/entities/VisitedRegions.entity.ts b/server/src/db/entities/VisitedRegions.entity.ts index 9d854d0e3..b311d0b1f 100644 --- a/server/src/db/entities/VisitedRegions.entity.ts +++ b/server/src/db/entities/VisitedRegions.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { VisitedRegionsRepository } from '../repositories/VisitedRegions.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class VisitedRegions { [EntityRepositoryType]?: VisitedRegionsRepository; diff --git a/server/src/db/entities/WebauthnChallenges.entity.ts b/server/src/db/entities/WebauthnChallenges.entity.ts index 30d167346..9b677277b 100644 --- a/server/src/db/entities/WebauthnChallenges.entity.ts +++ b/server/src/db/entities/WebauthnChallenges.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { WebauthnChallengesRepository } from '../repositories/WebauthnChallenges.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class WebauthnChallenges { [EntityRepositoryType]?: WebauthnChallengesRepository; diff --git a/server/src/db/entities/WebauthnCredentials.entity.ts b/server/src/db/entities/WebauthnCredentials.entity.ts index c7ae45b28..2a1fa27ab 100644 --- a/server/src/db/entities/WebauthnCredentials.entity.ts +++ b/server/src/db/entities/WebauthnCredentials.entity.ts @@ -1,7 +1,7 @@ +import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; import { WebauthnCredentialsRepository } from '../repositories/WebauthnCredentials.repository'; import { DbTimestampType } from '../types'; import { Users } from './Users.entity'; -import { EntityRepositoryType, type Opt, type Ref, defineEntity, p } from '@mikro-orm/core'; export class WebauthnCredentials { [EntityRepositoryType]?: WebauthnCredentialsRepository; diff --git a/server/src/db/entities/index.ts b/server/src/db/entities/index.ts index a552c2cdc..adde2a392 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'; @@ -125,7 +126,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,