TIMOR-TELECOM/service-master-data-revenue
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(api)!: paginate schedule calendar by resource

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
src/controllers/schedule.ts
View File

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

37
src/model/schedule.ts
View File

@ -34,8 +34,6 @@ type ScheduleExceptionPayload = {
type CalendarQueryOptions = { type CalendarQueryOptions = {
limit?: number; limit?: number;
page?: number; page?: number;
order_field?: "startAt" | "endAt" | "title" | "seriesId" | "status";
order_direction?: "asc" | "desc";
}; };
export class ScheduleModel { export class ScheduleModel {
@ -148,39 +146,36 @@ export class ScheduleModel {
} }
} }
const orderField = options.order_field || "startAt"; const allResourcesMap = new Map<string, any>();
const orderDirection = (options.order_direction || "asc").toUpperCase() as "ASC" | "DESC"; for (const event of allEvents) {
const sortFactor = orderDirection === "ASC" ? 1 : -1; allResourcesMap.set(event._resource.id, event._resource);
}
allEvents.sort((a, b) => { const allResources = [...allResourcesMap.values()].sort((a, b) => a.id.localeCompare(b.id));
const av = a[orderField]; const totalCount = allResources.length;
const bv = b[orderField];
if (av === bv) return 0;
return av > bv ? sortFactor : -sortFactor;
});
const totalCount = allEvents.length;
const page = options.page ?? 1; const page = options.page ?? 1;
const limit = options.limit ?? totalCount; const limit = options.limit ?? totalCount;
const offset = (page - 1) * limit; const offset = (page - 1) * limit;
const pagedEventsRaw = allEvents.slice(offset, offset + limit); const pagedResources = allResources.slice(offset, offset + limit);
const allowedResourceIds = new Set(pagedResources.map((resource) => resource.id));
const resourceMap = new Map<string, any>(); const pagedEvents = allEvents
const pagedEvents = pagedEventsRaw.map((event) => { .filter((event) => allowedResourceIds.has(event.resourceId))
resourceMap.set(event._resource.id, event._resource); .sort((a, b) => {
if (a.startAt === b.startAt) return a.id.localeCompare(b.id);
return a.startAt.localeCompare(b.startAt);
})
.map((event) => {
const { _resource, ...cleanEvent } = event; const { _resource, ...cleanEvent } = event;
return cleanEvent; return cleanEvent;
}); });
return { return {
resources: [...resourceMap.values()], resources: pagedResources,
events: pagedEvents, events: pagedEvents,
meta: { meta: {
total_count: totalCount, total_count: totalCount,
page, page,
limit, limit,
order_field: orderField,
order_direction: orderDirection,
}, },
}; };
} }

4
src/swagger/builder.js
View File

@ -413,9 +413,7 @@ const doc = {
scheduleCalendarMeta: { scheduleCalendarMeta: {
$total_count: 24, $total_count: 24,
$page: 1, $page: 1,
$limit: 20, $limit: 20
$order_field: "startAt",
$order_direction: "ASC"
}, },
}, },
parameters: { parameters: {