From 992a3a20243cecc6db25f8ca08b925922c349868 Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Fri, 30 Apr 2021 13:21:41 +0200
Subject: [PATCH] Api refactor, return object for getRepository

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/api/GitReleaseApiClient.ts            | 16 ++++++++-----
 .../src/hooks/useGetGitBatchInfo.ts           |  2 +-
 .../src/test-helpers/test-helpers.ts          | 24 +++++++++++--------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
index 5f27b2874f..4a3db3c5ce 100644
--- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
@@ -195,9 +195,11 @@ export class GitReleaseApiClient implements GitReleaseApi {
     });
 
     return {
-      pushPermissions: repository.permissions?.push,
-      defaultBranch: repository.default_branch,
-      name: repository.name,
+      repository: {
+        pushPermissions: repository.permissions?.push,
+        defaultBranch: repository.default_branch,
+        name: repository.name,
+      },
     };
   };
 
@@ -552,9 +554,11 @@ export interface GitReleaseApi {
   getRepository: (
     args: OwnerRepo,
   ) => Promise<{
-    pushPermissions: boolean | undefined;
-    defaultBranch: string;
-    name: string;
+    repository: {
+      pushPermissions: boolean | undefined;
+      defaultBranch: string;
+      name: string;
+    };
   }>;
 
   getCommit: (
diff --git a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts
index 9f94cbb4f0..78a8d4984b 100644
--- a/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts
+++ b/plugins/git-release-manager/src/hooks/useGetGitBatchInfo.ts
@@ -31,7 +31,7 @@ export const useGetGitBatchInfo = ({
   refetchTrigger,
 }: GetGitBatchInfo) => {
   const gitBatchInfo = useAsync(async () => {
-    const [repository, { latestRelease }] = await Promise.all([
+    const [{ repository }, { latestRelease }] = await Promise.all([
       pluginApiClient.getRepository({
         owner: project.owner,
         repo: project.repo,
diff --git a/plugins/git-release-manager/src/test-helpers/test-helpers.ts b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
index 8edc35d397..30072bd431 100644
--- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts
+++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
@@ -97,14 +97,16 @@ const createMockRelease = ({
   prerelease = false,
   ...rest
 }: Partial<
-  NonNullable<GetLatestReleaseResult>
+  NonNullable<GetLatestReleaseResult['latestRelease']>
 > = {}): NonNullable<GetLatestReleaseResult> => ({
-  id: 1,
-  htmlUrl: 'mock_release_html_url',
-  prerelease,
-  tagName: MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
-  targetCommitish: MOCK_RELEASE_BRANCH_NAME_CALVER,
-  ...rest,
+  latestRelease: {
+    id,
+    htmlUrl: 'mock_release_html_url',
+    prerelease,
+    tagName: MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
+    targetCommitish: MOCK_RELEASE_BRANCH_NAME_CALVER,
+    ...rest,
+  },
 });
 
 export const mockReleaseCandidateCalver = createMockRelease({
@@ -208,9 +210,11 @@ export const mockApiClient: GitReleaseApi = {
   getLatestRelease: jest.fn(async () => createMockRelease()),
 
   getRepository: jest.fn(async () => ({
-    pushPermissions: true,
-    defaultBranch: mockDefaultBranch,
-    name: mockRepo,
+    repository: {
+      pushPermissions: true,
+      defaultBranch: mockDefaultBranch,
+      name: mockRepo,
+    },
   })),
 
   getCommit: jest.fn(async () => ({