fix: prefer full-sized requests again, hopefully no 429?

bddvlpr · Jan 24, 2024 · 222dc3b · 222dc3b
1 parent 5a54a3b
commit 222dc3b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 18 deletions.
diff --git a/src/lessons/lessons.controller.ts b/src/lessons/lessons.controller.ts
@@ -40,8 +40,8 @@ export class LessonsController {
   @Get(':classId')
   async getLessonsForClass(@Param('classId', ParseIntPipe) classId: number) {
     const lessons = await this.untisService.fetchTimetable(
-      this.configService.get<number>('LESSONS_TIMETABLE_BEFORE', 31),
-      this.configService.get<number>('LESSONS_TIMETABLE_AFTER', 31),
+      this.configService.get<number>('LESSONS_TIMETABLE_BEFORE', 7),
+      this.configService.get<number>('LESSONS_TIMETABLE_AFTER', 7),
       classId,
     );
     if (!lessons)
@@ -77,8 +77,8 @@ export class LessonsController {
     offset?: number,
   ) {
     const lessons = await this.untisService.fetchTimetable(
-      this.configService.get<number>('LESSONS_TIMETABLE_BEFORE', 31),
-      this.configService.get<number>('LESSONS_TIMETABLE_AFTER', 31),
+      this.configService.get<number>('LESSONS_TIMETABLE_BEFORE', 7),
+      this.configService.get<number>('LESSONS_TIMETABLE_AFTER', 7),
       classId,
     );
     if (!lessons)

diff --git a/src/untis/untis.service.ts b/src/untis/untis.service.ts
@@ -108,25 +108,16 @@ export class UntisService {
       async () => {
         await this.validateSession();
 
-        const currentMoment = moment().subtract(before, 'days');
-        const endMoment = moment().add(after, 'days');
-
-        const promises = [];
-        while (currentMoment.isBefore(endMoment)) {
-          promises.push(
-            this.fetchTimetableFor(currentMoment.toDate(), classId),
-          );
-          currentMoment.add(1, 'days');
-        }
-        return (await Promise.all(promises)).filter((l) => l).flat();
+        return await this.fetchTimetableRange(
+          moment().subtract(before, 'days').toDate(),
+          moment().add(after, 'days').toDate(),
+          classId,
+        );
       },
       60_000,
     );
   }
 
-  /**
-   * @deprecated
-   */
   private fetchTimetableRange(
     start: Date,
     end: Date,
@@ -139,6 +130,9 @@ export class UntisService {
     return this.client.getTimetableForRange(start, end, classId, type);
   }
 
+  /**
+   * @deprecated
+   */
   private fetchTimetableFor(date: Date, classId: number, type = 1) {
     this.logger.log(`Fetching timetable for ${date.toLocaleDateString()}...`);
     return this.client