From 244d96e4f8b65345fb7e71d3b6ba6670b43d58f6 Mon Sep 17 00:00:00 2001
From: jpb06 <jp.bois.06@outlook.fr>
Date: Mon, 13 May 2024 20:42:27 +0200
Subject: [PATCH] feat: switching to a generic get one page fn (#10)

---
 README.md                                     |   6 ++-
 bun.lockb                                     | Bin 194309 -> 196892 bytes
 package.json                                  |   4 +-
 .../aggregators/get-pull-request-reviews.ts   |   2 +-
 .../aggregators/get-repo-issues.ts            |   2 +-
 .../aggregators/get-repo-pull-requests.ts     |   2 +-
 .../aggregators/get-repositories.ts           |   2 +-
 .../aggregators/get-user-events.ts            |   2 +-
 .../generic/get-all-pages.effect.ts           |   3 +-
 .../get-one-page/get-one-page.effect.ts       |  38 ++++++++++++++++
 .../logic/octokit-request.logic.ts            |  11 +++++
 .../paging/get-org-repos-page.ts              |  39 +++-------------
 .../paging/get-pull-request-reviews-page.ts   |  43 +++---------------
 .../paging/get-repo-issues-page.ts            |  37 ++-------------
 .../paging/get-repo-pull-requests-page.ts     |  39 +++-------------
 .../paging/get-user-events-page.ts            |  37 ++-------------
 .../paging/get-user-repos-page.ts             |  39 +++-------------
 .../implementation/primitives/get-issue.ts    |   2 +-
 .../primitives/get-pull-request.ts            |   2 +-
 .../primitives/get-user-orgs.ts               |   2 +-
 .../primitives/get-user-profile.ts            |   2 +-
 21 files changed, 100 insertions(+), 214 deletions(-)
 create mode 100644 src/layer/github/implementation/generic/get-one-page/get-one-page.effect.ts
 create mode 100644 src/layer/github/implementation/generic/get-one-page/logic/octokit-request.logic.ts

diff --git a/README.md b/README.md
index 7e06905..cd6a33f 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ const [profile, repos, orgs, events] = await Effect.runPromise(
         // Get user events
         OctokitLayer.user(username).events(),
       ],
+      // Fetch all these in parallel
       { concurrency: 'unbounded' },
     ),
     Effect.provide(OctokitLayerLive),
@@ -66,7 +67,7 @@ const [profile, repos, orgs, events] = await Effect.runPromise(
 ```typescript
 import { OctokitLayer, OctokitLayerLive } from 'effect-github-stats';
 
-const [profile, repos, orgs, events] = await Effect.runPromise(
+const orgs = await Effect.runPromise(
   pipe(
     // Get organization repos
     OctokitLayer.org('my-org').repos();
@@ -101,6 +102,7 @@ const [issues, pulls, issue34, pull5453, pull5453Reviews] =
           // Get pull request #5453 reviews
           OctokitLayer.repo(reactRepo).pull(5453).reviews(),
         ],
+        // Fetch all these in parallel
         { concurrency: 'unbounded' },
       ),
       Effect.provide(OctokitLayerLive),
@@ -121,4 +123,4 @@ You can specify the `concurrency` parameter on calls doing several requests in p
 github.repo(repo).pulls(100);
 ```
 
-Note that github api enforces [api rate limits](https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api?apiVersion=2022-11-28#dealing-with-secondary-rate-limits). Getting too many results concurrently will cause an api rate limit. In that case, a warning will be displayed and the call will be attempted again after the time window provided by github api (typically 60 seconds).
+Note that github api enforces [api rate limits](https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api?apiVersion=2022-11-28#dealing-with-secondary-rate-limits). Fetching too many results concurrently will cause an api rate limit. In that case, a warning will be displayed and the call will be attempted again after the time window provided by github api (typically 60 seconds).
diff --git a/bun.lockb b/bun.lockb
index b6b69f2a051c380d9d052c32351fb702807ca6a1..745823c29b0df3563b769a83e568e705ddd6bbd2 100755
GIT binary patch
delta 3609
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
YtTZiCqGMVs^WpYd)?M>R%T$X00^(9CJOBUy

delta 2599
zcmeH}YfMx}6vt<V=Pu%k2rQtiBK3v4idkT*HKAxtR79*IMnC~~5vo?AqF^;(V=a}M
zLO1SIN?KzRYtuF<McGnA1T_T{qE!iKgRlAofmT5aRBZnT2HSq`w|27sd*=M+oHKW3
z_TJs{w@19w<yB&uTEmZyS+IBhGT+w8zPTOSLaO(DP%lMe@;uSf#nZlV%Y7;swXV`6
zgQ$8?kvByb8wY<pV}&CfjE#f!g|CMVmW&0%GG%RBbGF!QjK!E4Lrmdq6<_bD)Q&Rg
zJR2I%w+AJxF;!+6#^&44&M|AM4>FdBNDq76oM=rr;+MYgcEVc%PuS~1qcu^OWBCj3
zy?=PE@FFp$wbxCE*7$tHSUfye`yNZQW-Yv=7kO3iXuiRk!s}4w?DEyR*SxWwWEaNV
zVAEjTVKZS}Vc$@EGb}!A3tg0@ZZ0mAx3iLe75;CPI&?DZXv{QGB8}On7Unrx49B1E
zu6B<t-qV!PD2&J36H7HGPZqDOwa*BjdF*ui^cz(%DZTGc+w_Gk@z(gaYFbkan~#^u
zfpo4fC|q&5uj5=<oaw~8dmf9!X3zb>`mt?P_T6vmk5(2=EKLbXc=TD9Ip_2-bBKP<
z?`=AL+5Qtz5q;xc_HUheqoynrOXKXh?m1`dE;QU+4K+Tk9-qdTr(U?a?^J5jKI8VL
z<#F%c-J2a$o*LQnWRHv8c;dr1#|0*>ObXk-D>kzAmg8V)Zt9WXW?j_%jX9Tk<<}Wp
zFLzt{Vt!wqv+^XFwT^pBqYa=<=Gy@DR)A{+9?Gei01X5VWCC<LuV(Uq$?|3~ceOW8
z2$KnWdB^{k|L7jrYYirC?}MT5XTn2S(aB$tJ)PX_MvthAe6@@F7SPj-x7J|0fKZC2
zCwHBCqJIRScOO0dixj)0;yl1y6}zmMCs@VM%aS#zTn(5&pIWnu)1v>mU<HG)ML{ok
z$5iqa#YPZQ$yXJlSJOp^=KcwcQbs~H71yfbbYSbzr<=c~*eLXUkVrRwonwAV_JOL@
z#5WO0-O<nv^r`)<lIb0PW{@y;Td^_l4=Z*@F+cbdRW7|CsOt|6D0WY=09t>qn)tqg
zbR1#mQxQ5nd{`iKUd6QmP&Wv=hz^ZC1f$)+4-absqp>cPI~M(B#ePu?KUnMvSO6vb
zs$d~iL7U&rrB^?HNj5y<SxeGUHv^(?gcaJ4pkfHW7%U$CQYZmh2E7g~hgLv|&`Kx?
zS_LhH7CG}Db1yE7x_O@ec7Pqw1}Fsu%TdtAouhmBPVOvu!n0h0Du6El(_zz{ZbaxN
zXg!x9eLQ5=C9o^d7Q}6U{4l16+OV{CC?Bi=<H-<h=>j2}`}j0%PB$F1Ra|QOd8jv?
zhYq5xy5pSN&wafMwD2|1Q!r21)v!mP#}JLtx%T{RtQ!6Apf8~(&~FfZM<|DCP%PCT
zPK@U3fN0a{nCbY3IbtUb!eNkygmwhb*%KqbnV5|56aoI7z*K{VinzcPwUgx<Pccar
zd5U%1B0D@qAh$T(HR9e1IdZy~EgjQ^S*~6qf@I-%;V0|Xia;80_Z$94Q|df(COb5u
zNbqQrMW&}?yo3@>X(C>}Z5F;V+$bhUM;hwHrHe6`g@W8HrkRY%^wA<%mZgjMsCviX
z&KAz^EIE6wJMw_wvrG{b!-oG0ZO^<uHYmA&^Is!O%EK8#j}p?7Au<J%PWYc-ZBoWq
z#VoBQWoVhbDRP%p#L8N$sP&qXIs`X870zOtXgMfdoMMVBcqY81E)$ooXSnOi3amMJ
nKv?La^`2pzu`NHxX3X7|y>Y9<i7os74-r72KF)ywVQ~2q4&Alm

diff --git a/package.json b/package.json
index 7fb828e..63a0d42 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
     "@stylistic/eslint-plugin": "^2.1.0",
     "@types/eslint": "^8.56.10",
     "@types/node": "^20.12.11",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
+    "@typescript-eslint/eslint-plugin": "^7.9.0",
+    "@typescript-eslint/parser": "^7.9.0",
     "@vitest/coverage-v8": "^1.6.0",
     "copyfiles": "^2.4.1",
     "del-cli": "^5.1.0",
diff --git a/src/layer/github/implementation/aggregators/get-pull-request-reviews.ts b/src/layer/github/implementation/aggregators/get-pull-request-reviews.ts
index 085690f..ce13161 100644
--- a/src/layer/github/implementation/aggregators/get-pull-request-reviews.ts
+++ b/src/layer/github/implementation/aggregators/get-pull-request-reviews.ts
@@ -18,7 +18,7 @@ const getPage = (args: GetPullRequestReviewsArgs) => (page: number) =>
   });
 
 export const getPullRequestReviews = (args: GetPullRequestReviewsArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-pull-request-reviews', {
     attributes: { ...args },
   })(getAllPages(getPage, args));
 
diff --git a/src/layer/github/implementation/aggregators/get-repo-issues.ts b/src/layer/github/implementation/aggregators/get-repo-issues.ts
index 5f367bd..9637409 100644
--- a/src/layer/github/implementation/aggregators/get-repo-issues.ts
+++ b/src/layer/github/implementation/aggregators/get-repo-issues.ts
@@ -17,7 +17,7 @@ const getPage = (args: GetRepoIssuesArgs) => (page: number) =>
   });
 
 export const getRepoIssues = (args: GetRepoIssuesArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-repo-issues', {
     attributes: { ...args },
   })(getAllPages(getPage, args));
 
diff --git a/src/layer/github/implementation/aggregators/get-repo-pull-requests.ts b/src/layer/github/implementation/aggregators/get-repo-pull-requests.ts
index 33bb47e..df0f3df 100644
--- a/src/layer/github/implementation/aggregators/get-repo-pull-requests.ts
+++ b/src/layer/github/implementation/aggregators/get-repo-pull-requests.ts
@@ -17,7 +17,7 @@ const getPage = (args: GetRepoPullRequestsArgs) => (page: number) =>
   });
 
 export const getRepoPullRequests = (args: GetRepoPullRequestsArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-repo-pull-requests', {
     attributes: { ...args },
   })(getAllPages(getPage, args));
 
diff --git a/src/layer/github/implementation/aggregators/get-repositories.ts b/src/layer/github/implementation/aggregators/get-repositories.ts
index 23fb4c0..dcbf8c0 100644
--- a/src/layer/github/implementation/aggregators/get-repositories.ts
+++ b/src/layer/github/implementation/aggregators/get-repositories.ts
@@ -31,7 +31,7 @@ const getPage =
       .exhaustive();
 
 export const getRepositories = (args: GetRepositoriesArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-repositories', {
     attributes: { ...args },
   })(getAllPages(getPage, args));
 
diff --git a/src/layer/github/implementation/aggregators/get-user-events.ts b/src/layer/github/implementation/aggregators/get-user-events.ts
index c3a7707..705bf1a 100644
--- a/src/layer/github/implementation/aggregators/get-user-events.ts
+++ b/src/layer/github/implementation/aggregators/get-user-events.ts
@@ -16,7 +16,7 @@ const getPage = (args: GetUserEventsArgs) => (page: number) =>
   });
 
 export const getUserEvents = (args: GetUserEventsArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-user-events', {
     attributes: { ...args },
   })(getAllPages(getPage, args));
 
diff --git a/src/layer/github/implementation/generic/get-all-pages.effect.ts b/src/layer/github/implementation/generic/get-all-pages.effect.ts
index 37afceb..de8a038 100644
--- a/src/layer/github/implementation/generic/get-all-pages.effect.ts
+++ b/src/layer/github/implementation/generic/get-all-pages.effect.ts
@@ -24,12 +24,11 @@ export const getAllPages = <
   getPage: GetPage<TArgs, TData, TError>,
   args: TArgs,
 ) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-all-pages', {
     attributes: { ...args },
   })(
     Effect.gen(function* (_) {
       const firstPage = yield* _(getPage(args)(1));
-
       if (firstPage.links?.last === undefined) {
         return firstPage.data;
       }
diff --git a/src/layer/github/implementation/generic/get-one-page/get-one-page.effect.ts b/src/layer/github/implementation/generic/get-one-page/get-one-page.effect.ts
new file mode 100644
index 0000000..1705cf7
--- /dev/null
+++ b/src/layer/github/implementation/generic/get-one-page/get-one-page.effect.ts
@@ -0,0 +1,38 @@
+import { type Endpoints } from '@octokit/types';
+import { RequestParameters } from '@octokit/types/dist-types/RequestParameters';
+import { Effect, pipe } from 'effect';
+
+import { handleOctokitRequestError } from '../../../../errors/handle-octokit-request-error';
+import { parseLink } from '../../../../logic/parse-link.logic';
+import { githubSourceAnalysisProvider } from '../../../../providers/github-source-analysis.provider';
+import { retryAfterSchedule } from '../../../../schedules/retry-after.schedule';
+
+import { octokitRequest } from './logic/octokit-request.logic';
+
+export const getOnePage = <E extends keyof Endpoints>(
+  span: string,
+  route: E,
+  options?: Endpoints[E]['parameters'] & RequestParameters,
+) =>
+  Effect.withSpan(span, {
+    attributes: {
+      ...options,
+    },
+  })(
+    pipe(
+      githubSourceAnalysisProvider,
+      Effect.flatMap((octokit) =>
+        pipe(
+          Effect.tryPromise({
+            try: () => octokitRequest(octokit)<E>(route, options),
+            catch: handleOctokitRequestError,
+          }),
+          Effect.retry(retryAfterSchedule),
+        ),
+      ),
+      Effect.map((response) => ({
+        data: response.data as Endpoints[E]['response']['data'],
+        links: parseLink(response),
+      })),
+    ),
+  );
diff --git a/src/layer/github/implementation/generic/get-one-page/logic/octokit-request.logic.ts b/src/layer/github/implementation/generic/get-one-page/logic/octokit-request.logic.ts
new file mode 100644
index 0000000..83ac2d4
--- /dev/null
+++ b/src/layer/github/implementation/generic/get-one-page/logic/octokit-request.logic.ts
@@ -0,0 +1,11 @@
+import { Octokit } from '@octokit/core';
+import { type Endpoints } from '@octokit/types';
+import { RequestParameters } from '@octokit/types/dist-types/RequestParameters';
+
+export const octokitRequest =
+  (octokit: Octokit) =>
+  <E extends keyof Endpoints>(
+    route: E,
+    options?: Endpoints[E]['parameters'] & RequestParameters,
+  ): Promise<Endpoints[E]['response']> =>
+    octokit.request<E>(route, options as never);
diff --git a/src/layer/github/implementation/paging/get-org-repos-page.ts b/src/layer/github/implementation/paging/get-org-repos-page.ts
index 7f694d6..2a98b70 100644
--- a/src/layer/github/implementation/paging/get-org-repos-page.ts
+++ b/src/layer/github/implementation/paging/get-org-repos-page.ts
@@ -1,10 +1,5 @@
-import { Effect, pipe } from 'effect';
-
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { handleOctokitRequestError } from '../../../errors/handle-octokit-request-error';
-import { parseLink } from '../../../logic/parse-link.logic';
-import { githubSourceAnalysisProvider } from '../../../providers/github-source-analysis.provider';
-import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
+import { getOnePage } from '../generic/get-one-page/get-one-page.effect';
 
 export interface GetOrgReposPageArgs {
   org: string;
@@ -12,32 +7,10 @@ export interface GetOrgReposPageArgs {
 }
 
 export const getOrgReposPage = (args: GetOrgReposPageArgs) =>
-  Effect.withSpan(__filename, {
-    attributes: {
-      ...args,
-    },
-  })(
-    pipe(
-      githubSourceAnalysisProvider,
-      Effect.flatMap((octokit) =>
-        pipe(
-          Effect.tryPromise({
-            try: () =>
-              octokit.request('GET /orgs/{org}/repos', {
-                ...args,
-                type: 'all',
-                per_page: 100,
-              }),
-            catch: handleOctokitRequestError,
-          }),
-          Effect.retry(retryAfterSchedule),
-        ),
-      ),
-      Effect.map((response) => ({
-        data: response.data,
-        links: parseLink(response),
-      })),
-    ),
-  );
+  getOnePage('get-org-repos-page', 'GET /orgs/{org}/repos', {
+    ...args,
+    type: 'all',
+    per_page: 100,
+  });
 
 export type OrgReposPageItems = EffectResultSuccess<typeof getOrgReposPage>;
diff --git a/src/layer/github/implementation/paging/get-pull-request-reviews-page.ts b/src/layer/github/implementation/paging/get-pull-request-reviews-page.ts
index e69b1b3..739e1a8 100644
--- a/src/layer/github/implementation/paging/get-pull-request-reviews-page.ts
+++ b/src/layer/github/implementation/paging/get-pull-request-reviews-page.ts
@@ -1,10 +1,5 @@
-import { Effect, pipe } from 'effect';
-
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { handleOctokitRequestError } from '../../../errors/handle-octokit-request-error';
-import { parseLink } from '../../../logic/parse-link.logic';
-import { githubSourceAnalysisProvider } from '../../../providers/github-source-analysis.provider';
-import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
+import { getOnePage } from '../generic/get-one-page/get-one-page.effect';
 
 export interface GetPullRequestReviewsPageArgs {
   owner: string;
@@ -19,40 +14,16 @@ export const getPullRequestReviewsPage = ({
   pullNumber,
   page,
 }: GetPullRequestReviewsPageArgs) =>
-  Effect.withSpan(__filename, {
-    attributes: {
+  getOnePage(
+    'get-pull-request-reviews-page',
+    'GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews',
+    {
       owner,
       repo,
-      pullNumber,
+      pull_number: pullNumber,
+      per_page: 100,
       page,
     },
-  })(
-    pipe(
-      githubSourceAnalysisProvider,
-      Effect.flatMap((octokit) =>
-        pipe(
-          Effect.tryPromise({
-            try: () =>
-              octokit.request(
-                'GET /repos/{owner}/{repo}/pulls/{pull_number}/reviews',
-                {
-                  owner,
-                  repo,
-                  pull_number: pullNumber,
-                  per_page: 100,
-                  page,
-                },
-              ),
-            catch: handleOctokitRequestError,
-          }),
-          Effect.retry(retryAfterSchedule),
-        ),
-      ),
-      Effect.map((response) => ({
-        data: response.data,
-        links: parseLink(response),
-      })),
-    ),
   );
 
 export type PullRequestReviewsPageItems = EffectResultSuccess<
diff --git a/src/layer/github/implementation/paging/get-repo-issues-page.ts b/src/layer/github/implementation/paging/get-repo-issues-page.ts
index d89176a..5ea94bb 100644
--- a/src/layer/github/implementation/paging/get-repo-issues-page.ts
+++ b/src/layer/github/implementation/paging/get-repo-issues-page.ts
@@ -1,10 +1,5 @@
-import { Effect, pipe } from 'effect';
-
 import { EffectResultSuccess } from '../../../..';
-import { handleOctokitRequestError } from '../../../errors/handle-octokit-request-error';
-import { parseLink } from '../../../logic/parse-link.logic';
-import { githubSourceAnalysisProvider } from '../../../providers/github-source-analysis.provider';
-import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
+import { getOnePage } from '../generic/get-one-page/get-one-page.effect';
 
 export interface GetRepoIssuesPageArgs {
   owner: string;
@@ -13,31 +8,9 @@ export interface GetRepoIssuesPageArgs {
 }
 
 export const getRepoIssuesPage = (args: GetRepoIssuesPageArgs) =>
-  Effect.withSpan(__filename, {
-    attributes: {
-      ...args,
-    },
-  })(
-    pipe(
-      githubSourceAnalysisProvider,
-      Effect.flatMap((octokit) =>
-        pipe(
-          Effect.tryPromise({
-            try: () =>
-              octokit.request('GET /repos/{owner}/{repo}/issues', {
-                ...args,
-                per_page: 100,
-              }),
-            catch: handleOctokitRequestError,
-          }),
-          Effect.retry(retryAfterSchedule),
-        ),
-      ),
-      Effect.map((response) => ({
-        data: response.data,
-        links: parseLink(response),
-      })),
-    ),
-  );
+  getOnePage('get-repo-issues-page', 'GET /repos/{owner}/{repo}/issues', {
+    ...args,
+    per_page: 100,
+  });
 
 export type IssuesPageItems = EffectResultSuccess<typeof getRepoIssuesPage>;
diff --git a/src/layer/github/implementation/paging/get-repo-pull-requests-page.ts b/src/layer/github/implementation/paging/get-repo-pull-requests-page.ts
index e946b1c..07896d2 100644
--- a/src/layer/github/implementation/paging/get-repo-pull-requests-page.ts
+++ b/src/layer/github/implementation/paging/get-repo-pull-requests-page.ts
@@ -1,10 +1,5 @@
-import { pipe, Effect } from 'effect';
-
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { handleOctokitRequestError } from '../../../errors/handle-octokit-request-error';
-import { parseLink } from '../../../logic/parse-link.logic';
-import { githubSourceAnalysisProvider } from '../../../providers/github-source-analysis.provider';
-import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
+import { getOnePage } from '../generic/get-one-page/get-one-page.effect';
 
 export interface GetRepoPullRequestsPageArgs {
   owner: string;
@@ -13,33 +8,11 @@ export interface GetRepoPullRequestsPageArgs {
 }
 
 export const getRepoPullRequestsPage = (args: GetRepoPullRequestsPageArgs) =>
-  Effect.withSpan(__filename, {
-    attributes: {
-      ...args,
-    },
-  })(
-    pipe(
-      githubSourceAnalysisProvider,
-      Effect.flatMap((octokit) =>
-        pipe(
-          Effect.tryPromise({
-            try: () =>
-              octokit.request('GET /repos/{owner}/{repo}/pulls', {
-                ...args,
-                state: 'all',
-                per_page: 100,
-              }),
-            catch: handleOctokitRequestError,
-          }),
-          Effect.retry(retryAfterSchedule),
-        ),
-      ),
-      Effect.map((response) => ({
-        data: response.data,
-        links: parseLink(response),
-      })),
-    ),
-  );
+  getOnePage('get-repo-pull-requests-page', 'GET /repos/{owner}/{repo}/pulls', {
+    ...args,
+    state: 'all',
+    per_page: 100,
+  });
 
 export type RepoPullRequestsPageItems = EffectResultSuccess<
   typeof getRepoPullRequestsPage
diff --git a/src/layer/github/implementation/paging/get-user-events-page.ts b/src/layer/github/implementation/paging/get-user-events-page.ts
index 0a0f9a8..628204a 100644
--- a/src/layer/github/implementation/paging/get-user-events-page.ts
+++ b/src/layer/github/implementation/paging/get-user-events-page.ts
@@ -1,10 +1,5 @@
-import { Effect, pipe } from 'effect';
-
 import { EffectResultSuccess } from '../../../..';
-import { handleOctokitRequestError } from '../../../errors/handle-octokit-request-error';
-import { parseLink } from '../../../logic/parse-link.logic';
-import { githubSourceAnalysisProvider } from '../../../providers/github-source-analysis.provider';
-import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
+import { getOnePage } from '../generic/get-one-page/get-one-page.effect';
 
 export interface GetUserEventsPageArgs {
   username: string;
@@ -12,31 +7,9 @@ export interface GetUserEventsPageArgs {
 }
 
 export const getUserEventsPage = (args: GetUserEventsPageArgs) =>
-  Effect.withSpan(__filename, {
-    attributes: {
-      ...args,
-    },
-  })(
-    pipe(
-      githubSourceAnalysisProvider,
-      Effect.flatMap((octokit) =>
-        pipe(
-          Effect.tryPromise({
-            try: () =>
-              octokit.request('GET /users/{username}/events', {
-                ...args,
-                per_page: 100,
-              }),
-            catch: handleOctokitRequestError,
-          }),
-          Effect.retry(retryAfterSchedule),
-        ),
-      ),
-      Effect.map((response) => ({
-        data: response.data,
-        links: parseLink(response),
-      })),
-    ),
-  );
+  getOnePage('get-user-events-page', 'GET /users/{username}/events', {
+    ...args,
+    per_page: 100,
+  });
 
 export type EventsPageItems = EffectResultSuccess<typeof getUserEventsPage>;
diff --git a/src/layer/github/implementation/paging/get-user-repos-page.ts b/src/layer/github/implementation/paging/get-user-repos-page.ts
index 4eeb9c5..a237ab2 100644
--- a/src/layer/github/implementation/paging/get-user-repos-page.ts
+++ b/src/layer/github/implementation/paging/get-user-repos-page.ts
@@ -1,10 +1,5 @@
-import { Effect, pipe } from 'effect';
-
 import { EffectResultSuccess } from '../../../../types/effect.types';
-import { handleOctokitRequestError } from '../../../errors/handle-octokit-request-error';
-import { parseLink } from '../../../logic/parse-link.logic';
-import { githubSourceAnalysisProvider } from '../../../providers/github-source-analysis.provider';
-import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
+import { getOnePage } from '../generic/get-one-page/get-one-page.effect';
 
 export interface GetUserReposPageArgs {
   username: string;
@@ -12,32 +7,10 @@ export interface GetUserReposPageArgs {
 }
 
 export const getUserReposPage = (args: GetUserReposPageArgs) =>
-  Effect.withSpan(__filename, {
-    attributes: {
-      ...args,
-    },
-  })(
-    pipe(
-      githubSourceAnalysisProvider,
-      Effect.flatMap((octokit) =>
-        pipe(
-          Effect.tryPromise({
-            try: () =>
-              octokit.request('GET /users/{username}/repos', {
-                ...args,
-                type: 'all',
-                per_page: 100,
-              }),
-            catch: handleOctokitRequestError,
-          }),
-          Effect.retry(retryAfterSchedule),
-        ),
-      ),
-      Effect.map((response) => ({
-        data: response.data,
-        links: parseLink(response),
-      })),
-    ),
-  );
+  getOnePage('get-user-repos-page', 'GET /users/{username}/repos', {
+    ...args,
+    type: 'all',
+    per_page: 100,
+  });
 
 export type UserReposPageItems = EffectResultSuccess<typeof getUserReposPage>;
diff --git a/src/layer/github/implementation/primitives/get-issue.ts b/src/layer/github/implementation/primitives/get-issue.ts
index f9909cb..8529ab0 100644
--- a/src/layer/github/implementation/primitives/get-issue.ts
+++ b/src/layer/github/implementation/primitives/get-issue.ts
@@ -12,7 +12,7 @@ export interface GetIssueArgs {
 }
 
 export const getIssue = ({ owner, repo, number }: GetIssueArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-issue', {
     attributes: { owner, repo, number },
   })(
     pipe(
diff --git a/src/layer/github/implementation/primitives/get-pull-request.ts b/src/layer/github/implementation/primitives/get-pull-request.ts
index 3f00f6f..bb71a52 100644
--- a/src/layer/github/implementation/primitives/get-pull-request.ts
+++ b/src/layer/github/implementation/primitives/get-pull-request.ts
@@ -12,7 +12,7 @@ export interface GetPullRequestArgs {
 }
 
 export const getPullRequest = ({ owner, repo, number }: GetPullRequestArgs) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-pull-request', {
     attributes: { owner, repo, number },
   })(
     pipe(
diff --git a/src/layer/github/implementation/primitives/get-user-orgs.ts b/src/layer/github/implementation/primitives/get-user-orgs.ts
index 67d870b..24d5407 100644
--- a/src/layer/github/implementation/primitives/get-user-orgs.ts
+++ b/src/layer/github/implementation/primitives/get-user-orgs.ts
@@ -6,7 +6,7 @@ import { githubSourceAnalysisProvider } from '../../../providers/github-source-a
 import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
 
 export const getUserOrgs = (username: string) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-user-orgs', {
     attributes: { username },
   })(
     pipe(
diff --git a/src/layer/github/implementation/primitives/get-user-profile.ts b/src/layer/github/implementation/primitives/get-user-profile.ts
index 3e899f7..21c256e 100644
--- a/src/layer/github/implementation/primitives/get-user-profile.ts
+++ b/src/layer/github/implementation/primitives/get-user-profile.ts
@@ -6,7 +6,7 @@ import { githubSourceAnalysisProvider } from '../../../providers/github-source-a
 import { retryAfterSchedule } from '../../../schedules/retry-after.schedule';
 
 export const getUserProfile = (username: string) =>
-  Effect.withSpan(__filename, {
+  Effect.withSpan('get-user-profile', {
     attributes: { username },
   })(
     pipe(