force jsonb objects for data

see drizzle-team/drizzle-orm#724
smayya337 · Oct 8, 2023 · 98e98bb · 98e98bb
1 parent 364a211
commit 98e98bb
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 17 deletions.
diff --git a/app/admin/upload/submit/route.ts b/app/admin/upload/submit/route.ts
@@ -1,17 +1,15 @@
 import { isAdmin } from '@/lib/auth/admin';
-import { getCurrentUserID } from '@/lib/auth/helpers';
 import { getRouteHandlerClient } from '@/lib/global/supabase';
-import { addResultFromYAMLFile } from '@/lib/results/async';
+// import { addResultFromYAMLFile } from '@/lib/results/async';
 import { ResultsAddQueue } from '@/lib/results/queue';
-import { createRouteHandlerClient } from '@supabase/auth-helpers-nextjs';
-import { cookies, headers } from 'next/headers';
+import { cookies } from 'next/headers';
 import { NextRequest, NextResponse } from 'next/server';
 
 export async function POST(request: NextRequest) {
-	// const supabase = getRouteHandlerClient(cookies);
-	// if (!(await isAdmin(supabase))) {
-	// 	return new Response(null, { status: 403 });
-	// }
+	const supabase = getRouteHandlerClient(cookies);
+	if (!(await isAdmin(supabase))) {
+		return new NextResponse(null, { status: 403 });
+	}
 	const data = await request.formData();
 	const allFiles = data.getAll('yaml');
 	const q = ResultsAddQueue.getInstance();

diff --git a/lib/events/async.ts b/lib/events/async.ts
@@ -68,6 +68,6 @@ export async function createEventDataInput(event: Event, duosmiumID: string) {
 	return {
 		resultDuosmiumId: duosmiumID,
 		name: event.name,
-		data: event.rep
+		data: sql`${event.rep}::jsonb`
 	};
 }
diff --git a/lib/global/drizzle.ts b/lib/global/drizzle.ts
@@ -14,6 +14,8 @@ export async function keepTryingUntilItWorks(fn, data) {
 	} catch (e: PostgresError) {
 		if (e.message === 'deadlock detected') {
 			return await keepTryingUntilItWorks(fn, data);
+		} else {
+			throw e;
 		}
 	}
 }
diff --git a/lib/histograms/async.ts b/lib/histograms/async.ts
@@ -55,6 +55,6 @@ export async function addHistogram(histogramData: object, tx = db) {
 export async function createHistogramDataInput(histogram: Histogram, duosmiumID: string) {
 	return {
 		resultDuosmiumId: duosmiumID,
-		data: histogram.rep
+		data: sql`${histogram.rep}::jsonb`
 	};
 }
diff --git a/lib/penalties/async.ts b/lib/penalties/async.ts
@@ -71,6 +71,6 @@ export async function createPenaltyDataInput(penalty: Penalty, duosmiumID: strin
 	return {
 		resultDuosmiumId: duosmiumID,
 		teamNumber: penalty.team.number,
-		data: penalty.rep
+		data: sql`${penalty.rep}::jsonb`
 	};
 }
diff --git a/lib/placings/async.ts b/lib/placings/async.ts
@@ -87,6 +87,6 @@ export async function createPlacingDataInput(placing: Placing, duosmiumID: strin
 		eventName: placing.event.name,
 		teamNumber: placing.team.number,
 		resultDuosmiumId: duosmiumID,
-		data: placing.rep
+		data: sql`${placing.rep}::jsonb`
 	};
 }
diff --git a/lib/results/async.ts b/lib/results/async.ts
@@ -178,6 +178,9 @@ export async function addResultFromYAMLFile(
 	// @ts-ignore
 	const obj: object = load(yaml);
 	const interpreter: Interpreter = getInterpreter(obj);
+	// if (await resultExists(generateFilename(interpreter))) {
+	// 	return;
+	// }
 	try {
 		await keepTryingUntilItWorks(addCompleteResult, interpreter);
 		// await addCompleteResult(interpreter);
@@ -237,7 +240,7 @@ export async function regenerateAllMetadata() {
 		for (const id of ids) {
 			// @ts-ignore
 			const input = await createResultDataInput(getInterpreter(await getCompleteResult(id)));
-			await addResult(input);
+			await addResult(input, tx);
 		}
 	});
 	return await operation;

diff --git a/lib/results/queue.ts b/lib/results/queue.ts
@@ -2,7 +2,7 @@ import type { QueueObject } from 'async';
 import { queue } from 'async';
 import { addResultFromYAMLFile } from './async';
 
-const MAX_PROCESSES = 16;
+const MAX_PROCESSES = 64;
 
 export class ResultsAddQueue {
 	private static instance: ResultsAddQueue;
@@ -31,6 +31,10 @@ export class ResultsAddQueue {
 		this.q.drain(arg);
 	}
 
+	public error(arg: (err: any, task: any) => void) {
+		this.q.error(arg);
+	}
+
 	public push(arg: File) {
 		this.q.push(arg);
 		console.log(

diff --git a/lib/teams/async.ts b/lib/teams/async.ts
@@ -72,7 +72,7 @@ export async function createTeamDataInput(team: Team, duosmiumID: string) {
 	return {
 		resultDuosmiumId: duosmiumID,
 		number: team.number,
-		data: team.rep,
+		data: sql`${team.rep}::jsonb`,
 		name: locationName,
 		city: locationCity,
 		state: locationState,

diff --git a/lib/tournaments/async.ts b/lib/tournaments/async.ts
@@ -55,7 +55,7 @@ export async function addTournament(tournamentData: object, tx = db) {
 export async function createTournamentDataInput(tournament: Tournament, duosmiumID: string) {
 	return {
 		resultDuosmiumId: duosmiumID,
-		data: tournament.rep
+		data: sql`${tournament.rep}::jsonb`
 	};
 }
 

diff --git a/lib/tracks/async.ts b/lib/tracks/async.ts
@@ -64,6 +64,6 @@ export async function createTrackDataInput(track: Track, duosmiumID: string) {
 	return {
 		resultDuosmiumId: duosmiumID,
 		name: track.name.toString(),
-		data: track.rep
+		data: sql`${track.rep}::jsonb`
 	};
 }