feat: inject whole result array instead of just lastItem for fetchApi…

…AllPages' UntilFn
vfurmane · May 24, 2024 · fa4c06f · fa4c06f
1 parent 5de594f
commit fa4c06f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/common/utils/prefetch-all-42-events-until/prefetch-all-42-events-until.ts b/src/common/utils/prefetch-all-42-events-until/prefetch-all-42-events-until.ts
@@ -3,6 +3,11 @@ import { FetchUntilFunctionItems } from '../../../ft-api/ft-api.service.js';
 import { lastItemIsAlreadyCached } from './last-item-is-already-cached.js';
 
 export function prefetchAll42EventsUntil(latestEvent: FindEventsResponseDto[number]) {
-  return ({ lastItem }: FetchUntilFunctionItems<FindEventsResponseDto[number]>) =>
-    lastItemIsAlreadyCached(latestEvent, lastItem);
+  return ({ result }: FetchUntilFunctionItems<FindEventsResponseDto[number]>) => {
+    if (result.length === 0) {
+      return true;
+    }
+    const lastItem = result[result.length - 1];
+    return lastItemIsAlreadyCached(latestEvent, lastItem);
+  };
 }
diff --git a/src/ft-api/ft-api.service.ts b/src/ft-api/ft-api.service.ts
@@ -24,7 +24,7 @@ import { getDataFromResponseOrThrow } from '../common/utils/get-data-from-respon
 export type RequestWithSchemas<T> = RequestInit & { schema: FetchSchemas<Array<T>> };
 export type FetchUntilFunctionItems<T> = {
   iteration: number;
-  lastItem?: T;
+  result: Array<T>;
 };
 export type FetchUntilFunction<T> = (items: FetchUntilFunctionItems<T>) => boolean;
 
@@ -121,7 +121,7 @@ export class FtApiService {
     } while (
       route !== null &&
       iteration < this.apiPaginationMaxDepth &&
-      (untilFn === undefined || !untilFn({ iteration, lastItem: result[result.length - 1] }))
+      (untilFn === undefined || !untilFn({ iteration, result }))
     );
     return result;
   }