From 90f1802611de55e80a44b72ad9d90a9c29018664 Mon Sep 17 00:00:00 2001 From: falendikategar Date: Wed, 30 Oct 2024 12:55:53 +0700 Subject: [PATCH] update: addition of status types on the backend and frontend of assessment request management --- apps/backend/src/drizzle/schema/assessments.ts | 2 +- apps/backend/src/routes/assessmentRequestManagement/route.ts | 4 ++-- .../modals/AssessmentRequestManagementFormModal.tsx | 2 +- .../queries/assessmentRequestManagementQueries.ts | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/backend/src/drizzle/schema/assessments.ts b/apps/backend/src/drizzle/schema/assessments.ts index f24161d..1d43ff3 100644 --- a/apps/backend/src/drizzle/schema/assessments.ts +++ b/apps/backend/src/drizzle/schema/assessments.ts @@ -20,4 +20,4 @@ export const assessments = pgTable("assessments", { createdAt: timestamp("createdAt", { mode: "date" }).defaultNow(), }); // Query Tools in PosgreSQL -// CREATE TYPE status AS ENUM ('menunggu konfirmasi', 'diterima', 'ditolak', 'selesai'); \ No newline at end of file +// CREATE TYPE status AS ENUM ('menunggu konfirmasi', 'diterima', 'ditolak', 'dalam pengerjaan', 'belum diverifikasi', 'selesai'); \ No newline at end of file diff --git a/apps/backend/src/routes/assessmentRequestManagement/route.ts b/apps/backend/src/routes/assessmentRequestManagement/route.ts index 2ce0aeb..3b1aa99 100644 --- a/apps/backend/src/routes/assessmentRequestManagement/route.ts +++ b/apps/backend/src/routes/assessmentRequestManagement/route.ts @@ -13,7 +13,7 @@ import authInfo from "../../middlewares/authInfo"; export const assessmentFormSchema = z.object({ respondentId: z.string().min(1), - status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "selesai"]), + status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "dalam pengerjaan", "belum diverifikasi", "selesai"]), reviewedBy: z.string().min(1), verifiedBy: z.string().min(1), verifiedAt: z.string().optional(), @@ -169,7 +169,7 @@ const assessmentsRequestManagementRoutes = new Hono() requestValidator( "json", z.object({ - status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "selesai"]), + status: z.enum(["menunggu konfirmasi", "diterima", "ditolak", "dalam pengerjaan", "belum diverifikasi", "selesai"]), }) ), async (c) => { diff --git a/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx b/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx index 1aaa767..ae6047e 100644 --- a/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx +++ b/apps/frontend/src/modules/assessmentRequestManagement/modals/AssessmentRequestManagementFormModal.tsx @@ -11,7 +11,7 @@ import { useEffect } from "react"; const routeApi = getRouteApi("/_dashboardLayout/assessmentRequestManagements/"); // Define allowed status values -type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "selesai"; +type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "dalam pengerjaan" | "belum diverifikasi" | "selesai"; interface AssessmentRequestManagementFormModalProps { assessmentId: string | null; diff --git a/apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestManagementQueries.ts b/apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestManagementQueries.ts index 60d6e0f..60baf44 100644 --- a/apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestManagementQueries.ts +++ b/apps/frontend/src/modules/assessmentRequestManagement/queries/assessmentRequestManagementQueries.ts @@ -3,7 +3,7 @@ import fetchRPC from "@/utils/fetchRPC"; import { queryOptions } from "@tanstack/react-query"; // Define allowed status values -type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "selesai"; +type AssessmentStatus = "menunggu konfirmasi" | "diterima" | "ditolak" | "dalam pengerjaan" | "belum diverifikasi" | "selesai"; export const assessmentRequestManagementQueryOptions = (page: number, limit: number, q?: string) => queryOptions({