From 88e5eb6a8af39963338eeee513d6e4b39d2396cd Mon Sep 17 00:00:00 2001 From: Fantix King Date: Sun, 6 Oct 2024 12:54:26 -0400 Subject: [PATCH] Add get_person to Drizzle (#73) --- _drizzle/db/mysql.ts | 5 ++ _drizzle/db/schema.ts | 5 ++ _drizzle/index.ts | 180 ++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 182 insertions(+), 8 deletions(-) diff --git a/_drizzle/db/mysql.ts b/_drizzle/db/mysql.ts index 8864bcf..14657c2 100644 --- a/_drizzle/db/mysql.ts +++ b/_drizzle/db/mysql.ts @@ -42,6 +42,11 @@ export const persons = mysqlTable("persons", { bio: text("bio"), }); +export const personActsRelations = relations(persons, ({ many }) => ({ + actedIn: many(actors), + directed: many(directors), +})); + export const directors = mysqlTable( "directors", { diff --git a/_drizzle/db/schema.ts b/_drizzle/db/schema.ts index cfa0306..5b8d591 100644 --- a/_drizzle/db/schema.ts +++ b/_drizzle/db/schema.ts @@ -42,6 +42,11 @@ export const persons = pgTable("persons", { bio: text("bio"), }); +export const personActsRelations = relations(persons, ({ many }) => ({ + actedIn: many(actors), + directed: many(directors), +})); + export const directors = pgTable( "directors", { diff --git a/_drizzle/index.ts b/_drizzle/index.ts index 39333db..e2e7355 100644 --- a/_drizzle/index.ts +++ b/_drizzle/index.ts @@ -32,17 +32,18 @@ abstract class BaseApp { abstract setup(query: string): Promise; abstract movieDetails(id: number): Promise; - abstract userDetails(id: number): Promise; + abstract userDetails(id: number): Promise; abstract insertMovie(val: { prefix: string; people: number[]; }): Promise; + abstract personDetails(id: number): Promise; async benchQuery(query: string, val: any) { if (query == "get_user") { return await this.userDetails(val as number); } else if (query == "get_person") { - // return await this.personDetails(id); + return await this.personDetails(val as number); } else if (query == "get_movie") { return await this.movieDetails(val as number); } else if (query == "update_movie") { @@ -76,6 +77,7 @@ abstract class BaseApp { export class App extends BaseApp { private client; private db; + private fullName; private preparedAvgRating; private preparedMovieDetails; private preparedUserDetails; @@ -114,7 +116,7 @@ export class App extends BaseApp { .groupBy(schema.reviews.movieId) .where(eq(schema.reviews.movieId, sql`any(${ids})`)) .prepare("avgRating"); - const fullName = sql` + this.fullName = sql` CASE WHEN ${schema.persons.middleName} != '' THEN ${schema.persons.firstName} || ' ' || ${schema.persons.middleName} || ' ' || ${schema.persons.lastName} ELSE @@ -142,7 +144,7 @@ export class App extends BaseApp { image: true, }, extras: { - full_name: fullName.as("full_name"), + full_name: this.fullName.as("full_name"), }, }, }, @@ -161,7 +163,7 @@ export class App extends BaseApp { image: true, }, extras: { - full_name: fullName.as("full_name"), + full_name: this.fullName.as("full_name"), }, }, }, @@ -237,7 +239,7 @@ export class App extends BaseApp { image: true, }, extras: { - full_name: fullName.as("full_name"), + full_name: this.fullName.as("full_name"), }, where: eq(schema.users.id, sql`any(${ids})`), }) @@ -335,7 +337,7 @@ export class App extends BaseApp { return JSON.stringify(result); } - async userDetails(id: number): Promise { + async userDetails(id: number): Promise { const rv = await this.preparedUserDetails.execute({ id }); if (rv === undefined) { return; @@ -387,6 +389,87 @@ export class App extends BaseApp { ); return JSON.stringify({ ...movie, directors, cast }); } + + async personDetails(id: number): Promise { + let person = await this.db.transaction( + async (tx) => { + let person = await tx.query.persons.findFirst({ + columns: { + id: true, + image: true, + bio: true, + }, + with: { + actedIn: { + columns: {}, + with: { + movie: { + columns: { + id: true, + }, + }, + }, + }, + directed: { + columns: {}, + with: { + movie: { + columns: { + id: true, + }, + }, + }, + }, + }, + extras: { + full_name: this.fullName.as("full_name"), + }, + where: eq(schema.persons.id, id), + }); + let actedIn = + person!.actedIn.length > 0 + ? await tx.query.movies.findMany({ + columns: { + id: true, + image: true, + title: true, + year: true, + }, + where: inArray( + schema.movies.id, + person!.actedIn.map((r) => r.movie.id), + ), + orderBy: [asc(schema.movies.year), asc(schema.movies.title)], + }) + : []; + let directed = + person!.directed.length > 0 + ? await tx.query.movies.findMany({ + columns: { + id: true, + image: true, + title: true, + year: true, + }, + where: inArray( + schema.movies.id, + person!.directed.map((r) => r.movie.id), + ), + orderBy: [asc(schema.movies.year), asc(schema.movies.title)], + }) + : []; + return { + ...person, + actedIn, + directed, + }; + }, + { + isolationLevel: "repeatable read", + }, + ); + return JSON.stringify(person); + } } export class MySQLApp extends BaseApp { @@ -632,7 +715,7 @@ export class MySQLApp extends BaseApp { return JSON.stringify(result); } - async userDetails(id: number): Promise { + async userDetails(id: number): Promise { const rv = await this.preparedUserDetails.execute({ id }); if (rv === undefined) { return; @@ -710,4 +793,85 @@ export class MySQLApp extends BaseApp { ); return JSON.stringify({ ...movie, directors, cast }); } + + async personDetails(id: number): Promise { + let person = await this.db.transaction( + async (tx) => { + let person = await tx.query.persons.findFirst({ + columns: { + id: true, + image: true, + bio: true, + }, + with: { + actedIn: { + columns: {}, + with: { + movie: { + columns: { + id: true, + }, + }, + }, + }, + directed: { + columns: {}, + with: { + movie: { + columns: { + id: true, + }, + }, + }, + }, + }, + extras: { + full_name: this.fullName.as("full_name"), + }, + where: eq(mysql.persons.id, id), + }); + let actedIn = + person!.actedIn.length > 0 + ? await tx.query.movies.findMany({ + columns: { + id: true, + image: true, + title: true, + year: true, + }, + where: inArray( + mysql.movies.id, + person!.actedIn.map((r) => r.movie.id), + ), + orderBy: [asc(mysql.movies.year), asc(mysql.movies.title)], + }) + : []; + let directed = + person!.directed.length > 0 + ? await tx.query.movies.findMany({ + columns: { + id: true, + image: true, + title: true, + year: true, + }, + where: inArray( + mysql.movies.id, + person!.directed.map((r) => r.movie.id), + ), + orderBy: [asc(mysql.movies.year), asc(mysql.movies.title)], + }) + : []; + return { + ...person, + actedIn, + directed, + }; + }, + { + isolationLevel: "repeatable read", + }, + ); + return JSON.stringify(person); + } }