diff --git a/app/services/colle_service.ts b/app/services/colle_service.ts index f40481a..884d16e 100644 --- a/app/services/colle_service.ts +++ b/app/services/colle_service.ts @@ -106,6 +106,18 @@ export class ColleService { const studentColles = await studentCollesQuery + const now = DateTime.now() + const upcomingClassColles = await Colle.query() + .whereHas('student', (query) => { + query.where('className', student.className) + }) + .where('date', '>=', now.toISODate()!) + .orderBy('date', 'asc') + .preload('student') + .preload('examiner') + .preload('subject') + .preload('room') + // TODO: Favorite colles const favoriteColles = [] as Colle[] @@ -113,6 +125,7 @@ export class ColleService { classColles, studentColles, favoriteColles, + upcomingClassColles, healthyUntil: await this.getHealthyUntil(student.className), lastSync: await this.getLastSync(student.className), }