Fix incorrect Github REST API response types

src/app/core/models/github/github-issue.model.ts

@@ -1,6 +1,7 @@
 import { IssueState } from '../../../../../graphql/graphql-types';
 import { GithubComment } from './github-comment.model';
 import { GithubLabel } from './github-label.model';
+import { GithubRestIssue } from './github-rest-issue';
 
 export class GithubIssue {
   id: string; // Github's backend's id
@@ -25,6 +26,13 @@ export class GithubIssue {
   };
   comments: Array<GithubComment>;
 
+  static fromRestGithubIssue(restGithubIssue: GithubRestIssue): GithubIssue {
+    return new GithubIssue({
+      ...restGithubIssue,
+      state: restGithubIssue.state.toUpperCase()
+    });
+  }
+
   constructor(githubIssue: {}) {
     Object.assign(this, githubIssue);
     this.labels = [];

src/app/core/models/github/github-rest-issue.ts

@@ -0,0 +1,26 @@
+import { GithubComment } from './github-comment.model';
+import { GithubLabel } from './github-label.model';
+
+export type GithubRestIssue = {
+  id: string; // Github's backend's id
+  number: number; // Issue's display id
+  assignees: Array<{
+    id: number;
+    login: string;
+    url: string;
+  }>;
+  body: string;
+  created_at: string;
+  labels: Array<GithubLabel>;
+  state: 'open' | 'closed';
+  title: string;
+  updated_at: string;
+  url: string;
+  user: {
+    // Author of the issue
+    login: string;
+    avatar_url: string;
+    url: string;
+  };
+  comments: Array<GithubComment>;
+};

src/app/core/services/github.service.ts

@@ -32,6 +32,7 @@ import { GithubRelease } from '../models/github/github.release';
 import { SessionData } from '../models/session.model';
 import { ERRORCODE_NOT_FOUND, ErrorHandlingService } from './error-handling.service';
 import { LoggingService } from './logging.service';
+import { GithubRestIssue } from '../models/github/github-rest-issue';
 
 const { Octokit } = require('@octokit/rest');
 const CATCHER_ORG = 'CATcher-org';
@@ -362,25 +363,25 @@ export class GithubService {
 
   closeIssue(id: number): Observable<GithubIssue> {
     return from(octokit.issues.update({ owner: ORG_NAME, repo: REPO, issue_number: id, state: 'closed' })).pipe(
-      map((response: GithubResponse<GithubIssue>) => {
+      map((response: GithubResponse<GithubRestIssue>) => {
         this.issuesLastModifiedManager.set(id, response.headers['last-modified']);
-        return new GithubIssue(response.data);
+        return GithubIssue.fromRestGithubIssue(response.data);
       })
     );
   }
 
   reopenIssue(id: number): Observable<GithubIssue> {
     return from(octokit.issues.update({ owner: ORG_NAME, repo: REPO, issue_number: id, state: 'open' })).pipe(
-      map((response: GithubResponse<GithubIssue>) => {
+      map((response: GithubResponse<GithubRestIssue>) => {
         this.issuesLastModifiedManager.set(id, response.headers['last-modified']);
-        return new GithubIssue(response.data);
+        return GithubIssue.fromRestGithubIssue(response.data);
       })
     );
   }
 
   createIssue(title: string, description: string, labels: string[]): Observable<GithubIssue> {
     return from(octokit.issues.create({ owner: ORG_NAME, repo: REPO, title: title, body: description, labels: labels })).pipe(
-      map((response: GithubResponse<GithubIssue>) => new GithubIssue(response.data))
+      map((response: GithubResponse<GithubRestIssue>) => GithubIssue.fromRestGithubIssue(response.data))
     );
   }
 
@@ -402,9 +403,9 @@ export class GithubService {
         assignees: assignees
       })
     ).pipe(
-      map((response: GithubResponse<GithubIssue>) => {
+      map((response: GithubResponse<GithubRestIssue>) => {
         this.issuesLastModifiedManager.set(id, response.headers['last-modified']);
-        return new GithubIssue(response.data);
+        return GithubIssue.fromRestGithubIssue(response.data);
       }),
       catchError((err) => throwError(err))
     );