Merge pull request #17 from cabinetoffice/feature/NTRNL-288-fix-mappi…

…ng-error-and-remove-unused-fields

Feature/ntrnl 288 fix mapping error and remove unused fields

src/api-sdk/github/github.ts

@@ -38,6 +38,8 @@ export class Github {
 
         if (response.error) {
             resource.errors = [response.error];
+        } else if (response.status >= 400) {
+            resource.errors = [response.body];
         } else {
             resource.resource = mappingFunction(response.body);
         }

src/api-sdk/github/mapping.ts

@@ -17,8 +17,7 @@ export const membersMapping = (body: any[]): GitHubMembers[] => {
     return body.map((obj) => ({
         login: obj.login,
         url: obj.url,
-        html_url: obj.html_url,
-        repos_url: obj.repos_url
+        html_url: obj.html_url
     }));
 };
 
@@ -27,9 +26,7 @@ export const teamsMapping = (body: any[]): GitHubTeams[] => {
         name: obj.name,
         description: obj.description,
         url: obj.url,
-        html_url: obj.html_url,
-        repositories_url: obj.repositories_url,
-        members_url: obj.members_url
+        html_url: obj.html_url
     }));
 };
 

src/api-sdk/github/type.ts

@@ -14,15 +14,12 @@ export interface GitHubTeams {
     description: string;
     url: string;
     html_url: string;
-    repositories_url: string;
-    members_url: string;
 }
 
 export interface GitHubMembers {
     login: string;
     url: string;
     html_url: string;
-    repos_url: string;
 }
 
 export interface GitHubMembersPerTeam {

test/mock/data.mock.ts

@@ -76,7 +76,7 @@ export const MOCK_MEMBERS = [
 
 export const MOCK_MEMBER_FETCH_RESPONSE = {
     httpStatusCode: 200,
-    resource: MOCK_MEMBERS
+    resource: MOCK_MEMBERS.map(({ repos_url, ...rest }) => rest)
 };
 
 export const MOCK_TEAMS = [
@@ -100,7 +100,7 @@ export const MOCK_TEAMS = [
 
 export const MOCK_TEAM_FETCH_RESPONSE = {
     httpStatusCode: 200,
-    resource: MOCK_TEAMS
+    resource: MOCK_TEAMS.map(({ members_url, repositories_url, ...rest }) => rest)
 };
 
 export const MOCK_MEMBERS_PER_TEAM = [
@@ -139,3 +139,10 @@ export const MOCK_ERROR_RESPONSE = {
     httpStatusCode: 500,
     errors: [MOCK_ERROR]
 };
+
+export const MOCK_403_ERROR_MSG = { "message": "Must have admin rights to Repository." };
+
+export const MOCK_403_ERROR_RESPONSE = {
+    httpStatusCode: 403,
+    errors: [MOCK_403_ERROR_MSG]
+};

test/unit/api-sdk/github/github.spec.ts

@@ -15,7 +15,9 @@ import {
     MOCK_MEMBERS_PER_TEAM,
     MOCK_MEMBERS_PER_TEAM_RESPONSE,
     MOCK_REPOS_PER_TEAM,
-    MOCK_REPOS_PER_TEAM_RESPONSE
+    MOCK_REPOS_PER_TEAM_RESPONSE,
+    MOCK_403_ERROR_MSG,
+    MOCK_403_ERROR_RESPONSE
 } from '../../../mock/data.mock';
 import { HttpResponse } from '../../../../src/http-request/type';
 
@@ -90,7 +92,7 @@ describe('Github sdk module test suites', () => {
     test('Should return an object with an error property', async () => {
         httpRequestMock.httpGet.mockResolvedValue(createMockHttpResponse(MOCK_TEAMS, 500, MOCK_ERROR));
 
-        const url = 'https://api.github.com/users/test/repos';
+        const url = 'https://api.github.com/users/test/teams';
         const result = await github.getTeams(url);
         expect(result).toEqual(MOCK_ERROR_RESPONSE);
     });
@@ -103,4 +105,12 @@ describe('Github sdk module test suites', () => {
 
         expect(result).toEqual(MOCK_REPO_FETCH_RESPONSE);
     });
+
+    test('Should return an object with an error property when status code is 403 with no error response', async () => {
+        httpRequestMock.httpGet.mockResolvedValue(createMockHttpResponse(MOCK_403_ERROR_MSG, 403));
+
+        const url = 'https://api.github.com/users/test/repos';
+        const result = await github.getRepos(url);
+        expect(result).toEqual(MOCK_403_ERROR_RESPONSE);
+    });
 });