Implementation of verification action endpoints
This commit is contained in:
Dominic Ferrando
@@ -1,100 +1,83 @@
|
||||
import { Activity, type ActivityVerifications, type ActivityVideoUrls } from "@blade-and-brawn/domain";
|
||||
import { Activity, type ActivityVerifications, type ActivityMediaKeys } from "@blade-and-brawn/domain";
|
||||
import type { Static } from "@sinclair/typebox";
|
||||
import { t } from "elysia";
|
||||
import type { Selectable } from "kysely";
|
||||
import { db } from "../database/db";
|
||||
import type { DB } from "../database/out/db";
|
||||
|
||||
export const VerificationStatusSchema = t.Union([
|
||||
t.Literal("request"),
|
||||
t.Literal("draft"),
|
||||
t.Literal("submitted"),
|
||||
t.Literal("in_review"),
|
||||
t.Literal("action_requested"),
|
||||
t.Literal("completed"),
|
||||
]);
|
||||
export type VerificationStatus = Static<typeof VerificationStatusSchema>;
|
||||
|
||||
export class VerificationsService {
|
||||
async request(assessmentId: string, accountId: string, activityVideoUrls: ActivityVideoUrls) {
|
||||
// Only the owning account may request verification of their own assessment.
|
||||
const assessment = await db.selectFrom("assessments")
|
||||
.select("id")
|
||||
.where("id", "=", assessmentId)
|
||||
.where("account_id", "=", accountId)
|
||||
.executeTakeFirst();
|
||||
if (!assessment) return undefined;
|
||||
export const REQUIRED_MEDIA_ACTIVITIES = Object.values(Activity);
|
||||
|
||||
const MEDIA_KEY_COLUMN = {
|
||||
[Activity.BackSquat]: "media_key_back_squat",
|
||||
[Activity.Deadlift]: "media_key_deadlift",
|
||||
[Activity.BenchPress]: "media_key_bench_press",
|
||||
[Activity.BroadJump]: "media_key_broad_jump",
|
||||
[Activity.Run]: "media_key_run",
|
||||
[Activity.ConeDrill]: "media_key_cone_drill",
|
||||
} as const satisfies Record<Activity, keyof DB["verifications"]>;
|
||||
|
||||
const ALLOWED_FROM = {
|
||||
update: ["draft", "action_requested"],
|
||||
submit: ["draft"],
|
||||
requestAction: ["submitted", "in_review"],
|
||||
complete: ["submitted", "in_review"],
|
||||
} satisfies Record<string, VerificationStatus[]>;
|
||||
|
||||
export class VerificationsService {
|
||||
static missingActivityMediaKeys(verification: Pick<Selectable<DB["verifications"]>, (typeof MEDIA_KEY_COLUMN)[Activity]>) {
|
||||
return REQUIRED_MEDIA_ACTIVITIES.filter((activity) => !verification[MEDIA_KEY_COLUMN[activity]]);
|
||||
}
|
||||
|
||||
async create(assessmentId: string, activityMediaKeys: ActivityMediaKeys) {
|
||||
return await db.insertInto("verifications")
|
||||
.values({
|
||||
assessment_id: assessmentId,
|
||||
status: "request" satisfies VerificationStatus,
|
||||
media_key_back_squat: activityVideoUrls[Activity.BackSquat] ?? null,
|
||||
media_key_deadlift: activityVideoUrls[Activity.Deadlift] ?? null,
|
||||
media_key_bench_press: activityVideoUrls[Activity.BenchPress] ?? null,
|
||||
media_key_broad_jump: activityVideoUrls[Activity.BroadJump] ?? null,
|
||||
media_key_run: activityVideoUrls[Activity.Run] ?? null,
|
||||
media_key_cone_drill: activityVideoUrls[Activity.ConeDrill] ?? null,
|
||||
status: "draft" satisfies VerificationStatus,
|
||||
media_key_back_squat: activityMediaKeys[Activity.BackSquat] ?? null,
|
||||
media_key_deadlift: activityMediaKeys[Activity.Deadlift] ?? null,
|
||||
media_key_bench_press: activityMediaKeys[Activity.BenchPress] ?? null,
|
||||
media_key_broad_jump: activityMediaKeys[Activity.BroadJump] ?? null,
|
||||
media_key_run: activityMediaKeys[Activity.Run] ?? null,
|
||||
media_key_cone_drill: activityMediaKeys[Activity.ConeDrill] ?? null,
|
||||
})
|
||||
.onConflict((oc) => oc
|
||||
.column("assessment_id")
|
||||
.doUpdateSet((eb) => ({
|
||||
status: "request" satisfies VerificationStatus,
|
||||
media_key_back_squat: eb.ref("excluded.media_key_back_squat"),
|
||||
media_key_deadlift: eb.ref("excluded.media_key_deadlift"),
|
||||
media_key_bench_press: eb.ref("excluded.media_key_bench_press"),
|
||||
media_key_broad_jump: eb.ref("excluded.media_key_broad_jump"),
|
||||
media_key_run: eb.ref("excluded.media_key_run"),
|
||||
media_key_cone_drill: eb.ref("excluded.media_key_cone_drill"),
|
||||
// Re-requesting means new videos are under review, so the
|
||||
// previous cycle's per-activity judgments and completion
|
||||
// info no longer apply.
|
||||
verf_back_squat: null,
|
||||
verf_deadlift: null,
|
||||
verf_bench_press: null,
|
||||
verf_broad_jump: null,
|
||||
verf_run: null,
|
||||
verf_cone_drill: null,
|
||||
completed_at: null,
|
||||
completed_by: null,
|
||||
}))
|
||||
)
|
||||
.returning("id")
|
||||
.executeTakeFirstOrThrow();
|
||||
.onConflict((oc) => oc.column("assessment_id").doNothing())
|
||||
.returning(["id", "status"])
|
||||
.executeTakeFirst();
|
||||
}
|
||||
|
||||
// Joined with the assessment being verified, since reviewing a request
|
||||
// requires seeing the player's claimed performance alongside the videos.
|
||||
private static baseQuery() {
|
||||
return db.selectFrom("verifications")
|
||||
.innerJoin("assessments", "assessments.id", "verifications.assessment_id")
|
||||
.select([
|
||||
"verifications.id",
|
||||
"verifications.assessment_id",
|
||||
"verifications.status",
|
||||
"verifications.created_at",
|
||||
"verifications.completed_at",
|
||||
"verifications.completed_by",
|
||||
"verifications.reviewer_notes",
|
||||
"verifications.media_key_back_squat",
|
||||
"verifications.media_key_deadlift",
|
||||
"verifications.media_key_bench_press",
|
||||
"verifications.media_key_broad_jump",
|
||||
"verifications.media_key_run",
|
||||
"verifications.media_key_cone_drill",
|
||||
"verifications.verf_back_squat",
|
||||
"verifications.verf_deadlift",
|
||||
"verifications.verf_bench_press",
|
||||
"verifications.verf_broad_jump",
|
||||
"verifications.verf_run",
|
||||
"verifications.verf_cone_drill",
|
||||
"assessments.name",
|
||||
"assessments.gender",
|
||||
"assessments.age",
|
||||
"assessments.weight",
|
||||
"assessments.perf_back_squat",
|
||||
"assessments.perf_deadlift",
|
||||
"assessments.perf_bench_press",
|
||||
"assessments.perf_broad_jump",
|
||||
"assessments.perf_run",
|
||||
"assessments.perf_cone_drill",
|
||||
]);
|
||||
async update(id: string, { assessmentId, activityMediaKeys = {} }: { assessmentId?: string, activityMediaKeys?: ActivityMediaKeys }) {
|
||||
const replaced = (activity: Activity) => activityMediaKeys[activity] ? null : undefined;
|
||||
|
||||
return await db.updateTable("verifications")
|
||||
.where("id", "=", id)
|
||||
.where("status", "in", ALLOWED_FROM.update)
|
||||
.set({
|
||||
status: "draft" satisfies VerificationStatus,
|
||||
assessment_id: assessmentId,
|
||||
media_key_back_squat: activityMediaKeys[Activity.BackSquat],
|
||||
media_key_deadlift: activityMediaKeys[Activity.Deadlift],
|
||||
media_key_bench_press: activityMediaKeys[Activity.BenchPress],
|
||||
media_key_broad_jump: activityMediaKeys[Activity.BroadJump],
|
||||
media_key_run: activityMediaKeys[Activity.Run],
|
||||
media_key_cone_drill: activityMediaKeys[Activity.ConeDrill],
|
||||
verf_back_squat: replaced(Activity.BackSquat),
|
||||
verf_deadlift: replaced(Activity.Deadlift),
|
||||
verf_bench_press: replaced(Activity.BenchPress),
|
||||
verf_broad_jump: replaced(Activity.BroadJump),
|
||||
verf_run: replaced(Activity.Run),
|
||||
verf_cone_drill: replaced(Activity.ConeDrill),
|
||||
})
|
||||
.returning(["id", "status"])
|
||||
.executeTakeFirst();
|
||||
}
|
||||
|
||||
async get(id: string) {
|
||||
@@ -118,9 +101,22 @@ export class VerificationsService {
|
||||
.execute();
|
||||
}
|
||||
|
||||
async requestAction(id: string, reviewerNotes: string | null, activityVerifications: ActivityVerifications) {
|
||||
const result = await db.updateTable("verifications")
|
||||
async submit(id: string) {
|
||||
return await db.updateTable("verifications")
|
||||
.where("id", "=", id)
|
||||
.where("status", "in", ALLOWED_FROM.submit)
|
||||
.where((eb) => eb.and(
|
||||
REQUIRED_MEDIA_ACTIVITIES.map((activity) => eb(MEDIA_KEY_COLUMN[activity], "is not", null))
|
||||
))
|
||||
.set({ status: "submitted" satisfies VerificationStatus })
|
||||
.returning(["id", "status"])
|
||||
.executeTakeFirst();
|
||||
}
|
||||
|
||||
async requestAction(id: string, reviewerNotes: string | null, activityVerifications: ActivityVerifications) {
|
||||
return await db.updateTable("verifications")
|
||||
.where("id", "=", id)
|
||||
.where("status", "in", ALLOWED_FROM.requestAction)
|
||||
.set({
|
||||
status: "action_requested" satisfies VerificationStatus,
|
||||
reviewer_notes: reviewerNotes,
|
||||
@@ -131,13 +127,14 @@ export class VerificationsService {
|
||||
verf_run: activityVerifications[Activity.Run] ?? null,
|
||||
verf_cone_drill: activityVerifications[Activity.ConeDrill] ?? null,
|
||||
})
|
||||
.returning(["id", "status"])
|
||||
.executeTakeFirst();
|
||||
return result.numUpdatedRows > 0n;
|
||||
}
|
||||
|
||||
async complete(id: string, completedBy: string, activityVerifications: ActivityVerifications) {
|
||||
const result = await db.updateTable("verifications")
|
||||
return await db.updateTable("verifications")
|
||||
.where("id", "=", id)
|
||||
.where("status", "in", ALLOWED_FROM.complete)
|
||||
.set({
|
||||
status: "completed" satisfies VerificationStatus,
|
||||
completed_at: new Date(),
|
||||
@@ -149,7 +146,44 @@ export class VerificationsService {
|
||||
verf_run: activityVerifications[Activity.Run] ?? null,
|
||||
verf_cone_drill: activityVerifications[Activity.ConeDrill] ?? null,
|
||||
})
|
||||
.returning(["id", "status"])
|
||||
.executeTakeFirst();
|
||||
return result.numUpdatedRows > 0n;
|
||||
}
|
||||
|
||||
private static baseQuery() {
|
||||
return db.selectFrom("verifications")
|
||||
.innerJoin("assessments", "assessments.id", "verifications.assessment_id")
|
||||
.select([
|
||||
"verifications.id",
|
||||
"verifications.assessment_id",
|
||||
"verifications.status",
|
||||
"verifications.created_at",
|
||||
"verifications.completed_at",
|
||||
"verifications.completed_by",
|
||||
"verifications.reviewer_notes",
|
||||
"verifications.media_key_back_squat",
|
||||
"verifications.media_key_deadlift",
|
||||
"verifications.media_key_bench_press",
|
||||
"verifications.media_key_broad_jump",
|
||||
"verifications.media_key_run",
|
||||
"verifications.media_key_cone_drill",
|
||||
"verifications.verf_back_squat",
|
||||
"verifications.verf_deadlift",
|
||||
"verifications.verf_bench_press",
|
||||
"verifications.verf_broad_jump",
|
||||
"verifications.verf_run",
|
||||
"verifications.verf_cone_drill",
|
||||
"assessments.account_id",
|
||||
"assessments.name",
|
||||
"assessments.gender",
|
||||
"assessments.age",
|
||||
"assessments.weight",
|
||||
"assessments.perf_back_squat",
|
||||
"assessments.perf_deadlift",
|
||||
"assessments.perf_bench_press",
|
||||
"assessments.perf_broad_jump",
|
||||
"assessments.perf_run",
|
||||
"assessments.perf_cone_drill",
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user