kavehhn/gameno-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(sessions): respect database sort order in getAllSessions and getMySessions

Browse Source
This commit is contained in:
kavehhn
2026-08-23 16:41:49 +03:30
parent 22ce6c3fb1
commit dde0efc72a
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/sessions/sessionService.js
+13 -6
View File
@@ -237,7 +237,7 @@ const populateSessionList = (query, { includeClassStudents = false } = {}) => {
}; };
const getAllSessions = async (queryParams) => { const getAllSessions = async (queryParams) => {
const { page, limit, skip } = parsePaginationAndSort(queryParams, 'day', 'asc'); const { page, limit, skip, sort } = parsePaginationAndSort(queryParams, 'day', 'asc');
const attendanceScope = queryParams.attendanceScope; const attendanceScope = queryParams.attendanceScope;
const filter = buildFilterQuery(queryParams, ['topic', 'place', 'note'], [ const filter = buildFilterQuery(queryParams, ['topic', 'place', 'note'], [
'page', 'page',
@@ -272,10 +272,9 @@ const getAllSessions = async (queryParams) => {
const includeClassStudents = Boolean(attendanceScope); const includeClassStudents = Boolean(attendanceScope);
const matched = await populateSessionList(Session.find(filter), { includeClassStudents }).lean();
let sessions = sortByClosestAttendance(matched);
if (attendanceScope) { if (attendanceScope) {
const matched = await populateSessionList(Session.find(filter), { includeClassStudents }).lean();
let sessions = sortByClosestAttendance(matched);
const studentsByClassId = await buildStudentsByClassId(matched); const studentsByClassId = await buildStudentsByClassId(matched);
sessions = filterByAttendanceScope(sessions, attendanceScope, studentsByClassId) sessions = filterByAttendanceScope(sessions, attendanceScope, studentsByClassId)
.map((session) => enrichSessionAttendance(session, studentsByClassId)); .map((session) => enrichSessionAttendance(session, studentsByClassId));
@@ -285,8 +284,16 @@ const getAllSessions = async (queryParams) => {
return { data: sessions, meta }; return { data: sessions, meta };
} }
const totalCount = await Session.countDocuments(filter); const effectiveSort = { ...sort };
sessions = sessions.slice(skip, skip + limit); if (effectiveSort.day) {
effectiveSort.startTime = effectiveSort.day;
}
const [sessions, totalCount] = await Promise.all([
populateSessionList(Session.find(filter).sort(effectiveSort).skip(skip).limit(limit), { includeClassStudents: false }).lean(),
Session.countDocuments(filter)
]);
const meta = calculateMeta(totalCount, page, limit); const meta = calculateMeta(totalCount, page, limit);
return { data: sessions, meta }; return { data: sessions, meta };
}; };