chore: using genericity for pages aggregators (#8)

jpb06 · Mar 18, 2024 · 7771d35 · 7771d35
1 parent b5f72ef
commit 7771d35
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 93 deletions.
diff --git a/src/layer/github/implementation/aggregators/get-pull-request-reviews.ts b/src/layer/github/implementation/aggregators/get-pull-request-reviews.ts
@@ -1,8 +1,7 @@
 import { Effect } from 'effect';
 
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { arrayRange } from '../../../../util/array-range.util';
-import { defaultConcurrency } from '../constants/default-concurrency.constant';
+import { getAllPages } from '../generic/get-all-pages.effect';
 import { getPullRequestReviewsPage } from '../paging/get-pull-request-reviews-page';
 
 export interface GetPullRequestReviewsArgs {
@@ -21,22 +20,7 @@ const getPage = (args: GetPullRequestReviewsArgs) => (page: number) =>
 export const getPullRequestReviews = (args: GetPullRequestReviewsArgs) =>
   Effect.withSpan(__filename, {
     attributes: { ...args },
-  })(
-    Effect.gen(function* (_) {
-      const firstPage = yield* _(getPage(args)(1));
-      if (firstPage.links?.last === undefined) {
-        return firstPage.data;
-      }
-
-      const pagesResults = yield* _(
-        Effect.all(arrayRange(2, firstPage.links.last).map(getPage(args)), {
-          concurrency: args.concurrency ?? defaultConcurrency,
-        }),
-      );
-
-      return [...firstPage.data, ...pagesResults.flatMap((r) => r.data)];
-    }),
-  );
+  })(getAllPages(getPage, args));
 
 export type PullRequestReviewsResult = EffectResultSuccess<
   typeof getPullRequestReviews

diff --git a/src/layer/github/implementation/aggregators/get-repo-issues.ts b/src/layer/github/implementation/aggregators/get-repo-issues.ts
@@ -1,8 +1,7 @@
 import { Effect } from 'effect';
 
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { arrayRange } from '../../../../util/array-range.util';
-import { defaultConcurrency } from '../constants/default-concurrency.constant';
+import { getAllPages } from '../generic/get-all-pages.effect';
 import { getRepoIssuesPage } from '../paging/get-repo-issues-page';
 
 export interface GetRepoIssuesArgs {
@@ -18,21 +17,8 @@ const getPage = (args: GetRepoIssuesArgs) => (page: number) =>
   });
 
 export const getRepoIssues = (args: GetRepoIssuesArgs) =>
-  Effect.withSpan(__filename, { attributes: { ...args } })(
-    Effect.gen(function* (_) {
-      const firstPage = yield* _(getPage(args)(1));
-      if (firstPage.links?.last === undefined) {
-        return firstPage.data;
-      }
-
-      const pagesResults = yield* _(
-        Effect.all(arrayRange(2, firstPage.links.last).map(getPage(args)), {
-          concurrency: args.concurrency ?? defaultConcurrency,
-        }),
-      );
-
-      return [...firstPage.data, ...pagesResults.flatMap((r) => r.data)];
-    }),
-  );
+  Effect.withSpan(__filename, {
+    attributes: { ...args },
+  })(getAllPages(getPage, args));
 
 export type RepoIssuesResult = EffectResultSuccess<typeof getRepoIssues>;
diff --git a/src/layer/github/implementation/aggregators/get-repo-pull-requests.ts b/src/layer/github/implementation/aggregators/get-repo-pull-requests.ts
@@ -1,8 +1,7 @@
 import { Effect } from 'effect';
 
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { arrayRange } from '../../../../util/array-range.util';
-import { defaultConcurrency } from '../constants/default-concurrency.constant';
+import { getAllPages } from '../generic/get-all-pages.effect';
 import { getRepoPullRequestsPage } from '../paging/get-repo-pull-requests-page';
 
 export interface GetRepoPullRequestsArgs {
@@ -18,22 +17,9 @@ const getPage = (args: GetRepoPullRequestsArgs) => (page: number) =>
   });
 
 export const getRepoPullRequests = (args: GetRepoPullRequestsArgs) =>
-  Effect.withSpan(__filename, { attributes: { ...args } })(
-    Effect.gen(function* (_) {
-      const firstPage = yield* _(getPage(args)(1));
-      if (firstPage.links?.last === undefined) {
-        return firstPage.data;
-      }
-
-      const pagesResults = yield* _(
-        Effect.all(arrayRange(2, firstPage.links.last).map(getPage(args)), {
-          concurrency: args.concurrency ?? defaultConcurrency,
-        }),
-      );
-
-      return [...firstPage.data, ...pagesResults.flatMap((r) => r.data)];
-    }),
-  );
+  Effect.withSpan(__filename, {
+    attributes: { ...args },
+  })(getAllPages(getPage, args));
 
 export type RepoPullRequestsResult = EffectResultSuccess<
   typeof getRepoPullRequests

diff --git a/src/layer/github/implementation/aggregators/get-repositories.ts b/src/layer/github/implementation/aggregators/get-repositories.ts
@@ -2,8 +2,7 @@ import { Effect } from 'effect';
 import { match } from 'ts-pattern';
 
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { arrayRange } from '../../../../util/array-range.util';
-import { defaultConcurrency } from '../constants/default-concurrency.constant';
+import { getAllPages } from '../generic/get-all-pages.effect';
 import { getOrgReposPage } from '../paging/get-org-repos-page';
 import { getUserReposPage } from '../paging/get-user-repos-page';
 
@@ -32,21 +31,8 @@ const getPage =
       .exhaustive();
 
 export const getRepositories = (args: GetRepositoriesArgs) =>
-  Effect.withSpan(__filename, { attributes: { ...args } })(
-    Effect.gen(function* (_) {
-      const firstPage = yield* _(getPage(args)(1));
-      if (firstPage.links?.last === undefined) {
-        return firstPage.data;
-      }
-
-      const pagesResults = yield* _(
-        Effect.all(arrayRange(2, firstPage.links.last).map(getPage(args)), {
-          concurrency: args.concurrency ?? defaultConcurrency,
-        }),
-      );
-
-      return [...firstPage.data, ...pagesResults.flatMap((r) => r.data)];
-    }),
-  );
+  Effect.withSpan(__filename, {
+    attributes: { ...args },
+  })(getAllPages(getPage, args));
 
 export type RepositoriesResult = EffectResultSuccess<typeof getRepositories>;
diff --git a/src/layer/github/implementation/aggregators/get-user-events.ts b/src/layer/github/implementation/aggregators/get-user-events.ts
@@ -1,8 +1,7 @@
 import { Effect } from 'effect';
 
 import { EffectResultSuccess } from '../../../..';
-import { arrayRange } from '../../../../util/array-range.util';
-import { defaultConcurrency } from '../constants/default-concurrency.constant';
+import { getAllPages } from '../generic/get-all-pages.effect';
 import { getUserEventsPage } from '../paging/get-user-events-page';
 
 export interface GetUserEventsArgs {
@@ -19,21 +18,6 @@ const getPage = (args: GetUserEventsArgs) => (page: number) =>
 export const getUserEvents = (args: GetUserEventsArgs) =>
   Effect.withSpan(__filename, {
     attributes: { ...args },
-  })(
-    Effect.gen(function* (_) {
-      const firstPage = yield* _(getPage(args)(1));
-      if (firstPage.links?.last === undefined) {
-        return firstPage.data;
-      }
-
-      const pagesResults = yield* _(
-        Effect.all(arrayRange(2, firstPage.links.last).map(getPage(args)), {
-          concurrency: args.concurrency ?? defaultConcurrency,
-        }),
-      );
-
-      return [...firstPage.data, ...pagesResults.flatMap((r) => r.data)];
-    }),
-  );
+  })(getAllPages(getPage, args));
 
 export type UserEventsResult = EffectResultSuccess<typeof getUserEvents>;
diff --git a/src/layer/github/implementation/constants/default-retry-count.constant.ts b/src/layer/github/implementation/constants/default-retry-count.constant.ts
diff --git a/src/layer/github/implementation/generic/get-all-pages.effect.ts b/src/layer/github/implementation/generic/get-all-pages.effect.ts
@@ -0,0 +1,48 @@
+import { Effect } from 'effect';
+
+import { arrayRange } from '../../../../util/array-range.util';
+import { defaultConcurrency } from '../constants/default-concurrency.constant';
+
+type LinkKey = 'prev' | 'next' | 'last';
+
+interface DataWithLinks<TData> {
+  links: Record<LinkKey, number | undefined> | undefined;
+  data: TData;
+}
+
+type GetPage<TArgs, TData, TError> = (
+  args: TArgs,
+) => (page: number) => Effect.Effect<DataWithLinks<TData>, TError>;
+
+export const getAllPages = <
+  TError,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  TArgs extends { concurrency?: number } & Record<string, any>,
+  TDataItem,
+  TData extends TDataItem[],
+>(
+  getPage: GetPage<TArgs, TData, TError>,
+  args: TArgs,
+) =>
+  Effect.withSpan(__filename, {
+    attributes: { ...args },
+  })(
+    Effect.gen(function* (_) {
+      const firstPage = yield* _(getPage(args)(1));
+
+      if (firstPage.links?.last === undefined) {
+        return firstPage.data;
+      }
+
+      const pagesResults = yield* _(
+        Effect.all(arrayRange(2, firstPage.links.last).map(getPage(args)), {
+          concurrency: args.concurrency ?? defaultConcurrency,
+        }),
+      );
+
+      return [
+        ...firstPage.data,
+        ...pagesResults.flatMap((r) => r.data),
+      ] as TData;
+    }),
+  );
diff --git a/src/layer/octokit.layer.ts b/src/layer/octokit.layer.ts
@@ -57,5 +57,3 @@ export const OctokitLayer = {
     }),
   }),
 };
-
-OctokitLayer.repo({ owner: 'jpb06', name: 'effect' }).pull(1).reviews();
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,5 +57,3 @@ export const OctokitLayer = { @@
         }),
       }),
     };
-    OctokitLayer.repo({ owner: 'jpb06', name: 'effect' }).pull(1).reviews();