From bd2bf2620bd9437954fea314fc5a852cbbefbb02 Mon Sep 17 00:00:00 2001
From: Erik Engervall <erik.engervall@gmail.com>
Date: Fri, 30 Apr 2021 14:10:05 +0200
Subject: [PATCH] Api refactor, return object for getComparison

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
---
 .../src/api/GitReleaseApiClient.ts                   | 12 ++++++++----
 .../hooks/useCreateReleaseCandidate.ts               |  2 +-
 .../src/test-helpers/test-helpers.ts                 |  6 ++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
index 0de2893fd9..0bdfaae61b 100644
--- a/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
+++ b/plugins/git-release-manager/src/api/GitReleaseApiClient.ts
@@ -282,8 +282,10 @@ export class GitReleaseApiClient implements GitReleaseApi {
     });
 
     return {
-      htmlUrl: compareCommitsResponse.data.html_url,
-      aheadBy: compareCommitsResponse.data.ahead_by,
+      comparison: {
+        htmlUrl: compareCommitsResponse.data.html_url,
+        aheadBy: compareCommitsResponse.data.ahead_by,
+      },
     };
   };
 
@@ -617,8 +619,10 @@ export interface GitReleaseApi {
       head: string;
     } & OwnerRepo,
   ) => Promise<{
-    htmlUrl: string;
-    aheadBy: number;
+    comparison: {
+      htmlUrl: string;
+      aheadBy: number;
+    };
   }>;
 
   createRelease: (
diff --git a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts
index 49acf13aa3..6e47b9a8b1 100644
--- a/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts
+++ b/plugins/git-release-manager/src/features/CreateReleaseCandidate/hooks/useCreateReleaseCandidate.ts
@@ -197,7 +197,7 @@ export function useCreateReleaseCandidate({
       ? latestRelease.targetCommitish
       : defaultBranch;
     const nextReleaseBranch = releaseCandidateGitInfo.rcBranch;
-    const comparison = await pluginApiClient
+    const { comparison } = await pluginApiClient
       .getComparison({
         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 b89e6a65d5..8969c7193f 100644
--- a/plugins/git-release-manager/src/test-helpers/test-helpers.ts
+++ b/plugins/git-release-manager/src/test-helpers/test-helpers.ts
@@ -244,8 +244,10 @@ export const mockApiClient: GitReleaseApi = {
   })),
 
   getComparison: jest.fn(async () => ({
-    htmlUrl: 'mock_compareCommits_html_url',
-    aheadBy: 1,
+    comparison: {
+      htmlUrl: 'mock_compareCommits_html_url',
+      aheadBy: 1,
+    },
   })),
 
   createTagObject: jest.fn(async () => ({