diff --git a/serverless/functions/minglaradmin.yml b/serverless/functions/minglaradmin.yml index 273ae25..c660469 100644 --- a/serverless/functions/minglaradmin.yml +++ b/serverless/functions/minglaradmin.yml @@ -324,7 +324,7 @@ RejectPQQByAM: - ${file(./serverless/patterns/base.yml):pattern4} events: - httpApi: - path: /minglaradmin/hosthub/hosts/reject-pq-by-am/{activityId} + path: /minglaradmin/hosthub/hosts/reject-pq-by-am method: patch acceptPQByAM: @@ -340,7 +340,7 @@ acceptPQByAM: - ${file(./serverless/patterns/base.yml):pattern4} events: - httpApi: - path: /minglaradmin/hosthub/hosts/accept-pq-by-am/{activityId} + path: /minglaradmin/hosthub/hosts/accept-pq-by-am method: patch rejectHostApplication: diff --git a/src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.ts b/src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.ts index a8af733..13b207c 100644 --- a/src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.ts +++ b/src/modules/minglaradmin/handlers/hosthub/hosts/acceptPQByAM.ts @@ -8,6 +8,10 @@ import ApiError from '../../../../../common/utils/helper/ApiError'; const prismaService = new PrismaService(); const minglarService = new MinglarService(prismaService); +interface Body { + activityId: number; +} + export const handler = safeHandler(async ( event: APIGatewayProxyEvent, context?: Context @@ -17,7 +21,16 @@ export const handler = safeHandler(async ( const userInfo = await verifyMinglarAdminToken(token); - const activityId = event.pathParameters?.activityId; + // Parse request body + let body: Body; + + try { + body = event.body ? JSON.parse(event.body) : {}; + } catch (error) { + throw new ApiError(400, 'Invalid JSON in request body'); + } + + const { activityId } = body; if (!activityId) { throw new ApiError(400, 'activityId is required'); diff --git a/src/modules/minglaradmin/handlers/hosthub/hosts/rejectPQQbyAM.ts b/src/modules/minglaradmin/handlers/hosthub/hosts/rejectPQQbyAM.ts index acb60af..fec946a 100644 --- a/src/modules/minglaradmin/handlers/hosthub/hosts/rejectPQQbyAM.ts +++ b/src/modules/minglaradmin/handlers/hosthub/hosts/rejectPQQbyAM.ts @@ -8,6 +8,10 @@ import { MinglarService } from '../../../services/minglar.service'; const prismaService = new PrismaService(); const minglarService = new MinglarService(prismaService); +interface Body { + activityId: number; +} + export const handler = safeHandler(async ( event: APIGatewayProxyEvent, context?: Context @@ -17,7 +21,16 @@ export const handler = safeHandler(async ( const userInfo = await verifyMinglarAdminToken(token); - const activityId = event.pathParameters?.activityId; + // Parse request body + let body: Body; + + try { + body = event.body ? JSON.parse(event.body) : {}; + } catch (error) { + throw new ApiError(400, 'Invalid JSON in request body'); + } + + const { activityId } = body; if (!activityId) { throw new ApiError(400, 'activityId is required'); diff --git a/src/modules/minglaradmin/services/minglar.service.ts b/src/modules/minglaradmin/services/minglar.service.ts index ac5d3df..c4e190b 100644 --- a/src/modules/minglaradmin/services/minglar.service.ts +++ b/src/modules/minglaradmin/services/minglar.service.ts @@ -260,6 +260,7 @@ export class MinglarService { async getAllHostActivityForMinglar(search?: string, hostXid?: number, paginationOptions?: { page: number; limit: number; skip: number }) { const whereClause: any = { isActive: true, + activityInternalStatus: { notIn: [ACTIVITY_INTERNAL_STATUS.DRAFT_PQ] }, ...(hostXid ? { hostXid } : {}), };