fix(api)!: paginate schedule calendar by resource

This commit is contained in:
avicenan
2026-03-25 09:44:41 +07:00
parent 85929539d6
commit 1f73c5e04f
3 changed files with 18 additions and 33 deletions

View File

@ -125,8 +125,6 @@ export class ScheduleController {
#swagger.parameters['filter'] = { in: 'query', required: false, type: 'string' }
#swagger.parameters['limit'] = { in: 'query', required: false, type: 'number' }
#swagger.parameters['page'] = { in: 'query', required: false, type: 'number' }
#swagger.parameters['order_field'] = { in: 'query', required: false, type: 'string' }
#swagger.parameters['order_direction'] = { in: 'query', required: false, schema: { '@enum': ['ASC', 'DESC'] } }
#swagger.responses[200] = {
description: 'Schedule calendar resources and events',
schema: {
@ -152,7 +150,7 @@ export class ScheduleController {
isException: false,
status: 'confirmed'
}],
meta: { total_count: 24, page: 1, limit: 20, order_field: 'startAt', order_direction: 'ASC' }
meta: { total_count: 24, page: 1, limit: 20 }
}
}
}
@ -164,8 +162,6 @@ export class ScheduleController {
filter: Joi.string().allow("").optional().label("Filter"),
limit: Joi.number().min(1).optional().label("Limit"),
page: Joi.number().min(1).optional().label("Page"),
order_field: Joi.string().allow("startAt", "endAt", "title", "seriesId", "status").optional().label("Order Field"),
order_direction: Joi.string().allow("asc", "desc").optional().label("Order Direction"),
});
const param: {
@ -174,15 +170,11 @@ export class ScheduleController {
filter?: string;
limit?: number;
page?: number;
order_field?: "startAt" | "endAt" | "title" | "seriesId" | "status";
order_direction?: "asc" | "desc";
} = await schema.validateAsync(req.query);
const filterObj = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
const result = await ScheduleModel.getScheduleCalendarRange(param.start_date, param.end_date, filterObj, {
limit: param.limit,
page: param.page,
order_field: param.order_field,
order_direction: param.order_direction,
});
return ReturnHelper.successResponseAny(res, 200, Language.lang.success_view, result);