Query MRs by creation time (#38)

* add querying mrs by a time period

* fix: export TimePeriod from module, change import in test to type import

* fix: remove criminal filter from GitHub integration

Author: dejan-crocoder

packages/functions/extract/src/get-merge-requests.test.ts

@@ -9,7 +9,7 @@ import Database from "better-sqlite3";
 import { mergeRequests } from '@acme/extract-schema';
 import type { Context } from './config';
 import type { GetMergeRequestsSourceControl, GetMergeRequestsEntities } from './get-merge-requests';
-import type { SourceControl } from '@acme/source-control';
+import type { SourceControl, TimePeriod } from '@acme/source-control';
 
 let betterSqlite: ReturnType<typeof Database>;
 let db: ReturnType<typeof drizzle>;
@@ -24,7 +24,7 @@ beforeAll(() => {
 
   migrate(db, { migrationsFolder: "../../../migrations/extract" });
 
-  fetchMergeRequests = jest.fn((externalRepositoryId: number, namespaceName:string, repositoryName: string, repositoryId: number, page?: number, perPage?: number) => {
+  fetchMergeRequests = jest.fn((externalRepositoryId: number, namespaceName:string, repositoryName: string, repositoryId: number, creationPeriod?: TimePeriod, page?: number, perPage?: number) => {
 
     switch (externalRepositoryId) {
       case 1000:

packages/integrations/source-control/src/github/index.ts

@@ -3,7 +3,7 @@ import { Octokit } from '@octokit/rest';
 import parseLinkHeader from "parse-link-header";
 
 import type { NewRepository, NewNamespace, NewMergeRequest } from "@acme/extract-schema";
-import type { Pagination } from '../source-control';
+import type { Pagination, TimePeriod } from '../source-control';
 
 export class GitHubSourceControl implements SourceControl {
 
@@ -33,7 +33,8 @@ export class GitHubSourceControl implements SourceControl {
     }
   }
 
-  async fetchMergeRequests(externalRepositoryId: number, namespaceName: string, repositoryName: string, repositoryId: number, page?: number, perPage?: number): Promise<{ mergeRequests: NewMergeRequest[]; pagination: Pagination; }> {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  async fetchMergeRequests(externalRepositoryId: number, namespaceName: string, repositoryName: string, repositoryId: number, creationPeriod: TimePeriod = {}, page?: number, perPage?: number): Promise<{ mergeRequests: NewMergeRequest[]; pagination: Pagination; }> {
     page = page || 1;
     perPage = perPage || 30;
 
@@ -42,7 +43,8 @@ export class GitHubSourceControl implements SourceControl {
       repo: repositoryName,
       page: page,
       per_page: perPage,
-      state: "all"
+      state: "all",
+      sort: "created",
     });
 
     const linkHeader = parseLinkHeader(result.headers.link) || { next: { per_page: perPage } };
@@ -54,11 +56,12 @@ export class GitHubSourceControl implements SourceControl {
     } satisfies Pagination;
 
     return {
-      mergeRequests: result.data.map(mergeRequest => ({
-        externalId: mergeRequest.id,
-        mergeRequestId: mergeRequest.number,
-        repositoryId
-      })),
+      mergeRequests: result.data
+        .map(mergeRequest => ({
+          externalId: mergeRequest.id,
+          mergeRequestId: mergeRequest.number,
+          repositoryId
+        })),
       pagination
     }
   }

packages/integrations/source-control/src/gitlab/index.ts

@@ -1,4 +1,4 @@
-import type { SourceControl, Pagination } from "../source-control";
+import type { SourceControl, Pagination, TimePeriod } from "../source-control";
 import type { Gitlab as GitlabType } from '@gitbeaker/core';
 import type { NewRepository, NewNamespace, NewMergeRequest } from "@acme/extract-schema";
 import { Gitlab } from '@gitbeaker/rest';
@@ -31,13 +31,15 @@ export class GitlabSourceControl implements SourceControl {
   }
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars, @typescript-eslint/require-await
-  async fetchMergeRequests(externalRepositoryId: number, namespaceName = '', repositoryName = '', repositoryId: number, page?: number, perPage?: number): Promise<{ mergeRequests: NewMergeRequest[], pagination: Pagination }> {
+  async fetchMergeRequests(externalRepositoryId: number, namespaceName = '', repositoryName = '', repositoryId: number, creationPeriod: TimePeriod = {}, page?: number, perPage?: number): Promise<{ mergeRequests: NewMergeRequest[], pagination: Pagination }> {
     const { data, paginationInfo } = await this.api.MergeRequests.all({
       projectId: externalRepositoryId,
-      page, 
+      page,
       perPage,
       pagination: 'offset',
-      showExpanded: true
+      showExpanded: true,
+      createdAfter: creationPeriod.from?.toISOString(),
+      createdBefore: creationPeriod.to?.toISOString(),
     });
     return {
       mergeRequests: data.map((mr) => ({

packages/integrations/source-control/src/index.ts

@@ -1,3 +1,3 @@
-export type { Pagination, SourceControl } from './source-control';
+export type { Pagination, TimePeriod, SourceControl } from './source-control';
 export { GitlabSourceControl } from './gitlab';
 export { GitHubSourceControl } from './github';

packages/integrations/source-control/src/source-control.ts

@@ -6,7 +6,12 @@ export type Pagination = {
   totalPages: number;
 };
 
+export type TimePeriod = {
+  from?: Date;
+  to?: Date;
+}
+
 export interface SourceControl {
   fetchRepository(externalRepositoryId: number, namespaceName: string, repositoryName: string): Promise<{ repository: NewRepository, namespace?: NewNamespace }>;
-  fetchMergeRequests(externalRepositoryId: number, namespaceName: string, repositoryName: string, repositoryId: number, page?: number, perPage?: number): Promise<{ mergeRequests: NewMergeRequest[], pagination: Pagination }>;
+  fetchMergeRequests(externalRepositoryId: number, namespaceName: string, repositoryName: string, repositoryId: number, creationPeriod?: TimePeriod, page?: number, perPage?: number): Promise<{ mergeRequests: NewMergeRequest[], pagination: Pagination }>;
 }