From 8a0e07c9d65cd27823739e6a06092edc169100ba Mon Sep 17 00:00:00 2001 From: Roman Godmaire Date: Sat, 25 Nov 2023 15:32:24 -0500 Subject: [PATCH] refactor: Rename DB functions --- src/lib/server/db/index.ts | 22 ++++++++++------------ src/lib/server/db/prisma.ts | 6 +++--- src/routes/+page.server.ts | 2 +- src/routes/track/[slug]/+page.server.ts | 2 +- src/routes/upload/+page.server.ts | 2 +- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts index f36e7e8..5184bf6 100644 --- a/src/lib/server/db/index.ts +++ b/src/lib/server/db/index.ts @@ -1,7 +1,7 @@ import type { Track, TrackVersion } from '@prisma/client'; export interface Database { - listTracksForTrackCard: (producerId: string) => Promise< + fetchHomepageData: (producerId: string) => Promise< { id: number; title: string; @@ -15,16 +15,14 @@ export interface Database { }[] >; - getTrackById: (trackId: number) => Promise< - { - title: string; - objectKey: string; - createdAt: Date; - producer: { - username: string; - }; - }? - >; + fetchTrackPageData: (trackId: number) => Promise<{ + title: string; + objectKey: string; + createdAt: Date; + producer: { + username: string; + }; + } | null>; createTrack: (producerId: string, title: string, objectKey: string) => Promise; - insertTrackVersion: (trackId: number) => Promise; + createTrackVersion: (trackId: number) => Promise; } diff --git a/src/lib/server/db/prisma.ts b/src/lib/server/db/prisma.ts index 8d408cf..3d15111 100644 --- a/src/lib/server/db/prisma.ts +++ b/src/lib/server/db/prisma.ts @@ -8,7 +8,7 @@ export class DatabasePrisma implements Database { this.client = new PrismaClient(); } - listTracksForTrackCard = async (producerId: string) => { + fetchHomepageData = async (producerId: string) => { const tracks = await this.client.track.findMany({ select: { id: true, @@ -65,7 +65,7 @@ export class DatabasePrisma implements Database { return res; }; - getTrackById = async (trackId: number) => { + fetchTrackPageData = async (trackId: number) => { const track = await this.client.track.findUnique({ select: { title: true, @@ -97,7 +97,7 @@ export class DatabasePrisma implements Database { return track; }; - insertTrackVersion = async (trackId: number) => { + createTrackVersion = async (trackId: number) => { const trackVersion = await this.client.trackVersion.create({ data: { trackId diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 252c608..af64999 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -8,7 +8,7 @@ export const load: PageServerLoad = async ({ locals: { authReq, database } }) => tracks: [] }; - const tracks = await database.listTracksForTrackCard(session.user.userId); + const tracks = await database.fetchHomepageData(session.user.userId); return { tracks diff --git a/src/routes/track/[slug]/+page.server.ts b/src/routes/track/[slug]/+page.server.ts index 2cdcffb..5c3e248 100644 --- a/src/routes/track/[slug]/+page.server.ts +++ b/src/routes/track/[slug]/+page.server.ts @@ -8,7 +8,7 @@ export const load: PageServerLoad = async ({ params: { slug }, locals: { databas throw error(404, 'Track not found'); } - let track = await database.getTrackById(trackId); + let track = await database.fetchTrackPageData(trackId); if (!track) { throw error(440, 'Track not found'); diff --git a/src/routes/upload/+page.server.ts b/src/routes/upload/+page.server.ts index 40699d6..f3dc276 100644 --- a/src/routes/upload/+page.server.ts +++ b/src/routes/upload/+page.server.ts @@ -31,7 +31,7 @@ export const actions: Actions = { } const track = await database.createTrack(producerId, title, objectKey); - await database.insertTrackVersion(track.id); + await database.createTrackVersion(track.id); throw redirect(302, '/'); }