Fix pagination for plays and rounds resources

make-software · Jun 18, 2024 · 851b677 · 851b677
1 parent 9525f4f
commit 851b677
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/server/src/repository/play.ts b/server/src/repository/play.ts
@@ -49,10 +49,12 @@ export class PlayRepository {
         const subQuery = qb.subQuery().select('max(round_id)').from(Play, 'maxp').getQuery();
         return 'round_id = ' + subQuery;
       })
-      .limit(pagination.limit)
-      .offset(pagination.offset)
       .orderBy('timestamp', 'DESC');
 
+    if (pagination.limit !== -1) {
+      queryBuilder.limit(pagination.limit).offset(pagination.offset);
+    }
+
     return queryBuilder.getManyAndCount();
   }
 

diff --git a/server/src/repository/round.ts b/server/src/repository/round.ts
@@ -10,13 +10,16 @@ export class RoundRepository {
 
   async getPaginatedRounds(pagination: { limit: number; offset: number }, params: { isFinished: boolean } = { isFinished: false }): Promise<[Round[], number]> {
     const options: FindManyOptions<Round> = {
-      take: pagination.limit,
-      skip: pagination.offset,
       order: {
         roundId: 'DESC',
       },
     };
 
+    if (pagination.limit !== -1) {
+      options.take = pagination.limit;
+      options.skip = pagination.offset;
+    }
+
     if (params.isFinished) {
       options.where = { isFinished: true };
     }