From 0410c56060d97155f9682dcbff0d19e8289ee75d Mon Sep 17 00:00:00 2001 From: Methapon Metanipat Date: Thu, 14 Nov 2024 11:08:03 +0700 Subject: [PATCH] refactor: change endpoint name --- src/controllers/06-request-list-controller.ts | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/controllers/06-request-list-controller.ts b/src/controllers/06-request-list-controller.ts index b0f1b73..bb2dbb8 100644 --- a/src/controllers/06-request-list-controller.ts +++ b/src/controllers/06-request-list-controller.ts @@ -7,12 +7,12 @@ import { createPermCondition } from "../services/permission"; // User in company can see. const permissionCond = createPermCondition((_) => true); -@Route("/api/v1/request") +@Route("/api/v1/request-data") @Tags("Request List") export class RequestDataController extends Controller { @Get() @Security("keycloak") - async getRequestData( + async getRequestDataList( @Request() req: RequestWithUser, @Query() page: number = 1, @Query() pageSize: number = 30, @@ -48,14 +48,30 @@ export class RequestDataController extends Controller { return { result, page, pageSize, total }; } + + @Get("{requestDataId}") + @Security("keycloak") + async getRequestData(@Path() requestDataId: string) { + return await prisma.requestData.findFirst({ + where: { id: requestDataId }, + include: { + quotation: { + include: { + customerBranch: { include: { customer: true } }, + }, + }, + employee: true, + }, + }); + } } -@Route("/api/v1/request-list") +@Route("/api/v1/request-work") @Tags("Request List") export class RequestListController extends Controller { @Get() @Security("keycloak") - async getRequest( + async getRequestWork( @Request() req: RequestWithUser, @Query() page: number = 1, @Query() pageSize: number = 30, @@ -101,8 +117,8 @@ export class RequestListController extends Controller { return { result, page, pageSize, total }; } - @Get("{requestId}") - async getRequestById(@Path() requestId: string) { + @Get("{requestWorkId}") + async getRequestWorkById(@Path() requestWorkId: string) { return await prisma.requestWork.findFirst({ include: { request: { @@ -119,18 +135,18 @@ export class RequestListController extends Controller { }, }, }, - where: { id: requestId }, + where: { id: requestWorkId }, }); } - @Put("{requestId}") - async updateRequestById( + @Put("{requestWorkId}") + async updateRequestWorkById( @Request() req: RequestWithUser, - @Path() requestId: string, + @Path() requestWorkId: string, @Body() payload: { status: RequestWorkStatus; attributes: Record }, ) { const record = await prisma.requestWork.update({ - where: { id: requestId }, + where: { id: requestWorkId }, data: { workStatus: payload.status, request: {