fix: pr review

Author: waltergalvao

apps/api/src/app/gitProfile/services/git-profile.service.ts

@@ -1,8 +1,9 @@
-import { GitProfile, Prisma } from "@prisma/client";
+import { GitProfile } from "@prisma/client";
 import { getPrisma } from "../../../prisma";
+import { UpsertGitProfileInput } from "./git-profile.types";
 
 export const upsertGitProfile = async (
-  args: Prisma.GitProfileCreateInput
+  args: UpsertGitProfileInput
 ): Promise<GitProfile> => {
   const { gitProvider, gitUserId, handle, name, avatar, bio, location } = args;
 

apps/api/src/app/gitProfile/services/git-profile.types.ts

@@ -1,6 +1,6 @@
 import { GitProvider } from "@prisma/client";
 
-export interface UpsertGitProfileArgs {
+export interface UpsertGitProfileInput {
   gitProvider: GitProvider;
   gitUserId: string;
   handle: string;

apps/api/src/app/github/services/github-code-review.service.ts

@@ -128,15 +128,15 @@ const fetchPullRequestReviews = async (
   const gitProfiles = new Map<string, GitProfile>();
 
   const getGitProfileId = async (author: GitHubUser) => {
-    if (gitProfiles.has(author.id.toString())) {
-      return gitProfiles.get(author.id.toString())!.id;
+    if (gitProfiles.has(author.nodeId)) {
+      return gitProfiles.get(author.nodeId)!.id;
     }
 
     const gitProfile = await upsertGitProfile(
       gitHubUserToGitProfileData(author)
     );
 
-    gitProfiles.set(author.id.toString(), gitProfile);
+    gitProfiles.set(author.nodeId, gitProfile);
 
     return gitProfile.id;
   };
@@ -341,7 +341,7 @@ const getReviewRequests = (nodes: any[]): ReviewRequestData[] => {
         createdAt: new Date(node.createdAt),
         deletedAt: null,
         author: {
-          id: reviewerId,
+          nodeId: reviewerId,
           login: node.requestedReviewer.login,
           name: node.requestedReviewer.name,
           avatarUrl: node.requestedReviewer.avatarUrl,
@@ -363,7 +363,7 @@ const getReviewRequests = (nodes: any[]): ReviewRequestData[] => {
         if (reviewRequest) {
           reviewRequest.deletedAt = new Date(node.createdAt);
           reviewRequest.author = {
-            id: reviewerId,
+            nodeId: reviewerId,
             login: node.requestedReviewer.login,
             name: node.requestedReviewer.name,
             avatarUrl: node.requestedReviewer.avatarUrl,

apps/api/src/app/github/services/github-installation.service.ts

@@ -29,7 +29,11 @@ export const syncGitHubInstallation = async (
   });
 
   const gitProfile = await upsertGitProfile(
-    gitHubUserToGitProfileData({ avatarUrl: gitUser.avatar_url, ...gitUser })
+    gitHubUserToGitProfileData({
+      nodeId: gitUser.node_id,
+      avatarUrl: gitUser.avatar_url,
+      ...gitUser,
+    })
   );
   const workspace = await upsertWorkspace(gitInstallation, gitProfile);
   const installation = await upsertInstallation(gitInstallation, workspace.id);

apps/api/src/app/github/services/github-member.service.ts

@@ -13,7 +13,7 @@ import { gitHubUserToGitProfileData } from "./github-user.service";
 import { GitHubUser } from "./github-user.types";
 
 type GitOrganizationMember = {
-  id: number;
+  id: string;
   login: string;
   role: string;
   name?: string;
@@ -43,8 +43,8 @@ export const syncOrganizationMembers = async (
   );
 
   const membersData: MemberData[] = gitHubMembers.map((member) => ({
+    nodeId: member.id,
     ...member,
-    role: member.role,
   }));
 
   const workspaceGitProfiles = await upsertGitProfiles(
@@ -77,8 +77,7 @@ const fetchGitHubOrganizationMembers = async (
   gitInstallationId: number,
   organizationName: string
 ): Promise<GitOrganizationMember[]> => {
-  const fireGraphQLRequest =
-    await getInstallationGraphQLOctoKit(gitInstallationId);
+  const fireGraphQLRequest = getInstallationGraphQLOctoKit(gitInstallationId);
 
   const members: any[] = [];
   let hasNextPage = true;

apps/api/src/app/github/services/github-pull-request.service.ts

@@ -78,7 +78,10 @@ export const syncPullRequest = async ({
   }
 
   const gitProfile = await upsertGitProfile(
-    gitHubUserToGitProfileData(gitPrData.author)
+    gitHubUserToGitProfileData({
+      nodeId: gitPrData.author.id,
+      ...gitPrData.author,
+    })
   );
   const repository = await upsertRepository(workspace.id, gitPrData.repository);
   const pullRequest = await upsertPullRequest(

apps/api/src/app/github/services/github-repository-pull-requests.service.ts

@@ -81,8 +81,7 @@ const fetchGitHubPullRequests = async (
   gitInstallationId: number,
   sinceDaysAgo: number | null
 ) => {
-  const fireGraphQLRequest =
-    await getInstallationGraphQLOctoKit(gitInstallationId);
+  const fireGraphQLRequest = getInstallationGraphQLOctoKit(gitInstallationId);
 
   const pullRequests: any[] = [];
   let hasNextPage = true;

apps/api/src/app/github/services/github-repository.service.ts

@@ -55,8 +55,7 @@ export const syncGitHubRepositories = async (
 const fetchGitHubRepositories = async (
   gitInstallationId: number
 ): Promise<RepositoryData[]> => {
-  const fireGraphQLRequest =
-    await getInstallationGraphQLOctoKit(gitInstallationId);
+  const fireGraphQLRequest = getInstallationGraphQLOctoKit(gitInstallationId);
 
   const repositories: any[] = [];
   let hasNextPage = true;

apps/api/src/app/github/services/github-team.service.ts

@@ -109,8 +109,7 @@ const fetchGitHubOrganizationTeams = async (
   gitInstallationId: number,
   organizationName: string
 ): Promise<GitOrganizationTeam[]> => {
-  const fireGraphQLRequest =
-    await getInstallationGraphQLOctoKit(gitInstallationId);
+  const fireGraphQLRequest = getInstallationGraphQLOctoKit(gitInstallationId);
 
   const teams: any[] = [];
   let hasNextPage = true;
@@ -193,8 +192,7 @@ const fetchGitHubTeamMembers = async (
   teamSlug: string,
   startCursor: string | null
 ): Promise<GitTeamMember[]> => {
-  const fireGraphQLRequest =
-    await getInstallationGraphQLOctoKit(gitInstallationId);
+  const fireGraphQLRequest = getInstallationGraphQLOctoKit(gitInstallationId);
 
   const members: any[] = [];
   let hasNextPage = true;

apps/api/src/app/github/services/github-user.service.ts

@@ -6,7 +6,7 @@ export const gitHubUserToGitProfileData = (
 ): Omit<GitProfile, "id" | "createdAt" | "updatedAt" | "userId"> => {
   return {
     gitProvider: GitProvider.GITHUB,
-    gitUserId: gitHubUser.id.toString(),
+    gitUserId: gitHubUser.nodeId,
     handle: gitHubUser.login,
     name: gitHubUser.name || gitHubUser.login,
     avatar: gitHubUser.avatarUrl || null,