k1nq/TREK
1
0
Fork 0
mirror of https://github.com/mauriceboe/TREK.git synced 2026-10-18 21:16:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(journey): the link role from the generated entity, not a second union

Browse Source 
TripJournalLinksRepository spelled 'viewer' | 'editor' by hand while the generated entity exports the same roles, which knip then counted as an unused export. The repository now derives its type and values from the entity.
This commit is contained in:
Maurice
2026-10-18 18:54:02 +02:00
parent a6da69ee36
commit 4a074ec93c
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/db/repositories/TripJournalLinks.repository.ts
+11 -4
View File
@@ -1,3 +1,7 @@
import {
TripJournalLinkMembersRole,
type TTripJournalLinkMembersRole,
} from '../entities/TripJournalLinkMembers.entity';
import type { TripJournalLinks } from '../entities/TripJournalLinks.entity';
import type { DB } from '../kysely/db';
import { TrekRepository } from './_shared/trek-repository';
@@ -10,7 +14,10 @@ export type TripJournalLinkKyselyDB = Pick<
'trip_journal_links' | 'trip_journal_link_members' | 'trips' | 'trip_members' | 'journeys' | 'users'
>;
export type TripJournalLinkRole = 'viewer' | 'editor';
/** The role a link gives, as the migration's CHECK and the generated entity spell it. */
export type TripJournalLinkRole = TTripJournalLinkMembersRole;
const { EDITOR, VIEWER } = TripJournalLinkMembersRole;
/** A trip's link with the journal it shows, as the settings dialog reads it. */
export interface TripJournalLinkRow {
@@ -69,8 +76,8 @@ export function linkReach(db: Kysely<TripJournalLinkKyselyDB>) {
/** The stronger of two link roles; a person linked through two trips gets the better one. */
function strongest(roles: string[]): TripJournalLinkRole | null {
if (roles.includes('editor')) return 'editor';
return roles.length > 0 ? 'viewer' : null;
if (roles.includes(EDITOR)) return EDITOR;
return roles.length > 0 ? VIEWER : null;
}
/** The role a person holds on a journal through any trip's link, or null when none lets them in. */
@@ -139,7 +146,7 @@ export class TripJournalLinksRepository extends TrekRepository<TripJournalLinks>
.where('l.trip_id', '=', tripId)
.orderBy('u.username', 'asc')
.execute();
return rows.map((r) => ({ ...r, role: r.role === 'editor' ? 'editor' : 'viewer' }));
return rows.map((r) => ({ ...r, role: r.role === EDITOR ? EDITOR : VIEWER }));
}
/** Everyone on the trip, its owner first, with what the member picker shows of them. */