mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-20 19:16:08 +00:00
89f3055a29
The link table keyed by the trip id made both entities a one-to-one, and the test typecheck failed with TS2589 in the itinerary factory. It now holds its own id with trip_id UNIQUE, as trip_invite_tokens does, and its members hang off link_id. The factory error was not this table's alone: any further relation on trips, journeys or users tipped the same check. insertRow and createRow now take a caller's overrides as their own argument instead of a spread checked against RequiredEntityData, so a new relation no longer breaks the itinerary and tour factories. The suites that hand-build TripMembersService get a journalLinksStub.
39 lines
1.5 KiB
TypeScript
39 lines
1.5 KiB
TypeScript
import { EntityRepositoryType, type Opt, PrimaryKeyProp, type Ref, defineEntity, p } from '@mikro-orm/core';
|
|
import { TripJournalLinkMembersRepository } from '../repositories/TripJournalLinkMembers.repository';
|
|
import { TripJournalLinks } from './TripJournalLinks.entity';
|
|
import { Users } from './Users.entity';
|
|
|
|
export class TripJournalLinkMembers {
|
|
[EntityRepositoryType]?: TripJournalLinkMembersRepository;
|
|
[PrimaryKeyProp]?: ['link', 'user'];
|
|
link!: Ref<TripJournalLinks>;
|
|
link_id!: number;
|
|
user!: Ref<Users>;
|
|
user_id!: number;
|
|
role: TTripJournalLinkMembersRole & Opt = TripJournalLinkMembersRole.VIEWER;
|
|
hide_skeletons: number & Opt = 0;
|
|
added_at!: number;
|
|
}
|
|
|
|
export const TripJournalLinkMembersRole = {
|
|
VIEWER: 'viewer',
|
|
EDITOR: 'editor',
|
|
} as const;
|
|
|
|
export type TTripJournalLinkMembersRole = (typeof TripJournalLinkMembersRole)[keyof typeof TripJournalLinkMembersRole];
|
|
|
|
export const TripJournalLinkMembersSchema = defineEntity({
|
|
class: TripJournalLinkMembers,
|
|
repository: () => TripJournalLinkMembersRepository,
|
|
uniques: [{ properties: ['link', 'user'] }],
|
|
properties: {
|
|
link: () => p.manyToOne(TripJournalLinks).primary().ref().hidden(),
|
|
link_id: p.integer().persist(false),
|
|
user: () => p.manyToOne(Users).primary().ref().hidden().index('idx_trip_journal_link_members_user'),
|
|
user_id: p.integer().persist(false).index('idx_trip_journal_link_members_user'),
|
|
role: p.enum(() => TripJournalLinkMembersRole).default('viewer'),
|
|
hide_skeletons: p.integer().default(0),
|
|
added_at: p.integer(),
|
|
},
|
|
});
|