From 94d8aa04f519e0c9c4a66901a2dd59cf832733bc Mon Sep 17 00:00:00 2001
From: Lee Chun Wei <47494777+chunweii@users.noreply.github.com>
Date: Tue, 8 Mar 2022 14:38:51 +0800
Subject: [PATCH 01/13] Create issue templates (#899)

As an Open Source Project, it becomes painful to see developers writing
bug reports which do not clarify what the bug is about. (Which was one
of the purposes of CATcher as well)

Let's come up with a few issue templates for Bug Reports / Feature
Requests such that issue reporters are guided to give good features /
clarify their issues before submitting.
---
 .github/ISSUE_TEMPLATE/bug_report.md      | 32 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/custom.md          | 10 +++++++
 .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md
 create mode 100644 .github/ISSUE_TEMPLATE/custom.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..95837e66d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,32 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: category.Bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. Windows 11]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
new file mode 100644
index 000000000..48d5f81fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -0,0 +1,10 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..d6ea6c8b4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: 'category.Feature'
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

From 8f3d8ba0b905e80fb67b91fcad2097fe5f5cc1f4 Mon Sep 17 00:00:00 2001
From: "Lee Xiong Jie, Isaac" <68138671+luminousleek@users.noreply.github.com>
Date: Thu, 10 Mar 2022 15:45:38 +0800
Subject: [PATCH 02/13] Abstract code to find comments that match a template to
 the Template class (#904)

Abstract code to find comments that match a template to superclass

There is some duplicated code across 4 templates that deal with finding
a comment that conforms to the comment template.

Let's abstract this code into the Template superclass and create a new
parseFailure attribute inside Template. Let's also use this opportunity
to standardise the variable names across the templates. Lastly, let's
use parseFailure in Issue.
---
 src/app/core/models/issue.model.ts             |  4 ++--
 .../templates/team-accepted-template.model.ts  |  6 +++---
 .../templates/team-response-template.model.ts  | 18 +++++++++---------
 .../core/models/templates/template.model.ts    | 13 +++++++++++++
 .../tester-response-template.model.ts          |  9 ++++-----
 .../tutor-moderation-todo-template.model.ts    | 17 ++++++++++-------
 6 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/app/core/models/issue.model.ts b/src/app/core/models/issue.model.ts
index e906b888e..6811373dd 100644
--- a/src/app/core/models/issue.model.ts
+++ b/src/app/core/models/issue.model.ts
@@ -135,7 +135,7 @@ export class Issue {
     issue.teamAssigned = teamData;
     issue.assignees = githubIssue.assignees.map((assignee) => assignee.login);
 
-    issue.teamResponseError = template.parseError;
+    issue.teamResponseError = template.parseFailure;
     issue.issueComment = template.comment;
     issue.teamResponse = template.teamResponse && Issue.updateTeamResponse(template.teamResponse.content);
     issue.duplicateOf = template.duplicateOf && template.duplicateOf.issueNumber;
@@ -150,7 +150,7 @@ export class Issue {
     const teamAcceptedTemplate = new TeamAcceptedTemplate(githubIssue.comments);
 
     issue.githubComments = githubIssue.comments;
-    issue.testerResponseError = testerResponseTemplate.parseError && !teamAcceptedTemplate.teamAccepted;
+    issue.testerResponseError = testerResponseTemplate.parseFailure && teamAcceptedTemplate.parseFailure;
     issue.teamAccepted = teamAcceptedTemplate.teamAccepted;
     issue.issueComment = testerResponseTemplate.comment;
     issue.teamResponse = testerResponseTemplate.teamResponse && Issue.updateTeamResponse(testerResponseTemplate.teamResponse.content);
diff --git a/src/app/core/models/templates/team-accepted-template.model.ts b/src/app/core/models/templates/team-accepted-template.model.ts
index 75d7b9bda..7f9a35e53 100644
--- a/src/app/core/models/templates/team-accepted-template.model.ts
+++ b/src/app/core/models/templates/team-accepted-template.model.ts
@@ -7,12 +7,12 @@ export const TeamAcceptedHeader = { teamAccepted: new Header(TeamAcceptedMessage
 export class TeamAcceptedTemplate extends Template {
   teamAccepted?: boolean;
 
-  constructor(githubIssueComments: GithubComment[]) {
+  constructor(githubComments: GithubComment[]) {
     super(Object.values(TeamAcceptedHeader));
 
-    const teamAcceptedComment = githubIssueComments.find((comment) => this.test(comment.body));
+    this.findConformingComment(githubComments);
 
-    if (teamAcceptedComment === undefined) {
+    if (this.parseFailure) {
       return;
     }
 
diff --git a/src/app/core/models/templates/team-response-template.model.ts b/src/app/core/models/templates/team-response-template.model.ts
index 30aaaaacc..0da036aca 100644
--- a/src/app/core/models/templates/team-response-template.model.ts
+++ b/src/app/core/models/templates/team-response-template.model.ts
@@ -13,23 +13,23 @@ export class TeamResponseTemplate extends Template {
   teamResponse: Section;
   duplicateOf: DuplicateOfSection;
   comment: IssueComment;
-  parseError: boolean;
 
   constructor(githubComments: GithubComment[]) {
     super(Object.values(TeamResponseHeaders));
 
-    const comment = githubComments.find((githubComment: GithubComment) => this.test(githubComment.body));
-    if (comment === undefined) {
-      this.parseError = true;
+    const templateConformingComment = this.findConformingComment(githubComments);
+
+    if (this.parseFailure) {
       return;
     }
+
     this.comment = <IssueComment>{
-      ...comment,
-      description: comment.body,
-      createdAt: comment.created_at,
-      updatedAt: comment.updated_at
+      ...templateConformingComment,
+      description: templateConformingComment.body,
+      createdAt: templateConformingComment.created_at,
+      updatedAt: templateConformingComment.updated_at
     };
-    const commentsContent: string = comment.body;
+    const commentsContent: string = templateConformingComment.body;
     this.teamResponse = this.parseTeamResponse(commentsContent);
     this.duplicateOf = this.parseDuplicateOf(commentsContent);
   }
diff --git a/src/app/core/models/templates/template.model.ts b/src/app/core/models/templates/template.model.ts
index 9da79a0fc..a460e4ce5 100644
--- a/src/app/core/models/templates/template.model.ts
+++ b/src/app/core/models/templates/template.model.ts
@@ -1,8 +1,10 @@
+import { GithubComment } from '../github/github-comment.model';
 import { SectionalDependency } from './sections/section.model';
 
 export abstract class Template {
   headers: Header[];
   regex: RegExp;
+  parseFailure: boolean;
 
   protected constructor(headers: Header[]) {
     this.headers = headers;
@@ -30,6 +32,17 @@ export abstract class Template {
     this.regex.lastIndex = 0;
     return numOfMatch >= this.headers.length;
   }
+
+  /**
+   * Finds a comment that conforms to the template
+   */
+  findConformingComment(githubComments: GithubComment[]): GithubComment {
+    const templateConformingComment = githubComments.find((githubComment) => this.test(githubComment.body));
+    if (templateConformingComment === undefined) {
+      this.parseFailure = true;
+    }
+    return templateConformingComment;
+  }
 }
 
 export class Header {
diff --git a/src/app/core/models/templates/tester-response-template.model.ts b/src/app/core/models/templates/tester-response-template.model.ts
index 7b50326d8..6d2b37cde 100644
--- a/src/app/core/models/templates/tester-response-template.model.ts
+++ b/src/app/core/models/templates/tester-response-template.model.ts
@@ -16,14 +16,13 @@ export class TesterResponseTemplate extends Template {
   comment: IssueComment;
   teamChosenSeverity?: string;
   teamChosenType?: string;
-  parseError: boolean;
 
-  constructor(githubIssueComments: GithubComment[]) {
+  constructor(githubComments: GithubComment[]) {
     super(Object.values(TesterResponseHeaders));
 
-    const templateConformingComment = githubIssueComments.find((comment) => this.test(comment.body));
-    if (templateConformingComment === undefined) {
-      this.parseError = true;
+    const templateConformingComment = this.findConformingComment(githubComments);
+
+    if (this.parseFailure) {
       return;
     }
 
diff --git a/src/app/core/models/templates/tutor-moderation-todo-template.model.ts b/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
index 97ffc03d7..e3b0b5d21 100644
--- a/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
+++ b/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
@@ -14,14 +14,17 @@ export class TutorModerationTodoTemplate extends Template {
   constructor(githubComments: GithubComment[]) {
     super(Object.values(tutorModerationTodoHeaders));
 
-    const templateConformingComment = githubComments.find((comment) => this.test(comment.body));
-    if (templateConformingComment) {
-      this.comment = <IssueComment>{
-        ...templateConformingComment,
-        description: templateConformingComment.body
-      };
-      this.moderation = this.parseModeration(this.comment.description);
+    const templateConformingComment = this.findConformingComment(githubComments);
+
+    if (this.parseFailure) {
+      return;
     }
+
+    this.comment = <IssueComment>{
+      ...templateConformingComment,
+      description: templateConformingComment.body
+    };
+    this.moderation = this.parseModeration(this.comment.description);
   }
 
   parseModeration(toParse: string): ModerationSection {

From 9f259d6e514f9b05550d900e58a7a87342123c71 Mon Sep 17 00:00:00 2001
From: "Lee Xiong Jie, Isaac" <68138671+luminousleek@users.noreply.github.com>
Date: Wed, 16 Mar 2022 12:35:23 +0800
Subject: [PATCH 03/13] Add unit tests for Team Accepted Template (#895)

Previously this template did not have unit tests.

Let's add some tests to test the parsing logic for
TeamAcceptedTemplate.
---
 .../team-accepted-template.model.spec.ts      | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/model/templates/team-accepted-template.model.spec.ts

diff --git a/tests/model/templates/team-accepted-template.model.spec.ts b/tests/model/templates/team-accepted-template.model.spec.ts
new file mode 100644
index 000000000..d87f08aad
--- /dev/null
+++ b/tests/model/templates/team-accepted-template.model.spec.ts
@@ -0,0 +1,33 @@
+import { GithubComment } from '../../../src/app/core/models/github/github-comment.model';
+import { TeamAcceptedMessage, TeamAcceptedTemplate } from '../../../src/app/core/models/templates/team-accepted-template.model';
+
+import { TEAM_RESPONSE_MULTIPLE_DISAGREEMENT } from '../../constants/githubcomment.constants';
+
+const EMPTY_BODY_GITHUB_COMMENT = {
+  body: ''
+} as GithubComment;
+
+const ACCEPTED_MESSAGE_GITHUB_COMMENT = {
+  body: TeamAcceptedMessage
+} as GithubComment;
+
+const hasAcceptedComment = [EMPTY_BODY_GITHUB_COMMENT, ACCEPTED_MESSAGE_GITHUB_COMMENT];
+const noAcceptedComment = [EMPTY_BODY_GITHUB_COMMENT, TEAM_RESPONSE_MULTIPLE_DISAGREEMENT];
+
+describe('TeamAcceptedTemplate class', () => {
+  it('parses team accepted message correctly', () => {
+    const template = new TeamAcceptedTemplate([ACCEPTED_MESSAGE_GITHUB_COMMENT]);
+
+    expect(template.teamAccepted).toBe(true);
+  });
+  it('finds team accepted comment correctly', () => {
+    const template = new TeamAcceptedTemplate(hasAcceptedComment);
+
+    expect(template.teamAccepted).toBe(true);
+  });
+  it('does not find team accepted comment', () => {
+    const template = new TeamAcceptedTemplate(noAcceptedComment);
+
+    expect(template.teamAccepted).not.toBe(true);
+  });
+});

From 205e779ac0f08b4689759b33594387664b911d5a Mon Sep 17 00:00:00 2001
From: Lee Chun Wei <47494777+chunweii@users.noreply.github.com>
Date: Tue, 22 Mar 2022 21:59:44 +0800
Subject: [PATCH 04/13] Improve Duplicate Issue Search in Team Response Phase
 (#894)

Choosing an issue as the parent of a duplicate issue can be
challenging. Users can receive close to a hundred issues in
the Team Response Phase so they would need to scroll
through everything to find the correct issue.

Let's add a search bar in the selection dropdown menu for
users to search for the parent issue by name or ID. Also, let's
include the ID of the parent duplicate issue for issues that
has already been duplicated, to ease the finding of the parent
issue.
---
 package.json                                  |  1 +
 .../duplicateOf/duplicate-of.component.html   | 10 ++++-
 .../duplicateOf/duplicate-of.component.ts     | 41 +++++++++++++++---
 .../shared/issue/issue-components.module.ts   |  3 +-
 .../new-team-response.component.html          | 13 +++++-
 .../new-team-response.component.ts            | 42 ++++++++++++++++---
 .../new-team-response.module.ts               | 11 ++++-
 7 files changed, 106 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 45a5c3d46..26dcf8981 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "karma-spec-reporter": "0.0.32",
     "moment": "^2.24.0",
     "ngx-markdown": "^8.2.1",
+    "ngx-mat-select-search": "^1.8.0",
     "node-fetch": "^2.6.0",
     "rxjs": "6.5.3",
     "tslib": "^1.9.0",
diff --git a/src/app/shared/issue/duplicateOf/duplicate-of.component.html b/src/app/shared/issue/duplicateOf/duplicate-of.component.html
index 5b6a65f5a..c2484e143 100644
--- a/src/app/shared/issue/duplicateOf/duplicate-of.component.html
+++ b/src/app/shared/issue/duplicateOf/duplicate-of.component.html
@@ -19,18 +19,26 @@
 
   <mat-select
     [style.display]="isEditing ? 'block' : 'none'"
+    style="width: 100%"
     class="no-arrow"
     placeholder="-"
     [value]="issue.duplicateOf"
     (selectionChange)="updateDuplicateStatus($event)"
     (openedChange)="handleSelectionOpenChange($event)"
   >
+    <mat-option>
+      <ngx-mat-select-search
+        placeholderLabel="Search issues"
+        noEntriesFoundLabel="No issues found"
+        [formControl]="searchFilterCtrl"
+      ></ngx-mat-select-search>
+    </mat-option>
     <mat-select-trigger></mat-select-trigger>
     <mat-option
       [matTooltip]="issue.title"
       [matTooltipDisabled]="!isTooltipNecessary(issue)"
       [matTooltipPosition]="'left'"
-      *ngFor="let issue of duplicatedIssueList | async"
+      *ngFor="let issue of filteredDuplicateIssueList | async"
       [disabled]="dupIssueOptionIsDisabled(issue)"
       [value]="issue.id"
     >
diff --git a/src/app/shared/issue/duplicateOf/duplicate-of.component.ts b/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
index df0fb12d8..0fdda92ee 100644
--- a/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
+++ b/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
@@ -1,12 +1,15 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
+import { FormControl } from '@angular/forms';
 import { MatCheckbox, MatSelect, MatSelectChange } from '@angular/material';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable, ReplaySubject, Subject } from 'rxjs';
+import { first, map, takeUntil } from 'rxjs/operators';
 import { Issue, SEVERITY_ORDER } from '../../../core/models/issue.model';
 import { ErrorHandlingService } from '../../../core/services/error-handling.service';
 import { IssueService } from '../../../core/services/issue.service';
 import { PermissionService } from '../../../core/services/permission.service';
 import { PhaseService } from '../../../core/services/phase.service';
+import { TABLE_COLUMNS } from '../../issue-tables/issue-tables-columns';
+import { applySearchFilter } from '../../issue-tables/search-filter';
 
 @Component({
   selector: 'app-duplicate-of-component',
@@ -14,9 +17,11 @@ import { PhaseService } from '../../../core/services/phase.service';
   styleUrls: ['./duplicate-of.component.css'],
   encapsulation: ViewEncapsulation.None
 })
-export class DuplicateOfComponent implements OnInit {
+export class DuplicateOfComponent implements OnInit, OnDestroy {
   isEditing = false;
   duplicatedIssueList: Observable<Issue[]>;
+  searchFilterCtrl: FormControl = new FormControl();
+  filteredDuplicateIssueList: ReplaySubject<Issue[]> = new ReplaySubject<Issue[]>(1);
 
   @Input() issue: Issue;
 
@@ -25,6 +30,9 @@ export class DuplicateOfComponent implements OnInit {
   @ViewChild(MatSelect, { static: true }) duplicateOfSelection: MatSelect;
   @ViewChild(MatCheckbox, { static: true }) duplicatedCheckbox: MatCheckbox;
 
+  // A subject that will emit a signal when this component is being destroyed
+  private _onDestroy = new Subject<void>();
+
   // Max chars visible for a duplicate entry in duplicates dropdown list.
   readonly MAX_TITLE_LENGTH_FOR_DUPLICATE_ISSUE = 17;
   // Max chars visible for a non-duplicate entry in duplicates dropdown list.
@@ -52,8 +60,22 @@ export class DuplicateOfComponent implements OnInit {
     return issue.title.length > maxTitleLength;
   }
 
+  ngOnDestroy(): void {
+    this._onDestroy.next(); // Emits the destroy signal
+    this._onDestroy.complete();
+  }
+
   ngOnInit() {
     this.duplicatedIssueList = this.getDupIssueList();
+    // Populate the filtered list with all the issues first
+    this.duplicatedIssueList.pipe(first()).subscribe((issues) => this.filteredDuplicateIssueList.next(issues));
+    this.searchFilterCtrl.valueChanges.pipe(takeUntil(this._onDestroy)).subscribe((_) => this.filterIssues());
+  }
+
+  private filterIssues(): void {
+    this.changeFilter(this.duplicatedIssueList, this.searchFilterCtrl.value).subscribe((issues) =>
+      this.filteredDuplicateIssueList.next(issues)
+    );
   }
 
   updateDuplicateStatus(event: MatSelectChange) {
@@ -74,7 +96,7 @@ export class DuplicateOfComponent implements OnInit {
       if (SEVERITY_ORDER[this.issue.severity] > SEVERITY_ORDER[issue.severity]) {
         reason.push('Issue of lower priority');
       } else if (issue.duplicated || !!issue.duplicateOf) {
-        reason.push('A duplicated issue');
+        reason.push('Duplicate of #' + issue.duplicateOf);
       }
     }
     return reason.join(', ');
@@ -118,6 +140,15 @@ export class DuplicateOfComponent implements OnInit {
     return clone;
   }
 
+  private changeFilter(issuesObservable: Observable<Issue[]>, searchInputString): Observable<Issue[]> {
+    return issuesObservable.pipe(
+      first(),
+      map((issues) => {
+        return applySearchFilter(searchInputString, [TABLE_COLUMNS.ID, TABLE_COLUMNS.TITLE], this.issueService, issues);
+      })
+    );
+  }
+
   private getDupIssueList(): Observable<Issue[]> {
     return this.issueService.issues$.pipe(
       map((issues) => {
diff --git a/src/app/shared/issue/issue-components.module.ts b/src/app/shared/issue/issue-components.module.ts
index 3c11fba21..9227f2cad 100644
--- a/src/app/shared/issue/issue-components.module.ts
+++ b/src/app/shared/issue/issue-components.module.ts
@@ -1,6 +1,7 @@
 import { NgModule } from '@angular/core';
 import { MatProgressBarModule } from '@angular/material';
 import { MarkdownModule } from 'ngx-markdown';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
 import { CommentEditorModule } from '../comment-editor/comment-editor.module';
 import { SharedModule } from '../shared.module';
 import { AssigneeComponent } from './assignee/assignee.component';
@@ -13,7 +14,7 @@ import { TitleComponent } from './title/title.component';
 import { UnsureCheckboxComponent } from './unsure-checkbox/unsure-checkbox.component';
 
 @NgModule({
-  imports: [SharedModule, CommentEditorModule, MatProgressBarModule, MarkdownModule.forChild()],
+  imports: [SharedModule, CommentEditorModule, MatProgressBarModule, NgxMatSelectSearchModule, MarkdownModule.forChild()],
   declarations: [
     TitleComponent,
     DescriptionComponent,
diff --git a/src/app/shared/view-issue/new-team-response/new-team-response.component.html b/src/app/shared/view-issue/new-team-response/new-team-response.component.html
index 3fbfb905d..82bee3bfb 100644
--- a/src/app/shared/view-issue/new-team-response/new-team-response.component.html
+++ b/src/app/shared/view-issue/new-team-response/new-team-response.component.html
@@ -17,7 +17,18 @@
 
           <mat-form-field [style.visibility]="!duplicated.value ? 'hidden' : 'visible'" style="display: inline-block; width: 50%">
             <mat-select formControlName="duplicateOf" placeholder="Duplicate of">
-              <mat-option *ngFor="let issue of duplicatedIssueList | async" [disabled]="dupIssueOptionIsDisabled(issue)" [value]="issue.id">
+              <mat-option>
+                <ngx-mat-select-search
+                  placeholderLabel="Search issues"
+                  noEntriesFoundLabel="No issues found"
+                  [formControl]="searchFilterCtrl"
+                ></ngx-mat-select-search>
+              </mat-option>
+              <mat-option
+                *ngFor="let issue of filteredDuplicateIssueList | async"
+                [disabled]="dupIssueOptionIsDisabled(issue)"
+                [value]="issue.id"
+              >
                 <span class="mat-body-strong"> #{{ issue.id }}: </span> <span class="mat-body">{{ issue.title }}</span>
                 <span *ngIf="dupIssueOptionIsDisabled(issue)" class="mat-caption" style="color: #f44336">
                   ({{ getDisabledDupOptionErrorText(issue) }})
diff --git a/src/app/shared/view-issue/new-team-response/new-team-response.component.ts b/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
index b821ad1d1..be6325d34 100644
--- a/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
+++ b/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
@@ -1,9 +1,9 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormBuilder, FormGroup, NgForm, Validators } from '@angular/forms';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import { FormBuilder, FormControl, FormGroup, NgForm, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material';
 import { MatCheckboxChange } from '@angular/material/checkbox';
-import { Observable, throwError } from 'rxjs';
-import { finalize, flatMap, map } from 'rxjs/operators';
+import { Observable, ReplaySubject, Subject, throwError } from 'rxjs';
+import { finalize, first, flatMap, map, takeUntil } from 'rxjs/operators';
 import { IssueComment } from '../../../core/models/comment.model';
 import { Conflict } from '../../../core/models/conflict/conflict.model';
 import { Issue, SEVERITY_ORDER, STATUS } from '../../../core/models/issue.model';
@@ -11,6 +11,8 @@ import { ErrorHandlingService } from '../../../core/services/error-handling.serv
 import { IssueService } from '../../../core/services/issue.service';
 import { LabelService } from '../../../core/services/label.service';
 import { PhaseService } from '../../../core/services/phase.service';
+import { TABLE_COLUMNS } from '../../issue-tables/issue-tables-columns';
+import { applySearchFilter } from '../../issue-tables/search-filter';
 import { SUBMIT_BUTTON_TEXT } from '../view-issue.component';
 import { ConflictDialogComponent } from './conflict-dialog/conflict-dialog.component';
 
@@ -19,11 +21,13 @@ import { ConflictDialogComponent } from './conflict-dialog/conflict-dialog.compo
   templateUrl: './new-team-response.component.html',
   styleUrls: ['./new-team-response.component.css']
 })
-export class NewTeamResponseComponent implements OnInit {
+export class NewTeamResponseComponent implements OnInit, OnDestroy {
   newTeamResponseForm: FormGroup;
   teamMembers: string[];
   duplicatedIssueList: Observable<Issue[]>;
   conflict: Conflict;
+  searchFilterCtrl: FormControl = new FormControl();
+  filteredDuplicateIssueList: ReplaySubject<Issue[]> = new ReplaySubject<Issue[]>(1);
 
   isFormPending = false;
 
@@ -32,6 +36,9 @@ export class NewTeamResponseComponent implements OnInit {
   @Input() issue: Issue;
   @Output() issueUpdated = new EventEmitter<Issue>();
 
+  // A subject that will emit a signal when this component is being destroyed
+  private _onDestroy = new Subject<void>();
+
   constructor(
     public issueService: IssueService,
     private formBuilder: FormBuilder,
@@ -46,6 +53,9 @@ export class NewTeamResponseComponent implements OnInit {
       return member.loginId;
     });
     this.duplicatedIssueList = this.getDupIssueList();
+    // Populate the filtered list with all the issues first
+    this.duplicatedIssueList.pipe(first()).subscribe((issues) => this.filteredDuplicateIssueList.next(issues));
+    this.searchFilterCtrl.valueChanges.pipe(takeUntil(this._onDestroy)).subscribe((_) => this.filterIssues());
     this.newTeamResponseForm = this.formBuilder.group({
       description: [''],
       severity: [this.issue.severity, Validators.required],
@@ -69,6 +79,26 @@ export class NewTeamResponseComponent implements OnInit {
     this.submitButtonText = SUBMIT_BUTTON_TEXT.SUBMIT;
   }
 
+  private filterIssues(): void {
+    this.changeFilter(this.duplicatedIssueList, this.searchFilterCtrl.value).subscribe((issues) =>
+      this.filteredDuplicateIssueList.next(issues)
+    );
+  }
+
+  private changeFilter(issuesObservable: Observable<Issue[]>, searchInputString): Observable<Issue[]> {
+    return issuesObservable.pipe(
+      first(),
+      map((issues) => {
+        return applySearchFilter(searchInputString, [TABLE_COLUMNS.ID, TABLE_COLUMNS.TITLE], this.issueService, issues);
+      })
+    );
+  }
+
+  ngOnDestroy(): void {
+    this._onDestroy.next(); // Emits the destroy signal
+    this._onDestroy.complete();
+  }
+
   submitNewTeamResponse(form: NgForm) {
     if (this.newTeamResponseForm.invalid) {
       return;
@@ -154,7 +184,7 @@ export class NewTeamResponseComponent implements OnInit {
       if (SEVERITY_ORDER[this.severity.value] > SEVERITY_ORDER[issue.severity]) {
         reason.push('Issue of lower priority');
       } else if (issue.duplicated || !!issue.duplicateOf) {
-        reason.push('A duplicated issue');
+        reason.push('Duplicate of #' + issue.duplicateOf);
       }
     }
     return reason.join(', ');
diff --git a/src/app/shared/view-issue/new-team-response/new-team-response.module.ts b/src/app/shared/view-issue/new-team-response/new-team-response.module.ts
index d9dd9bc5f..46cfc7922 100644
--- a/src/app/shared/view-issue/new-team-response/new-team-response.module.ts
+++ b/src/app/shared/view-issue/new-team-response/new-team-response.module.ts
@@ -1,6 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { MarkdownModule } from 'ngx-markdown';
+import { NgxMatSelectSearchModule } from 'ngx-mat-select-search';
 import { CommentEditorModule } from '../../comment-editor/comment-editor.module';
 import { IssueComponentsModule } from '../../issue/issue-components.module';
 import { LabelDropdownModule } from '../../label-dropdown/label-dropdown.module';
@@ -11,7 +12,15 @@ import { NewTeamResponseComponent } from './new-team-response.component';
 @NgModule({
   exports: [NewTeamResponseComponent, ConflictDialogComponent],
   declarations: [NewTeamResponseComponent, ConflictDialogComponent],
-  imports: [CommonModule, CommentEditorModule, SharedModule, IssueComponentsModule, LabelDropdownModule, MarkdownModule.forChild()],
+  imports: [
+    CommonModule,
+    CommentEditorModule,
+    SharedModule,
+    IssueComponentsModule,
+    LabelDropdownModule,
+    MarkdownModule.forChild(),
+    NgxMatSelectSearchModule
+  ],
   entryComponents: [ConflictDialogComponent]
 })
 export class NewTeamResponseModule {}

From fd0d954dc73c084bc230307688aec02670b139b5 Mon Sep 17 00:00:00 2001
From: Ding YuChen <dingyuchen@gmail.com>
Date: Thu, 24 Mar 2022 17:09:31 +0800
Subject: [PATCH 05/13] Remove lower priority check for duplicate issues (#913)

Currently, CATcher doesn't allow assigning a duplicate if the
duplicate has a higher priority than the original. The team
needs to downgrade the priority of the duplicate to match
the original before it can be assigned as a duplicate.

Let's remove this function for an improved user experience.
---
 .../issue/duplicateOf/duplicate-of.component.ts    | 14 +++-----------
 .../new-team-response.component.ts                 | 14 +++-----------
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/src/app/shared/issue/duplicateOf/duplicate-of.component.ts b/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
index 0fdda92ee..7f3e8153e 100644
--- a/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
+++ b/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
@@ -3,7 +3,7 @@ import { FormControl } from '@angular/forms';
 import { MatCheckbox, MatSelect, MatSelectChange } from '@angular/material';
 import { Observable, ReplaySubject, Subject } from 'rxjs';
 import { first, map, takeUntil } from 'rxjs/operators';
-import { Issue, SEVERITY_ORDER } from '../../../core/models/issue.model';
+import { Issue } from '../../../core/models/issue.model';
 import { ErrorHandlingService } from '../../../core/services/error-handling.service';
 import { IssueService } from '../../../core/services/issue.service';
 import { PermissionService } from '../../../core/services/permission.service';
@@ -87,19 +87,11 @@ export class DuplicateOfComponent implements OnInit, OnDestroy {
   }
 
   dupIssueOptionIsDisabled(issue: Issue): boolean {
-    return SEVERITY_ORDER[this.issue.severity] > SEVERITY_ORDER[issue.severity] || issue.duplicated || !!issue.duplicateOf;
+    return issue.duplicated || !!issue.duplicateOf;
   }
 
   getDisabledDupOptionErrorText(issue: Issue): string {
-    const reason = new Array<string>();
-    if (this.dupIssueOptionIsDisabled(issue)) {
-      if (SEVERITY_ORDER[this.issue.severity] > SEVERITY_ORDER[issue.severity]) {
-        reason.push('Issue of lower priority');
-      } else if (issue.duplicated || !!issue.duplicateOf) {
-        reason.push('Duplicate of #' + issue.duplicateOf);
-      }
-    }
-    return reason.join(', ');
+    return this.dupIssueOptionIsDisabled(issue) ? 'A duplicated issue' : '';
   }
 
   handleCheckboxChange(event) {
diff --git a/src/app/shared/view-issue/new-team-response/new-team-response.component.ts b/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
index be6325d34..a3dce6fd9 100644
--- a/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
+++ b/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
@@ -6,7 +6,7 @@ import { Observable, ReplaySubject, Subject, throwError } from 'rxjs';
 import { finalize, first, flatMap, map, takeUntil } from 'rxjs/operators';
 import { IssueComment } from '../../../core/models/comment.model';
 import { Conflict } from '../../../core/models/conflict/conflict.model';
-import { Issue, SEVERITY_ORDER, STATUS } from '../../../core/models/issue.model';
+import { Issue, STATUS } from '../../../core/models/issue.model';
 import { ErrorHandlingService } from '../../../core/services/error-handling.service';
 import { IssueService } from '../../../core/services/issue.service';
 import { LabelService } from '../../../core/services/label.service';
@@ -175,19 +175,11 @@ export class NewTeamResponseComponent implements OnInit, OnDestroy {
   }
 
   dupIssueOptionIsDisabled(issue: Issue): boolean {
-    return SEVERITY_ORDER[this.severity.value] > SEVERITY_ORDER[issue.severity] || issue.duplicated || !!issue.duplicateOf;
+    return issue.duplicated || !!issue.duplicateOf;
   }
 
   getDisabledDupOptionErrorText(issue: Issue): string {
-    const reason = new Array<string>();
-    if (this.dupIssueOptionIsDisabled(issue)) {
-      if (SEVERITY_ORDER[this.severity.value] > SEVERITY_ORDER[issue.severity]) {
-        reason.push('Issue of lower priority');
-      } else if (issue.duplicated || !!issue.duplicateOf) {
-        reason.push('Duplicate of #' + issue.duplicateOf);
-      }
-    }
-    return reason.join(', ');
+    return this.dupIssueOptionIsDisabled(issue) ? 'A duplicated issue' : '';
   }
 
   handleChangeOfDuplicateCheckbox(event: MatCheckboxChange) {

From bfa5aad9fdbf2797e8548110e8a9bdfdf9e7ece4 Mon Sep 17 00:00:00 2001
From: Gabriel Goh <77230723+gycgabriel@users.noreply.github.com>
Date: Tue, 29 Mar 2022 13:43:09 +0800
Subject: [PATCH 06/13] Add a link to report CATcher problems (#907)

There is no link to CATcher issue tracker for users to report
CATcher problems.

Let's add a link so users can easily reach this issue tracker
to report CATcher problems.
---
 e2e/spec/login/login.e2e-spec.ts            | 2 +-
 src/app/shared/layout/header.component.html | 5 ++++-
 src/app/shared/layout/header.component.ts   | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/e2e/spec/login/login.e2e-spec.ts b/e2e/spec/login/login.e2e-spec.ts
index 37ec01563..1ee04652c 100644
--- a/e2e/spec/login/login.e2e-spec.ts
+++ b/e2e/spec/login/login.e2e-spec.ts
@@ -10,7 +10,7 @@ describe("CATcher's Login Page", () => {
   });
 
   it('displays "CATcher" in header bar', async () => {
-    expect(await page.getTitle()).toEqual(`CATcher v${AppConfig.version}\nreceipt`);
+    expect(await page.getTitle()).toEqual(`CATcher v${AppConfig.version}\nreceipt\nmail`);
   });
 
   it('allows users to authenticate themselves', async () => {
diff --git a/src/app/shared/layout/header.component.html b/src/app/shared/layout/header.component.html
index 5df7e3bf4..ab325eb4e 100644
--- a/src/app/shared/layout/header.component.html
+++ b/src/app/shared/layout/header.component.html
@@ -37,13 +37,16 @@
   <button mat-button matTooltip="Download CATcher Log" (click)="this.exportLogFile()">
     <mat-icon>receipt</mat-icon>
   </button>
+  <button mat-button matTooltip="Give feedback about CATcher" (click)="openIssueTracker()">
+    <mat-icon>mail</mat-icon>
+  </button>
+
   <button
     *ngIf="auth.isAuthenticated() && isOpenUrlButtonShown()"
     mat-button
     matTooltip="View current page on GitHub"
     (click)="viewBrowser()"
   >
-    View on GitHub
     <mat-icon>open_in_new</mat-icon>
   </button>
   <button
diff --git a/src/app/shared/layout/header.component.ts b/src/app/shared/layout/header.component.ts
index a5ee139ac..5bf26d9d4 100644
--- a/src/app/shared/layout/header.component.ts
+++ b/src/app/shared/layout/header.component.ts
@@ -16,6 +16,8 @@ import { LoggingService } from '../../core/services/logging.service';
 import { PhaseDescription, PhaseService } from '../../core/services/phase.service';
 import { UserService } from '../../core/services/user.service';
 
+const ISSUE_TRACKER_URL = 'https://github.com/CATcher-org/CATcher/issues';
+
 @Component({
   selector: 'app-layout-header',
   templateUrl: './header.component.html'
@@ -135,6 +137,10 @@ export class HeaderComponent implements OnInit {
     this.electronService.openLink('https://github.com/'.concat(this.githubService.getRepoURL()).concat(issueUrl));
   }
 
+  openIssueTracker() {
+    this.electronService.openLink(ISSUE_TRACKER_URL);
+  }
+
   private getTeamFilterString() {
     // First Phase does not need team filtering
     if (this.phaseService.currentPhase === Phase.phaseBugReporting || this.phaseService.currentPhase === Phase.phaseTesterResponse) {

From b2ba50c54a8f23137f0133f417c8dfc886d90aa5 Mon Sep 17 00:00:00 2001
From: "Lee Xiong Jie, Isaac" <68138671+luminousleek@users.noreply.github.com>
Date: Mon, 4 Apr 2022 12:52:00 +0800
Subject: [PATCH 07/13] Use coroutine parsers for Issue Templates (#910)

Use coroutine parsers in Issue Templates

The way that issue comments are parsed to extract relevant information
e.g. duplicate issue number or the team chosen severity is complicated
and reliant on regex, which is not human friendly nor maintainable.

Let's use the coroutine parsers in arcsecond to parse the comments
instead. The coroutine parsers allow us to easily extract the
information that we need within the parser itself. For the more
complicated sections, let's implement parsers for those specific
sections as well.

Let's also write tests for these new parsers.

Note that the eventual aim is to remove SectionalDependency, Section
and its related subclasses, hence parsers were also implemented for
the Tutor Moderation phase.
---
 .github/ISSUE_TEMPLATE/bug_report.md          |   9 +-
 .github/ISSUE_TEMPLATE/custom.md              |   3 -
 .github/ISSUE_TEMPLATE/feature_request.md     |   1 -
 package.json                                  |   1 +
 .../sections/common-parsers.model.ts          |  23 ++++
 .../issue-dispute-section-parser.model.ts     |  18 +++
 .../moderation-section-parser.model.ts        |  30 +++++
 .../tester-response-section-parser.model.ts   | 113 ++++++++++++++++++
 .../templates/team-accepted-template.model.ts |   6 +-
 .../templates/team-response-template.model.ts |  38 +++++-
 .../core/models/templates/template.model.ts   |  18 +--
 .../tester-response-template.model.ts         |  66 +++++++++-
 .../tutor-moderation-issue-template.model.ts  |  39 +++++-
 .../tutor-moderation-todo-template.model.ts   |  24 +++-
 ...issue-dispute-section-parser.model.spec.ts |  22 ++++
 .../moderation-section-parser.model.spec.ts   |  37 ++++++
 ...ster-response-section-parser.model.spec.ts | 113 ++++++++++++++++++
 .../team-response-template.model.spec.ts      |  16 ++-
 .../tester-response-template.model.spec.ts    |  31 ++++-
 ...or-moderation-issue-template.model.spec.ts |  44 +++++++
 ...tor-moderation-todo-template.model.spec.ts |  46 +++++++
 21 files changed, 669 insertions(+), 29 deletions(-)
 create mode 100644 src/app/core/models/templates/sections/common-parsers.model.ts
 create mode 100644 src/app/core/models/templates/sections/issue-dispute-section-parser.model.ts
 create mode 100644 src/app/core/models/templates/sections/moderation-section-parser.model.ts
 create mode 100644 src/app/core/models/templates/sections/tester-response-section-parser.model.ts
 create mode 100644 tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts
 create mode 100644 tests/model/templates/sections/moderation-section-parser.model.spec.ts
 create mode 100644 tests/model/templates/sections/tester-response-section-parser.model.spec.ts
 create mode 100644 tests/model/templates/tutor-moderation-issue-template.model.spec.ts
 create mode 100644 tests/model/templates/tutor-moderation-todo-template.model.spec.ts

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 95837e66d..3a0c62d17 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -4,7 +4,6 @@ about: Create a report to help us improve
 title: ''
 labels: category.Bug
 assignees: ''
-
 ---
 
 **Describe the bug**
@@ -12,6 +11,7 @@ A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -24,9 +24,10 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. Windows 11]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. Windows 11]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/custom.md b/.github/ISSUE_TEMPLATE/custom.md
index 48d5f81fa..96a47352a 100644
--- a/.github/ISSUE_TEMPLATE/custom.md
+++ b/.github/ISSUE_TEMPLATE/custom.md
@@ -4,7 +4,4 @@ about: Describe this issue template's purpose here.
 title: ''
 labels: ''
 assignees: ''
-
 ---
-
-
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index d6ea6c8b4..78f6d68c5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -4,7 +4,6 @@ about: Suggest an idea for this project
 title: ''
 labels: 'category.Feature'
 assignees: ''
-
 ---
 
 **Is your feature request related to a problem? Please describe.**
diff --git a/package.json b/package.json
index 26dcf8981..3648ac752 100644
--- a/package.json
+++ b/package.json
@@ -58,6 +58,7 @@
     "apollo-client": "^2.6.0",
     "apollo-link": "^1.2.14",
     "apollo-link-context": "^1.0.20",
+    "arcsecond": "^4.1.0",
     "core-js": "^3.16.4",
     "diff-match-patch": "^1.0.4",
     "dompurify": "^2.3.1",
diff --git a/src/app/core/models/templates/sections/common-parsers.model.ts b/src/app/core/models/templates/sections/common-parsers.model.ts
new file mode 100644
index 000000000..9ab039e08
--- /dev/null
+++ b/src/app/core/models/templates/sections/common-parsers.model.ts
@@ -0,0 +1,23 @@
+const { char, choice, coroutine, everyCharUntil, str, whitespace } = require('arcsecond');
+
+const TEAM_RESPONSE_HEADER = "# Team's Response";
+
+export function buildTeamResponseSectionParser(nextHeader: string) {
+  return coroutine(function* () {
+    yield str(TEAM_RESPONSE_HEADER);
+    yield whitespace;
+    const teamResponse = yield everyCharUntil(str(nextHeader));
+
+    return teamResponse.trim();
+  });
+}
+
+export function buildCheckboxParser(description: string) {
+  return coroutine(function* () {
+    yield str('- [');
+    const checkbox = yield choice([char('x'), whitespace]);
+    yield str('] ' + description);
+
+    return checkbox === 'x';
+  });
+}
diff --git a/src/app/core/models/templates/sections/issue-dispute-section-parser.model.ts b/src/app/core/models/templates/sections/issue-dispute-section-parser.model.ts
new file mode 100644
index 000000000..554e19b13
--- /dev/null
+++ b/src/app/core/models/templates/sections/issue-dispute-section-parser.model.ts
@@ -0,0 +1,18 @@
+import { IssueDispute } from '../../issue-dispute.model';
+
+const { coroutine, everyCharUntil, optionalWhitespace, str } = require('arcsecond');
+
+const SECTION_TITLE_PREFIX = '## :question: ';
+const TEAM_SAYS_HEADER = '### Team says:';
+const LINE_SEPARATOR = '-------------------';
+
+export const IssueDisputeSectionParser = coroutine(function* () {
+  yield str(SECTION_TITLE_PREFIX);
+  const title = yield everyCharUntil(str(TEAM_SAYS_HEADER));
+
+  const description = yield everyCharUntil(str(LINE_SEPARATOR));
+  yield str(LINE_SEPARATOR);
+  yield optionalWhitespace;
+
+  return new IssueDispute(title.trim(), description.trim());
+});
diff --git a/src/app/core/models/templates/sections/moderation-section-parser.model.ts b/src/app/core/models/templates/sections/moderation-section-parser.model.ts
new file mode 100644
index 000000000..8b06501d9
--- /dev/null
+++ b/src/app/core/models/templates/sections/moderation-section-parser.model.ts
@@ -0,0 +1,30 @@
+import { Checkbox } from '../../checkbox.model';
+import { IssueDispute } from '../../issue-dispute.model';
+import { buildCheckboxParser } from './common-parsers.model';
+
+const { coroutine, everyCharUntil, lookAhead, optionalWhitespace, str, whitespace } = require('arcsecond');
+
+const SECTION_TITLE_PREFIX = '## :question: ';
+const DONE_CHECKBOX_DESCRIPTION = 'Done';
+const LINE_SEPARATOR = '-------------------';
+
+export const DoneCheckboxParser = buildCheckboxParser(DONE_CHECKBOX_DESCRIPTION);
+
+export const ModerationSectionParser = coroutine(function* () {
+  yield str(SECTION_TITLE_PREFIX);
+  const title = yield everyCharUntil(str('- [')); // every char until the done checkbox
+
+  const description = yield lookAhead(everyCharUntil(str(LINE_SEPARATOR)));
+
+  const doneCheckboxValue = yield DoneCheckboxParser;
+  yield whitespace;
+  const tutorResponse = yield everyCharUntil(str(LINE_SEPARATOR));
+  yield str(LINE_SEPARATOR);
+  yield optionalWhitespace;
+
+  const dispute = new IssueDispute(title.trim(), description.trim());
+  dispute.todo = new Checkbox(DONE_CHECKBOX_DESCRIPTION, doneCheckboxValue);
+  dispute.tutorResponse = tutorResponse.trim();
+
+  return dispute;
+});
diff --git a/src/app/core/models/templates/sections/tester-response-section-parser.model.ts b/src/app/core/models/templates/sections/tester-response-section-parser.model.ts
new file mode 100644
index 000000000..9c7ef10db
--- /dev/null
+++ b/src/app/core/models/templates/sections/tester-response-section-parser.model.ts
@@ -0,0 +1,113 @@
+import { buildCheckboxParser } from './common-parsers.model';
+
+const {
+  between,
+  coroutine,
+  everyCharUntil,
+  letters,
+  lookAhead,
+  optionalWhitespace,
+  pipeParsers,
+  possibly,
+  str,
+  whitespace
+} = require('arcsecond');
+
+const SECTION_TITLE_PREFIX = '## :question: Issue ';
+const TEAM_CHOSE_PREFIX = 'Team chose ';
+const TESTER_CHOSE_PREFIX = 'Originally ';
+const DISAGREE_CHECKBOX_DESCRIPTION = 'I disagree';
+const DISAGREEMENT_REASON_PREFIX = '**Reason for disagreement:** ';
+const LINE_SEPARATOR = '-------------------';
+const DUPLICATE_STATUS_MESSAGE =
+  "Team chose to mark this issue as a duplicate of another issue (as explained in the _**Team's response**_ above)";
+
+export const DisagreeCheckboxParser = buildCheckboxParser(DISAGREE_CHECKBOX_DESCRIPTION);
+
+function buildExtractResponseParser(category: string) {
+  return between(str('[`' + category + '.'))(str('`]'))(letters);
+}
+
+function buildTeamResponseParser(category: string) {
+  const extractResponseParser = buildExtractResponseParser(category);
+
+  return pipeParsers([str(TEAM_CHOSE_PREFIX), extractResponseParser]);
+}
+
+function buildTesterResponseParser(category: string) {
+  const extractResponseParser = buildExtractResponseParser(category);
+
+  return pipeParsers([str(TESTER_CHOSE_PREFIX), extractResponseParser]);
+}
+
+export const DisagreeReasonParser = coroutine(function* () {
+  yield str(DISAGREEMENT_REASON_PREFIX);
+  const reasonForDisagreement = yield everyCharUntil(str(LINE_SEPARATOR));
+  yield str(LINE_SEPARATOR);
+
+  return reasonForDisagreement.trim();
+});
+
+// Issue duplicate section has a different format than the other three
+const DuplicateSectionParser = coroutine(function* () {
+  yield str('status');
+  yield whitespace;
+  yield str(DUPLICATE_STATUS_MESSAGE);
+  yield whitespace;
+
+  const disagreeCheckboxValue = yield DisagreeCheckboxParser;
+  yield whitespace;
+  const reasonForDisagreement = yield DisagreeReasonParser;
+
+  return {
+    disagreeCheckboxValue: disagreeCheckboxValue,
+    reasonForDisagreement: reasonForDisagreement
+  };
+});
+
+export const TesterResponseSectionParser = coroutine(function* () {
+  // section title
+  yield str(SECTION_TITLE_PREFIX);
+  const title = yield letters;
+  yield whitespace;
+
+  if (title === 'duplicate') {
+    const dupSectionResult = yield DuplicateSectionParser;
+    yield optionalWhitespace;
+
+    return {
+      title: title + ' status',
+      description: DUPLICATE_STATUS_MESSAGE,
+      teamChose: null,
+      testerChose: null,
+      disagreeCheckboxValue: dupSectionResult.disagreeCheckboxValue,
+      reasonForDisagreement: dupSectionResult.reasonForDisagreement
+    };
+  }
+
+  const description = yield lookAhead(everyCharUntil(DisagreeCheckboxParser));
+
+  // team and tester response
+  const teamResponseParser = buildTeamResponseParser(title);
+  const testerResponseParser = buildTesterResponseParser(title);
+
+  const teamChose = yield teamResponseParser;
+  yield whitespace;
+  // response section does not have tester response
+  const testerChose = yield possibly(testerResponseParser);
+  yield optionalWhitespace;
+
+  const disagreeCheckboxValue = yield DisagreeCheckboxParser;
+  yield whitespace;
+  const reasonForDisagreement = yield DisagreeReasonParser;
+  yield optionalWhitespace;
+
+  return {
+    title: title,
+    description: description.trim(),
+    teamChose: teamChose,
+    testerChose: testerChose,
+    disagreeCheckboxValue: disagreeCheckboxValue,
+    reasonForDisagreement: reasonForDisagreement
+  };
+});
diff --git a/src/app/core/models/templates/team-accepted-template.model.ts b/src/app/core/models/templates/team-accepted-template.model.ts
index 7f9a35e53..b208fd39d 100644
--- a/src/app/core/models/templates/team-accepted-template.model.ts
+++ b/src/app/core/models/templates/team-accepted-template.model.ts
@@ -1,14 +1,18 @@
 import { GithubComment } from '../github/github-comment.model';
 import { Header, Template } from './template.model';
 
+const { endOfInput, sequenceOf, startOfInput, str } = require('arcsecond');
+
 export const TeamAcceptedMessage = 'Your response not required for this bug as the team has accepted the bug as it is.';
 export const TeamAcceptedHeader = { teamAccepted: new Header(TeamAcceptedMessage, 0) };
 
+const TeamAcceptedParser = sequenceOf([startOfInput, str(TeamAcceptedMessage), endOfInput]);
+
 export class TeamAcceptedTemplate extends Template {
   teamAccepted?: boolean;
 
   constructor(githubComments: GithubComment[]) {
-    super(Object.values(TeamAcceptedHeader));
+    super(TeamAcceptedParser, Object.values(TeamAcceptedHeader));
 
     this.findConformingComment(githubComments);
 
diff --git a/src/app/core/models/templates/team-response-template.model.ts b/src/app/core/models/templates/team-response-template.model.ts
index 0da036aca..6f74aa0f7 100644
--- a/src/app/core/models/templates/team-response-template.model.ts
+++ b/src/app/core/models/templates/team-response-template.model.ts
@@ -1,21 +1,57 @@
 import { IssueComment } from '../comment.model';
 import { GithubComment } from '../github/github-comment.model';
+import { buildTeamResponseSectionParser } from './sections/common-parsers.model';
 import { DuplicateOfSection } from './sections/duplicate-of-section.model';
 import { Section } from './sections/section.model';
 import { Header, Template } from './template.model';
 
+const { choice, coroutine, digits, str, whitespace } = require('arcsecond');
+
 export const TeamResponseHeaders = {
   teamResponse: new Header("Team's Response", 1),
   duplicateOf: new Header('Duplicate status \\(if any\\):', 2)
 };
 
+interface TeamResponseParseResult {
+  teamResponse: string;
+  issueNumber: number;
+}
+
+const DUPLICATE_OF_HEADER = '## Duplicate status (if any):';
+
+const TeamResponseSectionParser = buildTeamResponseSectionParser(DUPLICATE_OF_HEADER);
+
+const DuplicateNumberParser = coroutine(function* () {
+  yield str('Duplicate of #'); // parse and ignore
+  const issueNumber = yield digits; // parse and store duplicate issue number
+  return parseInt(issueNumber, 10); // issueNumber is a string, radix added to pass linting
+});
+
+export const TeamResponseParser = coroutine(function* () {
+  const teamResponse = yield TeamResponseSectionParser;
+
+  yield str(DUPLICATE_OF_HEADER);
+  yield whitespace;
+  const issueNumber = yield choice([
+    // either parse duplicate issue number or '--' if no duplicates
+    DuplicateNumberParser,
+    str('--')
+  ]).map((num) => (num === '--' ? null : num));
+
+  const result: TeamResponseParseResult = {
+    teamResponse: teamResponse,
+    issueNumber: issueNumber
+  };
+  return result;
+});
+
 export class TeamResponseTemplate extends Template {
   teamResponse: Section;
   duplicateOf: DuplicateOfSection;
   comment: IssueComment;
 
   constructor(githubComments: GithubComment[]) {
-    super(Object.values(TeamResponseHeaders));
+    super(TeamResponseParser, Object.values(TeamResponseHeaders));
 
     const templateConformingComment = this.findConformingComment(githubComments);
 
diff --git a/src/app/core/models/templates/template.model.ts b/src/app/core/models/templates/template.model.ts
index a460e4ce5..d6d349b35 100644
--- a/src/app/core/models/templates/template.model.ts
+++ b/src/app/core/models/templates/template.model.ts
@@ -3,14 +3,12 @@ import { SectionalDependency } from './sections/section.model';
 
 export abstract class Template {
   headers: Header[];
-  regex: RegExp;
+  parser;
   parseFailure: boolean;
 
-  protected constructor(headers: Header[]) {
+  protected constructor(parser, headers: Header[]) {
+    this.parser = parser;
     this.headers = headers;
-
-    const headerString = headers.join('|');
-    this.regex = new RegExp(`(${headerString})(\\s+|$)([\\s\\S]*?)(?=${headerString}|$)`, 'gi');
   }
 
   getSectionalDependency(header: Header): SectionalDependency {
@@ -21,16 +19,8 @@ export abstract class Template {
     };
   }
 
-  /**
-   * Check whether the given string conforms to the template.
-   */
   test(toTest: string): boolean {
-    let numOfMatch = 0;
-    while (this.regex.exec(toTest) != null) {
-      numOfMatch += 1;
-    }
-    this.regex.lastIndex = 0;
-    return numOfMatch >= this.headers.length;
+    return !this.parser.run(toTest).isError;
   }
 
   /**
diff --git a/src/app/core/models/templates/tester-response-template.model.ts b/src/app/core/models/templates/tester-response-template.model.ts
index 6d2b37cde..fc0e90184 100644
--- a/src/app/core/models/templates/tester-response-template.model.ts
+++ b/src/app/core/models/templates/tester-response-template.model.ts
@@ -1,14 +1,78 @@
 import { IssueComment } from '../comment.model';
 import { GithubComment } from '../github/github-comment.model';
+import { TesterResponse } from '../tester-response.model';
+import { buildTeamResponseSectionParser } from './sections/common-parsers.model';
 import { Section } from './sections/section.model';
+import { TesterResponseSectionParser } from './sections/tester-response-section-parser.model';
 import { TesterResponseSection } from './sections/tester-response-section.model';
 import { Header, Template } from './template.model';
 
+const { coroutine, many1, str, whitespace } = require('arcsecond');
+
 export const TesterResponseHeaders = {
   teamResponse: new Header("Team's Response", 1),
   testerResponses: new Header('Items for the Tester to Verify', 1)
 };
 
+interface TesterResponseParseResult {
+  teamResponse: string;
+  testerResponses: TesterResponse[];
+  testerDisagree: boolean;
+  teamChosenSeverity: string;
+  teamChosenType: string;
+}
+
+const TESTER_RESPONSES_HEADER = '# Items for the Tester to Verify';
+const DISAGREE_CHECKBOX_DESCRIPTION = 'I disagree';
+
+const TeamResponseSectionParser = buildTeamResponseSectionParser(TESTER_RESPONSES_HEADER);
+
+export const TesterResponseParser = coroutine(function* () {
+  const teamResponse = yield TeamResponseSectionParser;
+
+  // parse tester responses from comment
+  yield str(TESTER_RESPONSES_HEADER);
+  yield whitespace;
+  const responses = yield many1(TesterResponseSectionParser);
+
+  // build array of TesterResponse
+  let testerDisagree = false;
+  let teamChosenSeverity: string;
+  let teamChosenType: string;
+  const testerResponses: TesterResponse[] = [];
+
+  for (const response of responses) {
+    if (response.disagreeCheckboxValue) {
+      testerDisagree = true;
+    }
+
+    if (response.title === 'severity') {
+      teamChosenSeverity = response.teamChose;
+    } else if (response.title === 'type') {
+      teamChosenType = response.teamChose;
+    }
+
+    testerResponses.push(
+      new TesterResponse(
+        'Issue ' + response.title,
+        response.description,
+        DISAGREE_CHECKBOX_DESCRIPTION,
+        response.disagreeCheckboxValue,
+        response.reasonForDisagreement
+      )
+    );
+  }
+
+  const result: TesterResponseParseResult = {
+    teamResponse: teamResponse,
+    testerResponses: testerResponses,
+    testerDisagree: testerDisagree,
+    teamChosenSeverity: teamChosenSeverity,
+    teamChosenType: teamChosenType
+  };
+  return result;
+});
+
 export class TesterResponseTemplate extends Template {
   teamResponse: Section;
   testerResponse: TesterResponseSection;
@@ -18,7 +82,7 @@ export class TesterResponseTemplate extends Template {
   teamChosenType?: string;
 
   constructor(githubComments: GithubComment[]) {
-    super(Object.values(TesterResponseHeaders));
+    super(TesterResponseParser, Object.values(TesterResponseHeaders));
 
     const templateConformingComment = this.findConformingComment(githubComments);
 
diff --git a/src/app/core/models/templates/tutor-moderation-issue-template.model.ts b/src/app/core/models/templates/tutor-moderation-issue-template.model.ts
index c2dcdce92..c5539437c 100644
--- a/src/app/core/models/templates/tutor-moderation-issue-template.model.ts
+++ b/src/app/core/models/templates/tutor-moderation-issue-template.model.ts
@@ -1,21 +1,58 @@
 import { GithubIssue } from '../github/github-issue.model';
+import { IssueDispute } from '../issue-dispute.model';
+import { buildTeamResponseSectionParser } from './sections/common-parsers.model';
+import { IssueDisputeSectionParser } from './sections/issue-dispute-section-parser.model';
 import { IssueDisputeSection } from './sections/issue-dispute-section.model';
 import { Section } from './sections/section.model';
 import { Header, Template } from './template.model';
 
+const { coroutine, everyCharUntil, many1, str, whitespace } = require('arcsecond');
+
 const tutorModerationIssueDescriptionHeaders = {
   description: new Header('Issue Description', 1),
   teamResponse: new Header("Team's Response", 1),
   disputes: new Header('Disputes', 1)
 };
 
+interface TutorModerationIssueParseResult {
+  description: string;
+  teamResponse: string;
+  issueDisputes: IssueDispute[];
+}
+
+const DESCRIPTION_HEADER = '# Issue Description';
+const TEAM_RESPONSE_HEADER = "# Team's Response";
+const DISPUTES_HEADER = '# Disputes';
+
+const TeamResponseSectionParser = buildTeamResponseSectionParser(DISPUTES_HEADER);
+
+export const TutorModerationIssueParser = coroutine(function* () {
+  yield str(DESCRIPTION_HEADER);
+  yield whitespace;
+  const description = yield everyCharUntil(str(TEAM_RESPONSE_HEADER));
+
+  const teamResponse = yield TeamResponseSectionParser;
+
+  // parse disputes
+  yield str(DISPUTES_HEADER);
+  yield whitespace;
+  const disputes = yield many1(IssueDisputeSectionParser);
+
+  const result: TutorModerationIssueParseResult = {
+    description: description.trim(),
+    teamResponse: teamResponse,
+    issueDisputes: disputes
+  };
+  return result;
+});
+
 export class TutorModerationIssueTemplate extends Template {
   description: Section;
   teamResponse: Section;
   dispute: IssueDisputeSection;
 
   constructor(githubIssue: GithubIssue) {
-    super(Object.values(tutorModerationIssueDescriptionHeaders));
+    super(TutorModerationIssueParser, Object.values(tutorModerationIssueDescriptionHeaders));
 
     const issueContent = githubIssue.body;
     this.description = this.parseDescription(issueContent);
diff --git a/src/app/core/models/templates/tutor-moderation-todo-template.model.ts b/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
index e3b0b5d21..81e3669d1 100644
--- a/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
+++ b/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
@@ -1,18 +1,40 @@
 import { IssueComment } from '../comment.model';
 import { GithubComment } from '../github/github-comment.model';
+import { IssueDispute } from '../issue-dispute.model';
+import { ModerationSectionParser } from './sections/moderation-section-parser.model';
 import { ModerationSection } from './sections/moderation-section.model';
 import { Header, Template } from './template.model';
 
+const { coroutine, many1, str, whitespace } = require('arcsecond');
+
 const tutorModerationTodoHeaders = {
   todo: new Header('Tutor Moderation', 1)
 };
 
+interface TutorModerationTodoParseResult {
+  disputesToResolve: IssueDispute[];
+}
+
+const TODO_HEADER = '# Tutor Moderation';
+
+export const TutorModerationTodoParser = coroutine(function* () {
+  yield str(TODO_HEADER);
+  yield whitespace;
+
+  const tutorResponses = yield many1(ModerationSectionParser);
+
+  const result: TutorModerationTodoParseResult = {
+    disputesToResolve: tutorResponses
+  };
+  return result;
+});
+
 export class TutorModerationTodoTemplate extends Template {
   moderation: ModerationSection;
   comment: IssueComment;
 
   constructor(githubComments: GithubComment[]) {
-    super(Object.values(tutorModerationTodoHeaders));
+    super(TutorModerationTodoParser, Object.values(tutorModerationTodoHeaders));
 
     const templateConformingComment = this.findConformingComment(githubComments);
 
diff --git a/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts b/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts
new file mode 100644
index 000000000..c137ab3aa
--- /dev/null
+++ b/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts
@@ -0,0 +1,22 @@
+import { IssueDisputeSectionParser } from '../../../../src/app/core/models/templates/sections/issue-dispute-section-parser.model';
+
+const TYPE_DISPUTE =
+  '## :question: Issue Type\n\n' +
+  '### Team says:\n\n' +
+  "{the team's action that is being disputed}\n\n" +
+  '### Tester says:\n\n' +
+  "{tester's objection}\n\n" +
+  '-------------------';
+
+const EXPECTED_TITLE = 'Issue Type';
+const EXPECTED_DESCRIPTION =
+  '### Team says:\n\n' + "{the team's action that is being disputed}\n\n" + '### Tester says:\n\n' + "{tester's objection}";
+
+describe('IssueDisputeSectionParser', () => {
+  it('parses type dispute correctly', () => {
+    const result = IssueDisputeSectionParser.run(TYPE_DISPUTE).result;
+
+    expect(result.title).toBe(EXPECTED_TITLE);
+    expect(result.description).toBe(EXPECTED_DESCRIPTION);
+  });
+});
diff --git a/tests/model/templates/sections/moderation-section-parser.model.spec.ts b/tests/model/templates/sections/moderation-section-parser.model.spec.ts
new file mode 100644
index 000000000..1e03e2243
--- /dev/null
+++ b/tests/model/templates/sections/moderation-section-parser.model.spec.ts
@@ -0,0 +1,37 @@
+import {
+  DoneCheckboxParser,
+  ModerationSectionParser
+} from '../../../../src/app/core/models/templates/sections/moderation-section-parser.model';
+
+const TYPE_DISPUTE = '## :question: Issue Type\n\n' + '- [ ] Done\n\n' + '[replace this with your explanation]\n\n' + '-------------------';
+
+const EMPTY_DONE_CHECKBOX = '- [ ] Done';
+const FILLED_DONE_CHECKBOX = '- [x] Done';
+
+const EXPECTED_TITLE = 'Issue Type';
+const EXPECTED_DESCRIPTION = '- [ ] Done\n\n[replace this with your explanation]';
+const EXPECTED_TUTOR_RESPONSE = '[replace this with your explanation]';
+
+describe('DoneCheckboxParser', () => {
+  it('parses empty checkbox correctly', () => {
+    const result = DoneCheckboxParser.run(EMPTY_DONE_CHECKBOX).result;
+
+    expect(result).toBe(false);
+  });
+  it('parses filled checkbox correctly', () => {
+    const result = DoneCheckboxParser.run(FILLED_DONE_CHECKBOX).result;
+
+    expect(result).toBe(true);
+  });
+});
+
+describe('ModerationSectionParser', () => {
+  it('parses type dispute correctly', () => {
+    const result = ModerationSectionParser.run(TYPE_DISPUTE).result;
+
+    expect(result.title).toBe(EXPECTED_TITLE);
+    expect(result.description).toBe(EXPECTED_DESCRIPTION);
+    expect(result.todo.isChecked).toBe(false);
+    expect(result.tutorResponse).toBe(EXPECTED_TUTOR_RESPONSE);
+  });
+});
diff --git a/tests/model/templates/sections/tester-response-section-parser.model.spec.ts b/tests/model/templates/sections/tester-response-section-parser.model.spec.ts
new file mode 100644
index 000000000..a9e0e9a23
--- /dev/null
+++ b/tests/model/templates/sections/tester-response-section-parser.model.spec.ts
@@ -0,0 +1,113 @@
+import {
+  DisagreeCheckboxParser,
+  TesterResponseSectionParser
+} from '../../../../src/app/core/models/templates/sections/tester-response-section-parser.model';
+
+const EMPTY_DISAGREE_CHECKBOX = '- [ ] I disagree';
+const FILLED_DISAGREE_CHECKBOX = '- [x] I disagree';
+const DEFAULT_DISAGREEMENT_REASON = '[replace this with your reason]';
+const USER_DISAGREEMENT_REASON = 'I disagree!';
+
+const RESPONSE_TITLE = 'response';
+const RESPONSE_DESCRIPTION = 'Team chose [`response.Rejected`]';
+const RESPONSE_TEAM_CHOSE = 'Rejected';
+
+const SEVERITY_TITLE = 'severity';
+const SEVERITY_DESCRIPTION = 'Team chose [`severity.Low`]\nOriginally [`severity.High`]';
+const SEVERITY_TEAM_CHOSE = 'Low';
+const SEVERITY_TESTER_CHOSE = 'High';
+
+const TYPE_TITLE = 'type';
+const TYPE_DESCRIPTION = 'Team chose [`type.DocumentationBug`]\nOriginally [`type.FunctionalityBug`]';
+const TYPE_TEAM_CHOSE = 'DocumentationBug';
+const TYPE_TESTER_CHOSE = 'FunctionalityBug';
+
+const DUPLICATE_TITLE = 'duplicate status';
+const DUPLICATE_DESCRIPTION =
+  "Team chose to mark this issue as a duplicate of another issue (as explained in the _**Team's response**_ above)";
+
+export const RESPONSE_DISAGREEMENT =
+  '## :question: Issue response\n\n' +
+  'Team chose [`response.Rejected`]\n\n' +
+  '- [ ] I disagree\n\n' +
+  '**Reason for disagreement:** [replace this with your reason]\n\n' +
+  '-------------------';
+
+export const SEVERITY_DISAGREEMENT =
+  '## :question: Issue severity\n\n' +
+  'Team chose [`severity.Low`]\n' +
+  'Originally [`severity.High`]\n\n' +
+  '- [x] I disagree\n\n' +
+  '**Reason for disagreement:** I disagree!\n\n' +
+  '-------------------';
+
+export const TYPE_DISAGREEMENT =
+  '## :question: Issue type\n\n' +
+  'Team chose [`type.DocumentationBug`]\n' +
+  'Originally [`type.FunctionalityBug`]\n\n' +
+  '- [ ] I disagree\n\n' +
+  '**Reason for disagreement:** [replace this with your reason]\n\n' +
+  '-------------------';
+
+export const DUPLICATE_DISAGREEMENT =
+  '## :question: Issue duplicate status\n\n' +
+  "Team chose to mark this issue as a duplicate of another issue (as explained in the _**Team's response**_ above)\n\n" +
+  '- [ ] I disagree\n\n' +
+  '**Reason for disagreement:** [replace this with your reason]\n\n' +
+  '-------------------';
+
+describe('DisagreeCheckboxParser', () => {
+  it('parses empty checkbox correctly', () => {
+    const result = DisagreeCheckboxParser.run(EMPTY_DISAGREE_CHECKBOX).result;
+
+    expect(result).toBe(false);
+  });
+  it('parses filled checkbox correctly', () => {
+    const result = DisagreeCheckboxParser.run(FILLED_DISAGREE_CHECKBOX).result;
+
+    expect(result).toBe(true);
+  });
+});
+
+describe('TesterResponseSectionParser', () => {
+  it('parses response disagreement correctly', () => {
+    const result = TesterResponseSectionParser.run(RESPONSE_DISAGREEMENT).result;
+
+    expect(result.title).toBe(RESPONSE_TITLE);
+    expect(result.description).toBe(RESPONSE_DESCRIPTION);
+    expect(result.teamChose).toBe(RESPONSE_TEAM_CHOSE);
+    expect(result.testerChose).toBe(null);
+    expect(result.disagreeCheckboxValue).toBe(false);
+    expect(result.reasonForDisagreement).toBe(DEFAULT_DISAGREEMENT_REASON);
+  });
+  it('parses severity disagreement correctly', () => {
+    const result = TesterResponseSectionParser.run(SEVERITY_DISAGREEMENT).result;
+
+    expect(result.title).toBe(SEVERITY_TITLE);
+    expect(result.description).toBe(SEVERITY_DESCRIPTION);
+    expect(result.teamChose).toBe(SEVERITY_TEAM_CHOSE);
+    expect(result.testerChose).toBe(SEVERITY_TESTER_CHOSE);
+    expect(result.disagreeCheckboxValue).toBe(true);
+    expect(result.reasonForDisagreement).toBe(USER_DISAGREEMENT_REASON);
+  });
+  it('parses type disagreement correctly', () => {
+    const result = TesterResponseSectionParser.run(TYPE_DISAGREEMENT).result;
+
+    expect(result.title).toBe(TYPE_TITLE);
+    expect(result.description).toBe(TYPE_DESCRIPTION);
+    expect(result.teamChose).toBe(TYPE_TEAM_CHOSE);
+    expect(result.testerChose).toBe(TYPE_TESTER_CHOSE);
+    expect(result.disagreeCheckboxValue).toBe(false);
+    expect(result.reasonForDisagreement).toBe(DEFAULT_DISAGREEMENT_REASON);
+  });
+  it('parses duplicate status disagreement correctly', () => {
+    const result = TesterResponseSectionParser.run(DUPLICATE_DISAGREEMENT).result;
+
+    expect(result.title).toBe(DUPLICATE_TITLE);
+    expect(result.description).toBe(DUPLICATE_DESCRIPTION);
+    expect(result.teamChose).toBe(null);
+    expect(result.testerChose).toBe(null);
+    expect(result.disagreeCheckboxValue).toBe(false);
+    expect(result.reasonForDisagreement).toBe(DEFAULT_DISAGREEMENT_REASON);
+  });
+});
diff --git a/tests/model/templates/team-response-template.model.spec.ts b/tests/model/templates/team-response-template.model.spec.ts
index e841f1deb..430b64786 100644
--- a/tests/model/templates/team-response-template.model.spec.ts
+++ b/tests/model/templates/team-response-template.model.spec.ts
@@ -1,5 +1,5 @@
 import { GithubComment } from '../../../src/app/core/models/github/github-comment.model';
-import { TeamResponseTemplate } from '../../../src/app/core/models/templates/team-response-template.model';
+import { TeamResponseParser, TeamResponseTemplate } from '../../../src/app/core/models/templates/team-response-template.model';
 
 const EMPTY_BODY_GITHUB_COMMENT = {
   body: ''
@@ -18,6 +18,20 @@ const TEAM_RESPONSE_WITH_DUPLICATE =
   '## Duplicate status (if any): Duplicate of #' +
   DUPLICATE_ISSUE_NUMBER;
 
+describe('TeamResponseParser', () => {
+  it('parses the team response correctly', () => {
+    const result = TeamResponseParser.run(TEAM_RESPONSE_WITH_EXTRA_NEWLINES_AND_WHITESPACE).result;
+
+    expect(result.teamResponse).toBe(EXPECTED_TEAM_RESPONSE_TEMPLATE_CONTENT);
+    expect(result.issueNumber).toBe(null);
+  });
+  it('parses the duplicate issue number correctly', () => {
+    const result = TeamResponseParser.run(TEAM_RESPONSE_WITH_DUPLICATE).result;
+
+    expect(result.issueNumber).toBe(DUPLICATE_ISSUE_NUMBER);
+  });
+});
+
 describe('TeamResponseTemplate', () => {
   it('parses the teamResponse correctly', () => {
     EMPTY_BODY_GITHUB_COMMENT.body = TEAM_RESPONSE_WITH_EXTRA_NEWLINES_AND_WHITESPACE;
diff --git a/tests/model/templates/tester-response-template.model.spec.ts b/tests/model/templates/tester-response-template.model.spec.ts
index 20e9074e4..3957746d7 100644
--- a/tests/model/templates/tester-response-template.model.spec.ts
+++ b/tests/model/templates/tester-response-template.model.spec.ts
@@ -1,4 +1,4 @@
-import { TesterResponseTemplate } from '../../../src/app/core/models/templates/tester-response-template.model';
+import { TesterResponseParser, TesterResponseTemplate } from '../../../src/app/core/models/templates/tester-response-template.model';
 
 import { TEAM_RESPONSE_MULTIPLE_DISAGREEMENT } from '../../constants/githubcomment.constants';
 
@@ -16,6 +16,35 @@ const DISAGREE_REASON = '[replace this with your reason]';
 const ISSUE_SEVERITY_DESCRIPTION = 'Team chose [`severity.Low`]\nOriginally [`severity.High`]';
 const ISSUE_TYPE_DESCRIPTION = 'Team chose [`type.DocumentationBug`]\nOriginally [`type.FunctionalityBug`]';
 
+describe('TesterResponseParser', () => {
+  describe('testerDisagree, teamChosenSeverity and teamChosenType fields', () => {
+    it('fields are parsed correctly from the body of the GithubComment', () => {
+      const result = TesterResponseParser.run(TEAM_RESPONSE_MULTIPLE_DISAGREEMENT.body).result;
+
+      expect(result.testerDisagree).toBe(false);
+      expect(result.teamChosenSeverity).toBe(SEVERITY_LOW);
+      expect(result.teamChosenType).toBe(TYPE_DOCUMENTATION_BUG);
+    });
+  });
+  describe('testerResponse and teamResponse fields', () => {
+    it('parses the fields correctly from the body of the GithubComment', () => {
+      const result = TesterResponseParser.run(TEAM_RESPONSE_MULTIPLE_DISAGREEMENT.body).result;
+
+      expect(result.teamResponse).toBe(EXPECTED_TEAM_RESPONSE_CONTENT);
+
+      expect(result.testerResponses[0].title).toBe(ISSUE_SEVERITY_TITLE);
+      expect(result.testerResponses[0].description).toBe(ISSUE_SEVERITY_DESCRIPTION);
+      expect(result.testerResponses[0].disagreeCheckbox.toString()).toBe(DISAGREE_CHECKBOX);
+      expect(result.testerResponses[0].reasonForDisagreement).toBe(DISAGREE_REASON);
+
+      expect(result.testerResponses[1].title).toBe(ISSUE_TYPE_TITLE);
+      expect(result.testerResponses[1].description).toBe(ISSUE_TYPE_DESCRIPTION);
+      expect(result.testerResponses[1].disagreeCheckbox.toString()).toBe(DISAGREE_CHECKBOX);
+      expect(result.testerResponses[1].reasonForDisagreement).toBe(DISAGREE_REASON);
+    });
+  });
+});
+
 describe('TesterResponseTemplate class', () => {
   describe('teamChosenType and teamChosenSeverity fields', () => {
     it('parses the teamChosenType and teamChosenSeverity values correctly from the GithubComment', () => {
diff --git a/tests/model/templates/tutor-moderation-issue-template.model.spec.ts b/tests/model/templates/tutor-moderation-issue-template.model.spec.ts
new file mode 100644
index 000000000..f450126a8
--- /dev/null
+++ b/tests/model/templates/tutor-moderation-issue-template.model.spec.ts
@@ -0,0 +1,44 @@
+import {
+  TutorModerationIssueParser,
+  TutorModerationIssueTemplate
+} from '../../../src/app/core/models/templates/tutor-moderation-issue-template.model';
+
+import { ISSUE_PENDING_MODERATION } from '../../constants/githubissue.constants';
+
+const EXPECTED_ISSUE_DESCRIPTION = '{original issue description}';
+const EXPECTED_TEAM_RESPONSE = "{team's response}";
+const EXPECTED_DISPUTE_DESCRIPTION =
+  "### Team says:\r\n{the team's action that is being disputed}\r\n\r\n" + "### Tester says:\r\n{tester's objection}";
+const TYPE_TITLE = 'Issue Type';
+const SEVERITY_TITLE = 'Issue Severity';
+const NOT_RELATED_TITLE = 'Not Related Question';
+
+describe('TutorModerationIssueParser', () => {
+  it('parses the issue description and team response correctly', () => {
+    const result = TutorModerationIssueParser.run(ISSUE_PENDING_MODERATION.body).result;
+
+    expect(result.description).toBe(EXPECTED_ISSUE_DESCRIPTION);
+    expect(result.teamResponse).toBe(EXPECTED_TEAM_RESPONSE);
+  });
+  it('parses the issue disputes correctly', () => {
+    const result = TutorModerationIssueParser.run(ISSUE_PENDING_MODERATION.body).result;
+
+    expect(result.issueDisputes[0].title).toBe(TYPE_TITLE);
+    expect(result.issueDisputes[0].description).toBe(EXPECTED_DISPUTE_DESCRIPTION);
+
+    expect(result.issueDisputes[1].title).toBe(SEVERITY_TITLE);
+    expect(result.issueDisputes[1].description).toBe(EXPECTED_DISPUTE_DESCRIPTION);
+
+    expect(result.issueDisputes[2].title).toBe(NOT_RELATED_TITLE);
+    expect(result.issueDisputes[2].description).toBe(EXPECTED_DISPUTE_DESCRIPTION);
+  });
+});
+
+describe('TutorModerationIssueTemplate class', () => {
+  it('parses a tutor moderation issue successfully', () => {
+    const template = new TutorModerationIssueTemplate(ISSUE_PENDING_MODERATION);
+
+    expect(template.description.content).toBe(EXPECTED_ISSUE_DESCRIPTION);
+    expect(template.teamResponse.content).toBe(EXPECTED_TEAM_RESPONSE);
+  });
+});
diff --git a/tests/model/templates/tutor-moderation-todo-template.model.spec.ts b/tests/model/templates/tutor-moderation-todo-template.model.spec.ts
new file mode 100644
index 000000000..67a4766c1
--- /dev/null
+++ b/tests/model/templates/tutor-moderation-todo-template.model.spec.ts
@@ -0,0 +1,46 @@
+import {
+  TutorModerationTodoParser,
+  TutorModerationTodoTemplate
+} from '../../../src/app/core/models/templates/tutor-moderation-todo-template.model';
+
+import { PENDING_TUTOR_MODERATION } from '../../constants/githubcomment.constants';
+
+const EMPTY_DONE_CHECKBOX = '- [ ] Done';
+const FILLED_DONE_CHECKBOX = '- [x] Done';
+const DEFAULT_TUTOR_RESPONSE = '[replace this with your explanation]';
+const TEST_TUTOR_RESPONSE = 'test';
+const DEFAULT_DESCRIPTION = EMPTY_DONE_CHECKBOX + '\n\n' + DEFAULT_TUTOR_RESPONSE;
+const TEST_DESCRIPTION = FILLED_DONE_CHECKBOX + '\n\n' + TEST_TUTOR_RESPONSE;
+
+const TYPE_TITLE = 'Issue Type';
+const SEVERITY_TITLE = 'Issue Severity';
+const NOT_RELATED_TITLE = 'Not Related Question';
+
+describe('TutorModerationTodoParser', () => {
+  it('parses comment body correctly', () => {
+    const result = TutorModerationTodoParser.run(PENDING_TUTOR_MODERATION.body).result;
+
+    expect(result.disputesToResolve[0].title).toBe(TYPE_TITLE);
+    expect(result.disputesToResolve[0].description).toBe(TEST_DESCRIPTION);
+    expect(result.disputesToResolve[0].todo.isChecked).toBe(true);
+    expect(result.disputesToResolve[0].tutorResponse).toBe(TEST_TUTOR_RESPONSE);
+
+    expect(result.disputesToResolve[1].title).toBe(SEVERITY_TITLE);
+    expect(result.disputesToResolve[1].description).toBe(DEFAULT_DESCRIPTION);
+    expect(result.disputesToResolve[1].todo.isChecked).toBe(false);
+    expect(result.disputesToResolve[1].tutorResponse).toBe(DEFAULT_TUTOR_RESPONSE);
+
+    expect(result.disputesToResolve[2].title).toBe(NOT_RELATED_TITLE);
+    expect(result.disputesToResolve[2].description).toBe(DEFAULT_DESCRIPTION);
+    expect(result.disputesToResolve[2].todo.isChecked).toBe(false);
+    expect(result.disputesToResolve[2].tutorResponse).toBe(DEFAULT_TUTOR_RESPONSE);
+  });
+});
+
+describe('TutorModerationTodoTemplate', () => {
+  it('parses the github comment successfully', () => {
+    const template = new TutorModerationTodoTemplate([PENDING_TUTOR_MODERATION]);
+
+    expect(template.parseFailure).not.toBe(true);
+  });
+});

From 2ecaa0f6d142edef873bf84ec868853b5dae1bd8 Mon Sep 17 00:00:00 2001
From: Gabriel Goh <77230723+gycgabriel@users.noreply.github.com>
Date: Tue, 12 Apr 2022 15:58:46 +0800
Subject: [PATCH 08/13] Upload multiple files on drag and drop (#918)

Drag and drop files allows drag and drop of multiple files but only
uploads one file.

Let's fix drag and drop files to allow multiple file uploading.
---
 .../comment-editor.component.ts               | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/app/shared/comment-editor/comment-editor.component.ts b/src/app/shared/comment-editor/comment-editor.component.ts
index e48142293..59cedf731 100644
--- a/src/app/shared/comment-editor/comment-editor.component.ts
+++ b/src/app/shared/comment-editor/comment-editor.component.ts
@@ -3,12 +3,14 @@ import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angu
 import { AbstractControl, FormGroup } from '@angular/forms';
 import * as DOMPurify from 'dompurify';
 import { ErrorHandlingService } from '../../core/services/error-handling.service';
+import { LoggingService } from '../../core/services/logging.service';
 import { FILE_TYPE_SUPPORT_ERROR, getSizeExceedErrorMsg, SUPPORTED_FILE_TYPES, UploadService } from '../../core/services/upload.service';
 
 const DISPLAYABLE_CONTENT = ['gif', 'jpeg', 'jpg', 'png'];
 const BYTES_PER_MB = 1024 * 1024;
 const SHOWN_MAX_UPLOAD_SIZE_MB = 10;
 const SHOWN_MAX_VIDEO_UPLOAD_SIZE_MB = 5;
+const TIME_BETWEEN_UPLOADS_MS = 250;
 
 const MAX_UPLOAD_SIZE = (SHOWN_MAX_UPLOAD_SIZE_MB + 1) * BYTES_PER_MB; // 11MB to allow 10.x MB
 const MAX_VIDEO_UPLOAD_SIZE = (SHOWN_MAX_VIDEO_UPLOAD_SIZE_MB + 1) * BYTES_PER_MB; // 6MB to allow 5.x MB
@@ -21,7 +23,7 @@ const MAX_VIDEO_UPLOAD_SIZE = (SHOWN_MAX_VIDEO_UPLOAD_SIZE_MB + 1) * BYTES_PER_M
 export class CommentEditorComponent implements OnInit {
   readonly SUPPORTED_FILE_TYPES = SUPPORTED_FILE_TYPES;
 
-  constructor(private uploadService: UploadService, private errorHandlingService: ErrorHandlingService) {}
+  constructor(private uploadService: UploadService, private errorHandlingService: ErrorHandlingService, private logger: LoggingService) {}
 
   @Input() commentField: AbstractControl; // Compulsory Input
   @Input() commentForm: FormGroup; // Compulsory Input
@@ -101,9 +103,18 @@ export class CommentEditorComponent implements OnInit {
     }
 
     const files = event.dataTransfer.files;
-    if (files.length > 0) {
-      this.readAndUploadFile(files[0]);
-      this.commentTextArea.nativeElement.focus();
+
+    if (files === undefined || files.length <= 0) {
+      return;
+    }
+
+    this.commentTextArea.nativeElement.focus();
+
+    for (let i = 0; i < files.length; i++) {
+      setTimeout(() => {
+        this.logger.info(`File ${i + 1} of ${files.length}. Begin uploading ${files[i].name}.`);
+        this.readAndUploadFile(files[i]);
+      }, TIME_BETWEEN_UPLOADS_MS * i);
     }
   }
 

From b09883541c8742b92e1c4b66d8af526613f9772f Mon Sep 17 00:00:00 2001
From: Lee Chun Wei <47494777+chunweii@users.noreply.github.com>
Date: Wed, 13 Apr 2022 14:10:26 +0800
Subject: [PATCH 09/13] Change dup option error text (#921)

A previous PR caused the duplicate error text message in the selection menu
to be rolled back to the old message.

Let's change it back so that the message becomes 'Duplicate of #x'.
---
 src/app/shared/issue/duplicateOf/duplicate-of.component.ts      | 2 +-
 .../view-issue/new-team-response/new-team-response.component.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/shared/issue/duplicateOf/duplicate-of.component.ts b/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
index 7f3e8153e..af7fd5d93 100644
--- a/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
+++ b/src/app/shared/issue/duplicateOf/duplicate-of.component.ts
@@ -91,7 +91,7 @@ export class DuplicateOfComponent implements OnInit, OnDestroy {
   }
 
   getDisabledDupOptionErrorText(issue: Issue): string {
-    return this.dupIssueOptionIsDisabled(issue) ? 'A duplicated issue' : '';
+    return this.dupIssueOptionIsDisabled(issue) ? 'Duplicate of #' + issue.duplicateOf : '';
   }
 
   handleCheckboxChange(event) {
diff --git a/src/app/shared/view-issue/new-team-response/new-team-response.component.ts b/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
index a3dce6fd9..e35b23566 100644
--- a/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
+++ b/src/app/shared/view-issue/new-team-response/new-team-response.component.ts
@@ -179,7 +179,7 @@ export class NewTeamResponseComponent implements OnInit, OnDestroy {
   }
 
   getDisabledDupOptionErrorText(issue: Issue): string {
-    return this.dupIssueOptionIsDisabled(issue) ? 'A duplicated issue' : '';
+    return this.dupIssueOptionIsDisabled(issue) ? 'Duplicate of #' + issue.duplicateOf : '';
   }
 
   handleChangeOfDuplicateCheckbox(event: MatCheckboxChange) {

From 5d4516716b9cfa44721da46b0040539f220632f3 Mon Sep 17 00:00:00 2001
From: "Lee Xiong Jie, Isaac" <68138671+luminousleek@users.noreply.github.com>
Date: Fri, 15 Apr 2022 15:00:59 +0800
Subject: [PATCH 10/13] Integrate arcsecond parsers and remove Section (#920)

Integrate arcsecond parsers and remove Section

The arcsecond parsers are only used for checking if a comment or issue
matches the respective template, and extracting the relevant
information is still being done by Section and its related classes.

Let's use the parsers to extract the information instead, and remove
the dependencies on Section and its subclasses. This allows us to
completely remove regex from the parsing of Github issues and comments.
Let's also update the Issue class and the relevant tests.

Lastly, let's change the name of some folders to better reflect their contents.
---
 src/app/core/models/issue.model.ts            |  32 +++---
 .../common-parsers.model.ts                   |   4 +-
 .../issue-dispute-section-parser.model.ts     |   0
 .../moderation-section-parser.model.ts        |   0
 .../tester-response-section-parser.model.ts   |   0
 .../sections/duplicate-of-section.model.ts    |  25 ----
 .../sections/issue-dispute-section.model.ts   |  29 -----
 .../sections/moderation-section.model.ts      |  39 -------
 .../templates/sections/section.model.ts       |  42 -------
 .../sections/tester-response-section.model.ts | 107 ------------------
 .../templates/team-accepted-template.model.ts |   5 +-
 .../templates/team-response-template.model.ts |  29 ++---
 .../core/models/templates/template.model.ts   |  52 +++------
 .../tester-response-template.model.ts         |  36 ++----
 .../tutor-moderation-issue-template.model.ts  |  45 +++-----
 .../tutor-moderation-todo-template.model.ts   |  19 +---
 .../models/{parser => users}/admins.model.ts  |   0
 .../parsed-user-data.model.ts                 |   0
 .../models/{parser => users}/roles.model.ts   |   0
 .../{parser => users}/students.model.ts       |   0
 .../tabulated-user-data.model.ts              |   0
 .../models/{parser => users}/teams.model.ts   |   0
 .../models/{parser => users}/tutors.model.ts  |   0
 src/app/core/services/data.service.ts         |  14 +--
 ...issue-dispute-section-parser.model.spec.ts |   2 +-
 .../moderation-section-parser.model.spec.ts   |   2 +-
 ...ster-response-section-parser.model.spec.ts |   2 +-
 .../team-response-template.model.spec.ts      |   7 +-
 .../tester-response-template.model.spec.ts    |  20 ++--
 ...or-moderation-issue-template.model.spec.ts |   4 +-
 ...tor-moderation-todo-template.model.spec.ts |  15 ++-
 31 files changed, 111 insertions(+), 419 deletions(-)
 rename src/app/core/models/templates/{sections => section-parsers}/common-parsers.model.ts (81%)
 rename src/app/core/models/templates/{sections => section-parsers}/issue-dispute-section-parser.model.ts (100%)
 rename src/app/core/models/templates/{sections => section-parsers}/moderation-section-parser.model.ts (100%)
 rename src/app/core/models/templates/{sections => section-parsers}/tester-response-section-parser.model.ts (100%)
 delete mode 100644 src/app/core/models/templates/sections/duplicate-of-section.model.ts
 delete mode 100644 src/app/core/models/templates/sections/issue-dispute-section.model.ts
 delete mode 100644 src/app/core/models/templates/sections/moderation-section.model.ts
 delete mode 100644 src/app/core/models/templates/sections/section.model.ts
 delete mode 100644 src/app/core/models/templates/sections/tester-response-section.model.ts
 rename src/app/core/models/{parser => users}/admins.model.ts (100%)
 rename src/app/core/models/{parser => users}/parsed-user-data.model.ts (100%)
 rename src/app/core/models/{parser => users}/roles.model.ts (100%)
 rename src/app/core/models/{parser => users}/students.model.ts (100%)
 rename src/app/core/models/{parser => users}/tabulated-user-data.model.ts (100%)
 rename src/app/core/models/{parser => users}/teams.model.ts (100%)
 rename src/app/core/models/{parser => users}/tutors.model.ts (100%)

diff --git a/src/app/core/models/issue.model.ts b/src/app/core/models/issue.model.ts
index 6811373dd..287185f0c 100644
--- a/src/app/core/models/issue.model.ts
+++ b/src/app/core/models/issue.model.ts
@@ -137,8 +137,8 @@ export class Issue {
 
     issue.teamResponseError = template.parseFailure;
     issue.issueComment = template.comment;
-    issue.teamResponse = template.teamResponse && Issue.updateTeamResponse(template.teamResponse.content);
-    issue.duplicateOf = template.duplicateOf && template.duplicateOf.issueNumber;
+    issue.teamResponse = template.teamResponse;
+    issue.duplicateOf = template.duplicateOf;
     issue.duplicated = issue.duplicateOf !== undefined && issue.duplicateOf !== null;
 
     return issue;
@@ -153,8 +153,8 @@ export class Issue {
     issue.testerResponseError = testerResponseTemplate.parseFailure && teamAcceptedTemplate.parseFailure;
     issue.teamAccepted = teamAcceptedTemplate.teamAccepted;
     issue.issueComment = testerResponseTemplate.comment;
-    issue.teamResponse = testerResponseTemplate.teamResponse && Issue.updateTeamResponse(testerResponseTemplate.teamResponse.content);
-    issue.testerResponses = testerResponseTemplate.testerResponse && testerResponseTemplate.testerResponse.testerResponses;
+    issue.teamResponse = testerResponseTemplate.teamResponse;
+    issue.testerResponses = testerResponseTemplate.testerResponses;
     issue.testerDisagree = testerResponseTemplate.testerDisagree;
 
     issue.teamChosenSeverity = testerResponseTemplate.teamChosenSeverity || null;
@@ -170,13 +170,13 @@ export class Issue {
 
     issue.githubComments = githubIssue.comments;
     issue.teamAssigned = teamData;
-    issue.description = issueTemplate.description.content;
-    issue.teamResponse = issueTemplate.teamResponse && Issue.updateTeamResponse(issueTemplate.teamResponse.content);
-    issue.issueDisputes = issueTemplate.dispute.disputes;
+    issue.description = issueTemplate.description;
+    issue.teamResponse = issueTemplate.teamResponse;
+    issue.issueDisputes = issueTemplate.disputes;
 
-    if (todoTemplate.moderation && todoTemplate.comment) {
-      issue.issueDisputes = todoTemplate.moderation.disputesToResolve.map((dispute, i) => {
-        dispute.description = issueTemplate.dispute.disputes[i].description;
+    if (todoTemplate.disputesToResolve && todoTemplate.comment) {
+      issue.issueDisputes = todoTemplate.disputesToResolve.map((dispute, i) => {
+        dispute.description = issueTemplate.disputes[i].description;
         return dispute;
       });
       issue.issueComment = todoTemplate.comment;
@@ -240,8 +240,8 @@ export class Issue {
   updateTesterResponse(githubComment: GithubComment): void {
     const template = new TesterResponseTemplate([githubComment]);
     this.issueComment = template.comment;
-    this.teamResponse = template.teamResponse && template.teamResponse.content;
-    this.testerResponses = template.testerResponse && template.testerResponse.testerResponses;
+    this.teamResponse = template.teamResponse;
+    this.testerResponses = template.testerResponses;
   }
 
   /**
@@ -251,7 +251,7 @@ export class Issue {
   updateDispute(githubComment: GithubComment): void {
     const todoTemplate = new TutorModerationTodoTemplate([githubComment]);
     this.issueComment = todoTemplate.comment;
-    this.issueDisputes = todoTemplate.moderation.disputesToResolve.map((dispute, i) => {
+    this.issueDisputes = todoTemplate.disputesToResolve.map((dispute, i) => {
       dispute.description = this.issueDisputes[i].description;
       return dispute;
     });
@@ -272,8 +272,10 @@ export class Issue {
   // Template url: https://github.com/CATcher-org/templates#tutor-moderation
   createGithubTutorResponse(): string {
     let tutorResponseString = '# Tutor Moderation\n\n';
-    for (const issueDispute of this.issueDisputes) {
-      tutorResponseString += issueDispute.toTutorResponseString();
+    if (this.issueDisputes !== undefined) {
+      for (const issueDispute of this.issueDisputes) {
+        tutorResponseString += issueDispute.toTutorResponseString();
+      }
     }
     return tutorResponseString;
   }
diff --git a/src/app/core/models/templates/sections/common-parsers.model.ts b/src/app/core/models/templates/section-parsers/common-parsers.model.ts
similarity index 81%
rename from src/app/core/models/templates/sections/common-parsers.model.ts
rename to src/app/core/models/templates/section-parsers/common-parsers.model.ts
index 9ab039e08..7edc0b34b 100644
--- a/src/app/core/models/templates/sections/common-parsers.model.ts
+++ b/src/app/core/models/templates/section-parsers/common-parsers.model.ts
@@ -1,14 +1,14 @@
 const { char, choice, coroutine, everyCharUntil, str, whitespace } = require('arcsecond');
 
 const TEAM_RESPONSE_HEADER = "# Team's Response";
+const DEFAULT_TEAM_RESPONSE = 'No details provided by team.';
 
 export function buildTeamResponseSectionParser(nextHeader: string) {
   return coroutine(function* () {
     yield str(TEAM_RESPONSE_HEADER);
     yield whitespace;
     const teamResponse = yield everyCharUntil(str(nextHeader));
-
-    return teamResponse.trim();
+    return teamResponse.trim() ? teamResponse.trim() : DEFAULT_TEAM_RESPONSE;
   });
 }
 
diff --git a/src/app/core/models/templates/sections/issue-dispute-section-parser.model.ts b/src/app/core/models/templates/section-parsers/issue-dispute-section-parser.model.ts
similarity index 100%
rename from src/app/core/models/templates/sections/issue-dispute-section-parser.model.ts
rename to src/app/core/models/templates/section-parsers/issue-dispute-section-parser.model.ts
diff --git a/src/app/core/models/templates/sections/moderation-section-parser.model.ts b/src/app/core/models/templates/section-parsers/moderation-section-parser.model.ts
similarity index 100%
rename from src/app/core/models/templates/sections/moderation-section-parser.model.ts
rename to src/app/core/models/templates/section-parsers/moderation-section-parser.model.ts
diff --git a/src/app/core/models/templates/sections/tester-response-section-parser.model.ts b/src/app/core/models/templates/section-parsers/tester-response-section-parser.model.ts
similarity index 100%
rename from src/app/core/models/templates/sections/tester-response-section-parser.model.ts
rename to src/app/core/models/templates/section-parsers/tester-response-section-parser.model.ts
diff --git a/src/app/core/models/templates/sections/duplicate-of-section.model.ts b/src/app/core/models/templates/sections/duplicate-of-section.model.ts
deleted file mode 100644
index 86f7f9fa0..000000000
--- a/src/app/core/models/templates/sections/duplicate-of-section.model.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Section, SectionalDependency } from './section.model';
-
-export class DuplicateOfSection extends Section {
-  private readonly duplicateOfRegex = /Duplicate of\s*#(\d+)/i;
-  issueNumber: number;
-
-  constructor(sectionalDependency: SectionalDependency, unprocessedContent: string) {
-    super(sectionalDependency, unprocessedContent);
-    if (!this.parseError) {
-      this.issueNumber = this.parseDuplicateOfValue(this.content);
-    }
-  }
-
-  private parseDuplicateOfValue(toParse): number {
-    const result = this.duplicateOfRegex.exec(toParse);
-    return result ? +result[1] : null;
-  }
-
-  toString(): string {
-    let toString = '';
-    toString += `${this.header}\n`;
-    toString += this.parseError ? '--' : `Duplicate of ${this.issueNumber}\n`;
-    return toString;
-  }
-}
diff --git a/src/app/core/models/templates/sections/issue-dispute-section.model.ts b/src/app/core/models/templates/sections/issue-dispute-section.model.ts
deleted file mode 100644
index e99abeb28..000000000
--- a/src/app/core/models/templates/sections/issue-dispute-section.model.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { IssueDispute } from '../../issue-dispute.model';
-import { Section, SectionalDependency } from './section.model';
-
-export class IssueDisputeSection extends Section {
-  disputes: IssueDispute[] = [];
-
-  constructor(sectionalDependency: SectionalDependency, unprocessedContent: string) {
-    super(sectionalDependency, unprocessedContent);
-    if (!this.parseError) {
-      let matches;
-      const regex = /#{2} *:question: *(.*)[\r\n]*([\s\S]*?(?=-{19}))/gi;
-      while ((matches = regex.exec(this.content))) {
-        if (matches) {
-          const [_regexString, title, description] = matches;
-          this.disputes.push(new IssueDispute(title, description.trim()));
-        }
-      }
-    }
-  }
-
-  toString(): string {
-    let toString = '';
-    toString += `${this.header.toString()}\n`;
-    for (const dispute of this.disputes) {
-      toString += `${dispute.toString()}\n`;
-    }
-    return toString;
-  }
-}
diff --git a/src/app/core/models/templates/sections/moderation-section.model.ts b/src/app/core/models/templates/sections/moderation-section.model.ts
deleted file mode 100644
index edde99a27..000000000
--- a/src/app/core/models/templates/sections/moderation-section.model.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Checkbox } from '../../checkbox.model';
-import { IssueDispute } from '../../issue-dispute.model';
-import { Section, SectionalDependency } from './section.model';
-
-export class ModerationSection extends Section {
-  disputesToResolve: IssueDispute[] = [];
-
-  constructor(sectionalDependency: SectionalDependency, unprocessedContent: string) {
-    super(sectionalDependency, unprocessedContent);
-    if (!this.parseError) {
-      let matches;
-      const regex = /#{2} *:question: *(.*)[\n\r]*(.*)[\n\r]*([\s\S]*?(?=-{19}))/gi;
-      while ((matches = regex.exec(this.content))) {
-        if (matches) {
-          const [_regexString, title, todo, tutorResponse] = matches;
-          const description = `${todo}\n${tutorResponse}`;
-          const newDispute = new IssueDispute(title, description);
-
-          newDispute.todo = new Checkbox(todo, false);
-          newDispute.tutorResponse = tutorResponse.trim();
-          this.disputesToResolve.push(newDispute);
-        }
-      }
-    }
-  }
-
-  get todoList(): Checkbox[] {
-    return this.disputesToResolve.map((e) => e.todo);
-  }
-
-  toString(): string {
-    let toString = '';
-    toString += `${this.header.toString()}\n`;
-    for (const dispute of this.disputesToResolve) {
-      toString += `${dispute.toTutorResponseString()}\n`;
-    }
-    return toString;
-  }
-}
diff --git a/src/app/core/models/templates/sections/section.model.ts b/src/app/core/models/templates/sections/section.model.ts
deleted file mode 100644
index 1d6bf3a7a..000000000
--- a/src/app/core/models/templates/sections/section.model.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * A SectionalDependency defines a format that is needed to create a successful Section in a template.
- * It will require the Section's header to be defined and the other headers that are present in the template.
- *
- * Reason for the dependencies on other headers: We need them to create a regex expression that is capable of parsing the current
- *                                               section out of the string.
- */
-import { Header } from '../template.model';
-
-export interface SectionalDependency {
-  sectionHeader: Header;
-  remainingTemplateHeaders: Header[];
-}
-
-export class Section {
-  header: Header;
-  sectionRegex: RegExp;
-  content: string;
-  parseError: string;
-
-  /**
-   *
-   * @param sectionalDependency The dependency that is need to create a section's regex
-   * @param unprocessedContent The string that stores the section's amongst other things
-   */
-  constructor(sectionalDependency: SectionalDependency, unprocessedContent: string) {
-    this.header = sectionalDependency.sectionHeader;
-    // If length === 0, match till end of string else match till regex hits another section
-    const matchTillRegex =
-      sectionalDependency.remainingTemplateHeaders.length === 0 ? '$' : sectionalDependency.remainingTemplateHeaders.join('|');
-    this.sectionRegex = new RegExp(`(${this.header})\\s+([\\s\\S]*?)(?=${matchTillRegex}|$)`, 'i');
-    const matches = this.sectionRegex.exec(unprocessedContent);
-    if (matches) {
-      const [_originalString, _header, description] = matches;
-      this.content = description.trim();
-      this.parseError = null;
-    } else {
-      this.content = null;
-      this.parseError = `Unable to extract ${this.header.name} Section`;
-    }
-  }
-}
diff --git a/src/app/core/models/templates/sections/tester-response-section.model.ts b/src/app/core/models/templates/sections/tester-response-section.model.ts
deleted file mode 100644
index e6809bef2..000000000
--- a/src/app/core/models/templates/sections/tester-response-section.model.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { extractStringBetween } from '../../../../shared/lib/string-utils';
-import { TesterResponse } from '../../tester-response.model';
-import { Section, SectionalDependency } from './section.model';
-
-// match format e.g. ## :question: Issue Title
-const matchTitle = '#{2} *:question: *([\\w ]+)';
-// match format e.g. Team Chose severity.Low \r\n Originally (or Team Chose) severity.High \r\n
-const matchDescription = '(Team Chose.*[\\r\\n]* *Originally.*|Team Chose.*[\\r\\n]*)';
-// match format e.g. - [x] (or - [ ]) **Reason for disagreement:** disagreement explanation
-const matchDisagreement = '(- \\[x? ?\\] I disagree)[\\r\\n]*\\*\\*Reason *for *disagreement:\\*\\* *([\\s\\S]*?)';
-const matchLinebreak = '[\\n\\r]-{19}';
-
-export class TesterResponseSection extends Section {
-  testerResponses: TesterResponse[] = [];
-  testerDisagree: boolean;
-  teamChosenSeverity?: string;
-  teamChosenType?: string;
-
-  ISSUE_SEVERITY_DISPUTE = 'Issue severity';
-  ISSUE_TYPE_DISPUTE = 'Issue type';
-  TEAM_RESPONSE_DESCRIPTION_TYPE_VALUE_PREFIX = '[`type.';
-  TEAM_RESPONSE_DESCRIPTION_SEVERITY_VALUE_PREFIX = '[`severity.';
-  TEAM_RESPONSE_DESCRIPTION_VALUE_SUFFIX = '`]';
-
-  constructor(sectionalDependency: SectionalDependency, unprocessedContent: string) {
-    super(sectionalDependency, unprocessedContent);
-    if (!this.parseError) {
-      let matches;
-      const regex: RegExp = new RegExp([matchTitle, matchDescription, matchDisagreement].join('[\\r\\n]*') + matchLinebreak, 'gi');
-      while ((matches = regex.exec(this.content))) {
-        if (matches) {
-          const [_, title, description, disagreeCheckbox, reasonForDisagreement] = matches;
-
-          if (this.isSeverityDispute(title)) {
-            this.teamChosenSeverity = this.parseTeamChosenSeverity(description);
-          } else if (this.isTypeDispute(title)) {
-            this.teamChosenType = this.parseTeamChosenType(description);
-          }
-
-          const disagreeCheckboxValue = this.parseCheckboxValue(disagreeCheckbox);
-          if (disagreeCheckboxValue) {
-            this.testerDisagree = true; // on any disagree, overall disagree with team response
-          }
-
-          this.testerResponses.push(
-            new TesterResponse(
-              title,
-              description,
-              this.parseCheckboxDescription(disagreeCheckbox),
-              disagreeCheckboxValue,
-              reasonForDisagreement.trim()
-            )
-          );
-        }
-      }
-    }
-  }
-
-  isSeverityDispute(title: string): boolean {
-    return title.trim() === this.ISSUE_SEVERITY_DISPUTE;
-  }
-
-  isTypeDispute(title: string): boolean {
-    return title.trim() === this.ISSUE_TYPE_DISPUTE;
-  }
-
-  getTeamChosenType(): string {
-    return this.teamChosenType;
-  }
-
-  getTeamChosenSeverity(): string {
-    return this.teamChosenSeverity;
-  }
-
-  getTesterDisagree(): boolean {
-    return this.testerDisagree;
-  }
-
-  parseTeamChosenSeverity(description: string): string {
-    return extractStringBetween(
-      description,
-      this.TEAM_RESPONSE_DESCRIPTION_SEVERITY_VALUE_PREFIX,
-      this.TEAM_RESPONSE_DESCRIPTION_VALUE_SUFFIX
-    );
-  }
-
-  parseTeamChosenType(description: string): string {
-    return extractStringBetween(description, this.TEAM_RESPONSE_DESCRIPTION_TYPE_VALUE_PREFIX, this.TEAM_RESPONSE_DESCRIPTION_VALUE_SUFFIX);
-  }
-
-  parseCheckboxValue(checkboxString: string): boolean {
-    return checkboxString.charAt(3) === 'x'; // checkboxString in the format of - [x] or - [ ]
-  }
-
-  parseCheckboxDescription(checkboxString: string): string {
-    return checkboxString.substring(6).trim(); // checkboxString has a fixed 5 characters at the start before the description
-  }
-
-  toString(): string {
-    let toString = '';
-    toString += `${this.header.toString()}\n`;
-    for (const response of this.testerResponses) {
-      toString += `${response.toString()}\n`;
-    }
-    return toString;
-  }
-}
diff --git a/src/app/core/models/templates/team-accepted-template.model.ts b/src/app/core/models/templates/team-accepted-template.model.ts
index b208fd39d..9b3d2d404 100644
--- a/src/app/core/models/templates/team-accepted-template.model.ts
+++ b/src/app/core/models/templates/team-accepted-template.model.ts
@@ -1,10 +1,9 @@
 import { GithubComment } from '../github/github-comment.model';
-import { Header, Template } from './template.model';
+import { Template } from './template.model';
 
 const { endOfInput, sequenceOf, startOfInput, str } = require('arcsecond');
 
 export const TeamAcceptedMessage = 'Your response not required for this bug as the team has accepted the bug as it is.';
-export const TeamAcceptedHeader = { teamAccepted: new Header(TeamAcceptedMessage, 0) };
 
 const TeamAcceptedParser = sequenceOf([startOfInput, str(TeamAcceptedMessage), endOfInput]);
 
@@ -12,7 +11,7 @@ export class TeamAcceptedTemplate extends Template {
   teamAccepted?: boolean;
 
   constructor(githubComments: GithubComment[]) {
-    super(TeamAcceptedParser, Object.values(TeamAcceptedHeader));
+    super(TeamAcceptedParser);
 
     this.findConformingComment(githubComments);
 
diff --git a/src/app/core/models/templates/team-response-template.model.ts b/src/app/core/models/templates/team-response-template.model.ts
index 6f74aa0f7..56d4ba0dd 100644
--- a/src/app/core/models/templates/team-response-template.model.ts
+++ b/src/app/core/models/templates/team-response-template.model.ts
@@ -1,17 +1,10 @@
 import { IssueComment } from '../comment.model';
 import { GithubComment } from '../github/github-comment.model';
-import { buildTeamResponseSectionParser } from './sections/common-parsers.model';
-import { DuplicateOfSection } from './sections/duplicate-of-section.model';
-import { Section } from './sections/section.model';
-import { Header, Template } from './template.model';
+import { buildTeamResponseSectionParser } from './section-parsers/common-parsers.model';
+import { Template } from './template.model';
 
 const { choice, coroutine, digits, str, whitespace } = require('arcsecond');
 
-export const TeamResponseHeaders = {
-  teamResponse: new Header("Team's Response", 1),
-  duplicateOf: new Header('Duplicate status \\(if any\\):', 2)
-};
-
 interface TeamResponseParseResult {
   teamResponse: string;
   issueNumber: number;
@@ -46,12 +39,12 @@ export const TeamResponseParser = coroutine(function* () {
 });
 
 export class TeamResponseTemplate extends Template {
-  teamResponse: Section;
-  duplicateOf: DuplicateOfSection;
+  teamResponse: string;
+  duplicateOf: number;
   comment: IssueComment;
 
   constructor(githubComments: GithubComment[]) {
-    super(TeamResponseParser, Object.values(TeamResponseHeaders));
+    super(TeamResponseParser);
 
     const templateConformingComment = this.findConformingComment(githubComments);
 
@@ -65,16 +58,8 @@ export class TeamResponseTemplate extends Template {
       createdAt: templateConformingComment.created_at,
       updatedAt: templateConformingComment.updated_at
     };
-    const commentsContent: string = templateConformingComment.body;
-    this.teamResponse = this.parseTeamResponse(commentsContent);
-    this.duplicateOf = this.parseDuplicateOf(commentsContent);
-  }
-
-  parseTeamResponse(toParse: string): Section {
-    return new Section(this.getSectionalDependency(TeamResponseHeaders.teamResponse), toParse);
-  }
 
-  parseDuplicateOf(toParse: string): DuplicateOfSection {
-    return new DuplicateOfSection(this.getSectionalDependency(TeamResponseHeaders.duplicateOf), toParse);
+    this.teamResponse = this.parseResult.teamResponse;
+    this.duplicateOf = this.parseResult.issueNumber;
   }
 }
diff --git a/src/app/core/models/templates/template.model.ts b/src/app/core/models/templates/template.model.ts
index d6d349b35..02576535d 100644
--- a/src/app/core/models/templates/template.model.ts
+++ b/src/app/core/models/templates/template.model.ts
@@ -1,58 +1,32 @@
 import { GithubComment } from '../github/github-comment.model';
-import { SectionalDependency } from './sections/section.model';
 
 export abstract class Template {
-  headers: Header[];
   parser;
+  parseResult;
   parseFailure: boolean;
 
-  protected constructor(parser, headers: Header[]) {
+  protected constructor(parser) {
     this.parser = parser;
-    this.headers = headers;
-  }
-
-  getSectionalDependency(header: Header): SectionalDependency {
-    const otherHeaders = this.headers.filter((e) => !e.equals(header));
-    return <SectionalDependency>{
-      sectionHeader: header,
-      remainingTemplateHeaders: otherHeaders
-    };
-  }
-
-  test(toTest: string): boolean {
-    return !this.parser.run(toTest).isError;
   }
 
   /**
    * Finds a comment that conforms to the template
    */
   findConformingComment(githubComments: GithubComment[]): GithubComment {
-    const templateConformingComment = githubComments.find((githubComment) => this.test(githubComment.body));
+    let templateConformingComment: GithubComment;
+
+    for (const comment of githubComments) {
+      const parsed = this.parser.run(comment.body);
+      if (!parsed.isError) {
+        this.parseResult = parsed.result;
+        templateConformingComment = comment;
+        break;
+      }
+    }
+
     if (templateConformingComment === undefined) {
       this.parseFailure = true;
     }
     return templateConformingComment;
   }
 }
-
-export class Header {
-  name: string;
-  headerHash: string;
-  prefix?: string;
-
-  constructor(name, headerSize, prefix: string = '') {
-    this.name = name;
-    this.headerHash = '#'.repeat(headerSize);
-    this.prefix = prefix;
-  }
-
-  toString(): string {
-    const prefix = this.prefix !== '' ? this.prefix + ' ' : '';
-    const headerHashPrefix = this.headerHash !== '' ? this.headerHash + ' ' : '';
-    return `${headerHashPrefix}${prefix}${this.name}`;
-  }
-
-  equals(section: Header): boolean {
-    return this.name === section.name;
-  }
-}
diff --git a/src/app/core/models/templates/tester-response-template.model.ts b/src/app/core/models/templates/tester-response-template.model.ts
index fc0e90184..1ce548cb3 100644
--- a/src/app/core/models/templates/tester-response-template.model.ts
+++ b/src/app/core/models/templates/tester-response-template.model.ts
@@ -1,19 +1,12 @@
 import { IssueComment } from '../comment.model';
 import { GithubComment } from '../github/github-comment.model';
 import { TesterResponse } from '../tester-response.model';
-import { buildTeamResponseSectionParser } from './sections/common-parsers.model';
-import { Section } from './sections/section.model';
-import { TesterResponseSectionParser } from './sections/tester-response-section-parser.model';
-import { TesterResponseSection } from './sections/tester-response-section.model';
-import { Header, Template } from './template.model';
+import { buildTeamResponseSectionParser } from './section-parsers/common-parsers.model';
+import { TesterResponseSectionParser } from './section-parsers/tester-response-section-parser.model';
+import { Template } from './template.model';
 
 const { coroutine, many1, str, whitespace } = require('arcsecond');
 
-export const TesterResponseHeaders = {
-  teamResponse: new Header("Team's Response", 1),
-  testerResponses: new Header('Items for the Tester to Verify', 1)
-};
-
 interface TesterResponseParseResult {
   teamResponse: string;
   testerResponses: TesterResponse[];
@@ -74,15 +67,15 @@ export const TesterResponseParser = coroutine(function* () {
 });
 
 export class TesterResponseTemplate extends Template {
-  teamResponse: Section;
-  testerResponse: TesterResponseSection;
+  teamResponse: string;
+  testerResponses: TesterResponse[];
   testerDisagree: boolean;
   comment: IssueComment;
   teamChosenSeverity?: string;
   teamChosenType?: string;
 
   constructor(githubComments: GithubComment[]) {
-    super(TesterResponseParser, Object.values(TesterResponseHeaders));
+    super(TesterResponseParser);
 
     const templateConformingComment = this.findConformingComment(githubComments);
 
@@ -94,18 +87,11 @@ export class TesterResponseTemplate extends Template {
       ...templateConformingComment,
       description: templateConformingComment.body
     };
-    this.teamResponse = this.parseTeamResponse(this.comment.description);
-    this.testerResponse = this.parseTesterResponse(this.comment.description);
-    this.testerDisagree = this.testerResponse.getTesterDisagree();
-    this.teamChosenSeverity = this.testerResponse.getTeamChosenSeverity();
-    this.teamChosenType = this.testerResponse.getTeamChosenType();
-  }
-
-  parseTeamResponse(toParse: string): Section {
-    return new Section(this.getSectionalDependency(TesterResponseHeaders.teamResponse), toParse);
-  }
 
-  parseTesterResponse(toParse: string): TesterResponseSection {
-    return new TesterResponseSection(this.getSectionalDependency(TesterResponseHeaders.testerResponses), toParse);
+    this.teamResponse = this.parseResult.teamResponse;
+    this.testerResponses = this.parseResult.testerResponses;
+    this.testerDisagree = this.parseResult.testerDisagree;
+    this.teamChosenSeverity = this.parseResult.teamChosenSeverity;
+    this.teamChosenType = this.parseResult.teamChosenType;
   }
 }
diff --git a/src/app/core/models/templates/tutor-moderation-issue-template.model.ts b/src/app/core/models/templates/tutor-moderation-issue-template.model.ts
index c5539437c..bb413ea1a 100644
--- a/src/app/core/models/templates/tutor-moderation-issue-template.model.ts
+++ b/src/app/core/models/templates/tutor-moderation-issue-template.model.ts
@@ -1,19 +1,11 @@
 import { GithubIssue } from '../github/github-issue.model';
 import { IssueDispute } from '../issue-dispute.model';
-import { buildTeamResponseSectionParser } from './sections/common-parsers.model';
-import { IssueDisputeSectionParser } from './sections/issue-dispute-section-parser.model';
-import { IssueDisputeSection } from './sections/issue-dispute-section.model';
-import { Section } from './sections/section.model';
-import { Header, Template } from './template.model';
+import { buildTeamResponseSectionParser } from './section-parsers/common-parsers.model';
+import { IssueDisputeSectionParser } from './section-parsers/issue-dispute-section-parser.model';
+import { Template } from './template.model';
 
 const { coroutine, everyCharUntil, many1, str, whitespace } = require('arcsecond');
 
-const tutorModerationIssueDescriptionHeaders = {
-  description: new Header('Issue Description', 1),
-  teamResponse: new Header("Team's Response", 1),
-  disputes: new Header('Disputes', 1)
-};
-
 interface TutorModerationIssueParseResult {
   description: string;
   teamResponse: string;
@@ -47,28 +39,23 @@ export const TutorModerationIssueParser = coroutine(function* () {
 });
 
 export class TutorModerationIssueTemplate extends Template {
-  description: Section;
-  teamResponse: Section;
-  dispute: IssueDisputeSection;
+  description: string;
+  teamResponse: string;
+  disputes: IssueDispute[];
 
   constructor(githubIssue: GithubIssue) {
-    super(TutorModerationIssueParser, Object.values(tutorModerationIssueDescriptionHeaders));
+    super(TutorModerationIssueParser);
 
-    const issueContent = githubIssue.body;
-    this.description = this.parseDescription(issueContent);
-    this.teamResponse = this.parseTeamResponse(issueContent);
-    this.dispute = this.parseDisputes(issueContent);
-  }
+    const parsed = TutorModerationIssueParser.run(githubIssue.body);
 
-  parseDescription(toParse: string): Section {
-    return new Section(this.getSectionalDependency(tutorModerationIssueDescriptionHeaders.description), toParse);
-  }
-
-  parseTeamResponse(toParse: string): Section {
-    return new Section(this.getSectionalDependency(tutorModerationIssueDescriptionHeaders.teamResponse), toParse);
-  }
+    if (parsed.isError) {
+      this.parseFailure = true;
+      return;
+    }
 
-  parseDisputes(toParse: string): IssueDisputeSection {
-    return new IssueDisputeSection(this.getSectionalDependency(tutorModerationIssueDescriptionHeaders.disputes), toParse);
+    this.parseResult = parsed.result;
+    this.description = this.parseResult.description;
+    this.teamResponse = this.parseResult.teamResponse;
+    this.disputes = this.parseResult.issueDisputes;
   }
 }
diff --git a/src/app/core/models/templates/tutor-moderation-todo-template.model.ts b/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
index 81e3669d1..b198a7eda 100644
--- a/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
+++ b/src/app/core/models/templates/tutor-moderation-todo-template.model.ts
@@ -1,16 +1,11 @@
 import { IssueComment } from '../comment.model';
 import { GithubComment } from '../github/github-comment.model';
 import { IssueDispute } from '../issue-dispute.model';
-import { ModerationSectionParser } from './sections/moderation-section-parser.model';
-import { ModerationSection } from './sections/moderation-section.model';
-import { Header, Template } from './template.model';
+import { ModerationSectionParser } from './section-parsers/moderation-section-parser.model';
+import { Template } from './template.model';
 
 const { coroutine, many1, str, whitespace } = require('arcsecond');
 
-const tutorModerationTodoHeaders = {
-  todo: new Header('Tutor Moderation', 1)
-};
-
 interface TutorModerationTodoParseResult {
   disputesToResolve: IssueDispute[];
 }
@@ -30,11 +25,11 @@ export const TutorModerationTodoParser = coroutine(function* () {
 });
 
 export class TutorModerationTodoTemplate extends Template {
-  moderation: ModerationSection;
+  disputesToResolve: IssueDispute[];
   comment: IssueComment;
 
   constructor(githubComments: GithubComment[]) {
-    super(TutorModerationTodoParser, Object.values(tutorModerationTodoHeaders));
+    super(TutorModerationTodoParser);
 
     const templateConformingComment = this.findConformingComment(githubComments);
 
@@ -46,10 +41,6 @@ export class TutorModerationTodoTemplate extends Template {
       ...templateConformingComment,
       description: templateConformingComment.body
     };
-    this.moderation = this.parseModeration(this.comment.description);
-  }
-
-  parseModeration(toParse: string): ModerationSection {
-    return new ModerationSection(this.getSectionalDependency(tutorModerationTodoHeaders.todo), toParse);
+    this.disputesToResolve = this.parseResult.disputesToResolve;
   }
 }
diff --git a/src/app/core/models/parser/admins.model.ts b/src/app/core/models/users/admins.model.ts
similarity index 100%
rename from src/app/core/models/parser/admins.model.ts
rename to src/app/core/models/users/admins.model.ts
diff --git a/src/app/core/models/parser/parsed-user-data.model.ts b/src/app/core/models/users/parsed-user-data.model.ts
similarity index 100%
rename from src/app/core/models/parser/parsed-user-data.model.ts
rename to src/app/core/models/users/parsed-user-data.model.ts
diff --git a/src/app/core/models/parser/roles.model.ts b/src/app/core/models/users/roles.model.ts
similarity index 100%
rename from src/app/core/models/parser/roles.model.ts
rename to src/app/core/models/users/roles.model.ts
diff --git a/src/app/core/models/parser/students.model.ts b/src/app/core/models/users/students.model.ts
similarity index 100%
rename from src/app/core/models/parser/students.model.ts
rename to src/app/core/models/users/students.model.ts
diff --git a/src/app/core/models/parser/tabulated-user-data.model.ts b/src/app/core/models/users/tabulated-user-data.model.ts
similarity index 100%
rename from src/app/core/models/parser/tabulated-user-data.model.ts
rename to src/app/core/models/users/tabulated-user-data.model.ts
diff --git a/src/app/core/models/parser/teams.model.ts b/src/app/core/models/users/teams.model.ts
similarity index 100%
rename from src/app/core/models/parser/teams.model.ts
rename to src/app/core/models/users/teams.model.ts
diff --git a/src/app/core/models/parser/tutors.model.ts b/src/app/core/models/users/tutors.model.ts
similarity index 100%
rename from src/app/core/models/parser/tutors.model.ts
rename to src/app/core/models/users/tutors.model.ts
diff --git a/src/app/core/services/data.service.ts b/src/app/core/services/data.service.ts
index 8965906de..c8a20a786 100644
--- a/src/app/core/services/data.service.ts
+++ b/src/app/core/services/data.service.ts
@@ -2,15 +2,15 @@ import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { DataFile } from '../models/data-file.model';
-import { Admins } from '../models/parser/admins.model';
-import { ParsedUserData } from '../models/parser/parsed-user-data.model';
-import { Roles } from '../models/parser/roles.model';
-import { Students } from '../models/parser/students.model';
-import { TabulatedUserData } from '../models/parser/tabulated-user-data.model';
-import { Teams } from '../models/parser/teams.model';
-import { Tutors } from '../models/parser/tutors.model';
 import { Team } from '../models/team.model';
 import { User, UserRole } from '../models/user.model';
+import { Admins } from '../models/users/admins.model';
+import { ParsedUserData } from '../models/users/parsed-user-data.model';
+import { Roles } from '../models/users/roles.model';
+import { Students } from '../models/users/students.model';
+import { TabulatedUserData } from '../models/users/tabulated-user-data.model';
+import { Teams } from '../models/users/teams.model';
+import { Tutors } from '../models/users/tutors.model';
 import { GithubService } from './github.service';
 
 @Injectable({
diff --git a/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts b/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts
index c137ab3aa..dd7572134 100644
--- a/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts
+++ b/tests/model/templates/sections/issue-dispute-section-parser.model.spec.ts
@@ -1,4 +1,4 @@
-import { IssueDisputeSectionParser } from '../../../../src/app/core/models/templates/sections/issue-dispute-section-parser.model';
+import { IssueDisputeSectionParser } from '../../../../src/app/core/models/templates/section-parsers/issue-dispute-section-parser.model';
 
 const TYPE_DISPUTE =
   '## :question: Issue Type\n\n' +
diff --git a/tests/model/templates/sections/moderation-section-parser.model.spec.ts b/tests/model/templates/sections/moderation-section-parser.model.spec.ts
index 1e03e2243..ae96cc74b 100644
--- a/tests/model/templates/sections/moderation-section-parser.model.spec.ts
+++ b/tests/model/templates/sections/moderation-section-parser.model.spec.ts
@@ -1,7 +1,7 @@
 import {
   DoneCheckboxParser,
   ModerationSectionParser
-} from '../../../../src/app/core/models/templates/sections/moderation-section-parser.model';
+} from '../../../../src/app/core/models/templates/section-parsers/moderation-section-parser.model';
 
 const TYPE_DISPUTE = '## :question: Issue Type\n\n' + '- [ ] Done\n\n' + '[replace this with your explanation]\n\n' + '-------------------';
 
diff --git a/tests/model/templates/sections/tester-response-section-parser.model.spec.ts b/tests/model/templates/sections/tester-response-section-parser.model.spec.ts
index a9e0e9a23..bb64785d2 100644
--- a/tests/model/templates/sections/tester-response-section-parser.model.spec.ts
+++ b/tests/model/templates/sections/tester-response-section-parser.model.spec.ts
@@ -1,7 +1,7 @@
 import {
   DisagreeCheckboxParser,
   TesterResponseSectionParser
-} from '../../../../src/app/core/models/templates/sections/tester-response-section-parser.model';
+} from '../../../../src/app/core/models/templates/section-parsers/tester-response-section-parser.model';
 
 const EMPTY_DISAGREE_CHECKBOX = '- [ ] I disagree';
 const FILLED_DISAGREE_CHECKBOX = '- [x] I disagree';
diff --git a/tests/model/templates/team-response-template.model.spec.ts b/tests/model/templates/team-response-template.model.spec.ts
index 430b64786..b7a8c5dde 100644
--- a/tests/model/templates/team-response-template.model.spec.ts
+++ b/tests/model/templates/team-response-template.model.spec.ts
@@ -37,14 +37,13 @@ describe('TeamResponseTemplate', () => {
     EMPTY_BODY_GITHUB_COMMENT.body = TEAM_RESPONSE_WITH_EXTRA_NEWLINES_AND_WHITESPACE;
     const template = new TeamResponseTemplate([EMPTY_BODY_GITHUB_COMMENT]);
 
-    expect(template.teamResponse.content).toBe(EXPECTED_TEAM_RESPONSE_TEMPLATE_CONTENT);
-    expect(template.teamResponse.header.toString()).toBe(EXPECTED_TEAM_RESPONSE_HEADER);
-    expect(template.duplicateOf.issueNumber).toEqual(null);
+    expect(template.teamResponse).toBe(EXPECTED_TEAM_RESPONSE_TEMPLATE_CONTENT);
+    expect(template.duplicateOf).toEqual(null);
   });
   it('parses the duplicateOf value correctly', () => {
     EMPTY_BODY_GITHUB_COMMENT.body = TEAM_RESPONSE_WITH_DUPLICATE;
     const template = new TeamResponseTemplate([EMPTY_BODY_GITHUB_COMMENT]);
 
-    expect(template.duplicateOf.issueNumber).toBe(DUPLICATE_ISSUE_NUMBER);
+    expect(template.duplicateOf).toBe(DUPLICATE_ISSUE_NUMBER);
   });
 });
diff --git a/tests/model/templates/tester-response-template.model.spec.ts b/tests/model/templates/tester-response-template.model.spec.ts
index 3957746d7..c9ea6b321 100644
--- a/tests/model/templates/tester-response-template.model.spec.ts
+++ b/tests/model/templates/tester-response-template.model.spec.ts
@@ -6,7 +6,6 @@ const SEVERITY_LOW = 'Low';
 const TYPE_DOCUMENTATION_BUG = 'DocumentationBug';
 
 const EXPECTED_TEAM_RESPONSE_CONTENT = 'This is a dummy team response comment: Thanks for the feedback';
-const EXPECTED_TEAM_RESPONSE_HEADER = "# Team's Response";
 
 const ISSUE_SEVERITY_TITLE = 'Issue severity';
 const ISSUE_TYPE_TITLE = 'Issue type';
@@ -58,18 +57,17 @@ describe('TesterResponseTemplate class', () => {
     it('parses the testerResponse and teamResponse fields correctly from the GithubComment', () => {
       const template = new TesterResponseTemplate([TEAM_RESPONSE_MULTIPLE_DISAGREEMENT]);
 
-      expect(template.teamResponse.content).toBe(EXPECTED_TEAM_RESPONSE_CONTENT);
-      expect(template.teamResponse.header.toString()).toBe(EXPECTED_TEAM_RESPONSE_HEADER);
+      expect(template.teamResponse).toBe(EXPECTED_TEAM_RESPONSE_CONTENT);
 
-      expect(template.testerResponse.testerResponses[0].title).toBe(ISSUE_SEVERITY_TITLE);
-      expect(template.testerResponse.testerResponses[0].description).toBe(ISSUE_SEVERITY_DESCRIPTION);
-      expect(template.testerResponse.testerResponses[0].disagreeCheckbox.toString()).toBe(DISAGREE_CHECKBOX);
-      expect(template.testerResponse.testerResponses[0].reasonForDisagreement).toBe(DISAGREE_REASON);
+      expect(template.testerResponses[0].title).toBe(ISSUE_SEVERITY_TITLE);
+      expect(template.testerResponses[0].description).toBe(ISSUE_SEVERITY_DESCRIPTION);
+      expect(template.testerResponses[0].disagreeCheckbox.toString()).toBe(DISAGREE_CHECKBOX);
+      expect(template.testerResponses[0].reasonForDisagreement).toBe(DISAGREE_REASON);
 
-      expect(template.testerResponse.testerResponses[1].title).toBe(ISSUE_TYPE_TITLE);
-      expect(template.testerResponse.testerResponses[1].description).toBe(ISSUE_TYPE_DESCRIPTION);
-      expect(template.testerResponse.testerResponses[1].disagreeCheckbox.toString()).toBe(DISAGREE_CHECKBOX);
-      expect(template.testerResponse.testerResponses[1].reasonForDisagreement).toBe(DISAGREE_REASON);
+      expect(template.testerResponses[1].title).toBe(ISSUE_TYPE_TITLE);
+      expect(template.testerResponses[1].description).toBe(ISSUE_TYPE_DESCRIPTION);
+      expect(template.testerResponses[1].disagreeCheckbox.toString()).toBe(DISAGREE_CHECKBOX);
+      expect(template.testerResponses[1].reasonForDisagreement).toBe(DISAGREE_REASON);
     });
   });
 });
diff --git a/tests/model/templates/tutor-moderation-issue-template.model.spec.ts b/tests/model/templates/tutor-moderation-issue-template.model.spec.ts
index f450126a8..4f8f222df 100644
--- a/tests/model/templates/tutor-moderation-issue-template.model.spec.ts
+++ b/tests/model/templates/tutor-moderation-issue-template.model.spec.ts
@@ -38,7 +38,7 @@ describe('TutorModerationIssueTemplate class', () => {
   it('parses a tutor moderation issue successfully', () => {
     const template = new TutorModerationIssueTemplate(ISSUE_PENDING_MODERATION);
 
-    expect(template.description.content).toBe(EXPECTED_ISSUE_DESCRIPTION);
-    expect(template.teamResponse.content).toBe(EXPECTED_TEAM_RESPONSE);
+    expect(template.description).toBe(EXPECTED_ISSUE_DESCRIPTION);
+    expect(template.teamResponse).toBe(EXPECTED_TEAM_RESPONSE);
   });
 });
diff --git a/tests/model/templates/tutor-moderation-todo-template.model.spec.ts b/tests/model/templates/tutor-moderation-todo-template.model.spec.ts
index 67a4766c1..6adf5f55f 100644
--- a/tests/model/templates/tutor-moderation-todo-template.model.spec.ts
+++ b/tests/model/templates/tutor-moderation-todo-template.model.spec.ts
@@ -41,6 +41,19 @@ describe('TutorModerationTodoTemplate', () => {
   it('parses the github comment successfully', () => {
     const template = new TutorModerationTodoTemplate([PENDING_TUTOR_MODERATION]);
 
-    expect(template.parseFailure).not.toBe(true);
+    expect(template.disputesToResolve[0].title).toBe(TYPE_TITLE);
+    expect(template.disputesToResolve[0].description).toBe(TEST_DESCRIPTION);
+    expect(template.disputesToResolve[0].todo.isChecked).toBe(true);
+    expect(template.disputesToResolve[0].tutorResponse).toBe(TEST_TUTOR_RESPONSE);
+
+    expect(template.disputesToResolve[1].title).toBe(SEVERITY_TITLE);
+    expect(template.disputesToResolve[1].description).toBe(DEFAULT_DESCRIPTION);
+    expect(template.disputesToResolve[1].todo.isChecked).toBe(false);
+    expect(template.disputesToResolve[1].tutorResponse).toBe(DEFAULT_TUTOR_RESPONSE);
+
+    expect(template.disputesToResolve[2].title).toBe(NOT_RELATED_TITLE);
+    expect(template.disputesToResolve[2].description).toBe(DEFAULT_DESCRIPTION);
+    expect(template.disputesToResolve[2].todo.isChecked).toBe(false);
+    expect(template.disputesToResolve[2].tutorResponse).toBe(DEFAULT_TUTOR_RESPONSE);
   });
 });

From d0937e63c4e0d7d08e9cb74fdf84828dce54cb29 Mon Sep 17 00:00:00 2001
From: "Lee Xiong Jie, Isaac" <68138671+luminousleek@users.noreply.github.com>
Date: Wed, 20 Apr 2022 00:29:30 +0800
Subject: [PATCH 11/13] Fix #931 Searching for issues assigned to multiple
 users (#932)

When searching for assignees, only issues where the assignee is the only
or first assignee are returned.

Let's fix this bug, and also update our tests to test for this situation
---
 src/app/shared/issue-tables/search-filter.ts        | 5 +----
 tests/app/shared/issue-tables/search-filter.spec.ts | 4 ++--
 tests/constants/githubissue.constants.ts            | 2 +-
 tests/model/issue.model.spec.ts                     | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/shared/issue-tables/search-filter.ts b/src/app/shared/issue-tables/search-filter.ts
index 67957291e..d7e657999 100644
--- a/src/app/shared/issue-tables/search-filter.ts
+++ b/src/app/shared/issue-tables/search-filter.ts
@@ -43,10 +43,7 @@ function duplicatedIssuesContainsSearchKey(duplicatedIssues: Issue[], searchKey:
 }
 
 function matchesAssignee(assignees: string[], searchKey: string): boolean {
-  for (const assignee of assignees) {
-    const lowerCaseAssignee = assignee.toLowerCase();
-    return containsSearchKey(lowerCaseAssignee, searchKey);
-  }
+  return assignees.some((assignee) => containsSearchKey(assignee.toLowerCase(), searchKey));
 }
 
 function matchesDuplicatedIssue(issueService: IssueService, id: number, searchKey: string): boolean {
diff --git a/tests/app/shared/issue-tables/search-filter.spec.ts b/tests/app/shared/issue-tables/search-filter.spec.ts
index 76787b251..0a03446c7 100644
--- a/tests/app/shared/issue-tables/search-filter.spec.ts
+++ b/tests/app/shared/issue-tables/search-filter.spec.ts
@@ -3,7 +3,7 @@ import { Team } from '../../../../src/app/core/models/team.model';
 import { IssueService } from '../../../../src/app/core/services/issue.service';
 import { TABLE_COLUMNS } from '../../../../src/app/shared/issue-tables/issue-tables-columns';
 import { applySearchFilter } from '../../../../src/app/shared/issue-tables/search-filter';
-import { USER_ANUBHAV } from '../../../constants/data.constants';
+import { USER_SHUMING } from '../../../constants/data.constants';
 import {
   DUPLICATED_ISSUE_WITH_EMPTY_DESCRIPTION_HIGH_SEVERITY,
   ISSUE_WITH_ASSIGNEES,
@@ -56,7 +56,7 @@ describe('search-filter', () => {
     });
 
     it('can filter for issues which are assigned to a specific user', () => {
-      searchKey = USER_ANUBHAV.loginId;
+      searchKey = USER_SHUMING.loginId;
       expect(applySearchFilter(searchKey, displayedColumns, issueService, issuesList)).toEqual([mediumSeverityIssueWithAssigneee]);
     });
 
diff --git a/tests/constants/githubissue.constants.ts b/tests/constants/githubissue.constants.ts
index e7511054b..121663a7d 100644
--- a/tests/constants/githubissue.constants.ts
+++ b/tests/constants/githubissue.constants.ts
@@ -126,7 +126,7 @@ export const DUPLICATED_ISSUE_WITH_EMPTY_DESCRIPTION_HIGH_SEVERITY = new GithubI
 export const ISSUE_WITH_ASSIGNEES = new GithubIssue({
   id: '551732011',
   number: 91,
-  assignees: [USER_ANUBHAV_ASSIGNEE_DETAILS],
+  assignees: [USER_ANUBHAV_ASSIGNEE_DETAILS, USER_SHUMING_ASSIGNEE_DETAILS],
   body: 'Screen freezes every few minutes',
   created_at: '2020-01-18T07:01:45Z',
   labels: [GITHUB_LABEL_TEAM_LABEL, GITHUB_LABEL_TUTORIAL_LABEL, GITHUB_LABEL_FUNCTIONALITY_BUG, GITHUB_LABEL_MEDIUM_SEVERITY],
diff --git a/tests/model/issue.model.spec.ts b/tests/model/issue.model.spec.ts
index 93b8950f6..0c596b106 100644
--- a/tests/model/issue.model.spec.ts
+++ b/tests/model/issue.model.spec.ts
@@ -24,7 +24,7 @@ describe('Issue model class', () => {
       expect(issue.teamResponse).toBe('No details provided by team.');
       expect(issue.severity).toBe('Medium');
       expect(issue.assignees).toContain('anubh-v');
-      expect(issue.assignees.length).toBe(1);
+      expect(issue.assignees.length).toBe(2);
     });
   });
   describe('.updateDescription(description) and .updateTeamResponse(teamResponse)', () => {

From 544140729bb0f9c696369829fabcd898c123b298 Mon Sep 17 00:00:00 2001
From: Gabriel Goh <77230723+gycgabriel@users.noreply.github.com>
Date: Sat, 23 Apr 2022 17:45:32 +0800
Subject: [PATCH 12/13] Add a timed toast to undo deleting issues) (#917)

Users cannot restore accidentally deleted issues.

Let's add a toast with Undo to undo deleting an issue
in 3 seconds.
---
 src/app/core/services/github.service.ts       |  9 ++++++
 src/app/core/services/issue.service.ts        | 10 +++++++
 .../action-toasters/action-toasters.module.ts | 12 ++++++++
 .../undo-action/undo-action.component.html    |  4 +++
 .../undo-action/undo-action.component.ts      | 10 +++++++
 .../issue-tables/issue-tables.component.ts    | 30 +++++++++++++++++--
 src/app/shared/shared.module.ts               |  4 ++-
 7 files changed, 76 insertions(+), 3 deletions(-)
 create mode 100644 src/app/shared/action-toasters/action-toasters.module.ts
 create mode 100644 src/app/shared/action-toasters/undo-action/undo-action.component.html
 create mode 100644 src/app/shared/action-toasters/undo-action/undo-action.component.ts

diff --git a/src/app/core/services/github.service.ts b/src/app/core/services/github.service.ts
index 50071ae1b..0916fab54 100644
--- a/src/app/core/services/github.service.ts
+++ b/src/app/core/services/github.service.ts
@@ -290,6 +290,15 @@ export class GithubService {
     );
   }
 
+  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>) => {
+        this.issuesLastModifiedManager.set(id, response.headers['last-modified']);
+        return new GithubIssue(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>) => {
diff --git a/src/app/core/services/issue.service.ts b/src/app/core/services/issue.service.ts
index 42413bf32..7671d1df7 100644
--- a/src/app/core/services/issue.service.ts
+++ b/src/app/core/services/issue.service.ts
@@ -249,6 +249,16 @@ export class IssueService {
     );
   }
 
+  undeleteIssue(id: number): Observable<Issue> {
+    return this.githubService.reopenIssue(id).pipe(
+      map((response: GithubIssue) => {
+        const reopenedIssue = this.createIssueModel(response);
+        this.updateLocalStore(reopenedIssue);
+        return reopenedIssue;
+      })
+    );
+  }
+
   /**
    * This function will update the issue's state of the application. This function needs to be called whenever a issue is deleted.
    */
diff --git a/src/app/shared/action-toasters/action-toasters.module.ts b/src/app/shared/action-toasters/action-toasters.module.ts
new file mode 100644
index 000000000..7cc53f6b2
--- /dev/null
+++ b/src/app/shared/action-toasters/action-toasters.module.ts
@@ -0,0 +1,12 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { MaterialModule } from '../material.module';
+import { UndoActionComponent } from './undo-action/undo-action.component';
+
+@NgModule({
+  imports: [CommonModule, MaterialModule],
+  declarations: [UndoActionComponent],
+  exports: [UndoActionComponent],
+  entryComponents: [UndoActionComponent]
+})
+export class ActionToasterModule {}
diff --git a/src/app/shared/action-toasters/undo-action/undo-action.component.html b/src/app/shared/action-toasters/undo-action/undo-action.component.html
new file mode 100644
index 000000000..baf45d194
--- /dev/null
+++ b/src/app/shared/action-toasters/undo-action/undo-action.component.html
@@ -0,0 +1,4 @@
+<p style="display: inline-block; max-width:300px"> {{data.message}} </p>
+<button style="float: right; margin-top: 8px;" mat-button
+        color="accent"
+        (click)="snackBarRef.dismissWithAction()"> Undo </button>
diff --git a/src/app/shared/action-toasters/undo-action/undo-action.component.ts b/src/app/shared/action-toasters/undo-action/undo-action.component.ts
new file mode 100644
index 000000000..dbd34dc1c
--- /dev/null
+++ b/src/app/shared/action-toasters/undo-action/undo-action.component.ts
@@ -0,0 +1,10 @@
+import { Component, Inject } from '@angular/core';
+import { MAT_SNACK_BAR_DATA, MatSnackBarRef } from '@angular/material';
+
+@Component({
+  selector: 'app-undo-action',
+  templateUrl: './undo-action.component.html'
+})
+export class UndoActionComponent {
+  constructor(public snackBarRef: MatSnackBarRef<UndoActionComponent>, @Inject(MAT_SNACK_BAR_DATA) public data: any) {}
+}
diff --git a/src/app/shared/issue-tables/issue-tables.component.ts b/src/app/shared/issue-tables/issue-tables.component.ts
index 9383db144..653ff3eb3 100644
--- a/src/app/shared/issue-tables/issue-tables.component.ts
+++ b/src/app/shared/issue-tables/issue-tables.component.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, Component, Input, OnInit, ViewChild } from '@angular/core';
-import { MatPaginator, MatSort } from '@angular/material';
+import { MatPaginator, MatSnackBar, MatSort } from '@angular/material';
 import { finalize } from 'rxjs/operators';
 import { Issue, STATUS } from '../../core/models/issue.model';
 import { DialogService } from '../../core/services/dialog.service';
@@ -11,6 +11,7 @@ import { LoggingService } from '../../core/services/logging.service';
 import { PermissionService } from '../../core/services/permission.service';
 import { PhaseService } from '../../core/services/phase.service';
 import { UserService } from '../../core/services/user.service';
+import { UndoActionComponent } from '../../shared/action-toasters/undo-action/undo-action.component';
 import { IssuesDataTable } from './IssuesDataTable';
 
 export enum ACTION_BUTTONS {
@@ -28,6 +29,8 @@ export enum ACTION_BUTTONS {
   styleUrls: ['./issue-tables.component.css']
 })
 export class IssueTablesComponent implements OnInit, AfterViewInit {
+  snackBarAutoCloseTime = 3000;
+
   @Input() headers: string[];
   @Input() actions: ACTION_BUTTONS[];
   @Input() filters?: any = undefined;
@@ -54,7 +57,8 @@ export class IssueTablesComponent implements OnInit, AfterViewInit {
     private phaseService: PhaseService,
     private errorHandlingService: ErrorHandlingService,
     private loggingService: LoggingService,
-    private dialogService: DialogService
+    private dialogService: DialogService,
+    private snackBar: MatSnackBar = null
   ) {}
 
   ngOnInit() {
@@ -175,6 +179,28 @@ export class IssueTablesComponent implements OnInit, AfterViewInit {
         }
       );
     event.stopPropagation();
+
+    let snackBarRef = null;
+    snackBarRef = this.snackBar.openFromComponent(UndoActionComponent, {
+      data: { message: `Deleted issue ${id}` },
+      duration: this.snackBarAutoCloseTime
+    });
+    snackBarRef.onAction().subscribe(() => {
+      this.undeleteIssue(id, event);
+    });
+  }
+
+  undeleteIssue(id: number, event: Event) {
+    this.loggingService.info(`IssueTablesComponent: Undeleting Issue ${id}`);
+    this.issueService.undeleteIssue(id).subscribe(
+      (reopenedIssue) => {},
+      (error) => {
+        this.errorHandlingService.handleError(error);
+      }
+    );
+    event.stopPropagation();
+
+    this.snackBar.open(`Restored issue ${id}`, '', { duration: this.snackBarAutoCloseTime });
   }
 
   openDeleteDialog(id: number, event: Event) {
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index d6c8eceea..cfc65f82c 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -4,6 +4,7 @@ import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
 import { FormDisableControlDirective } from '../core/directives/form-disable-control.directive';
+import { ActionToasterModule } from './action-toasters/action-toasters.module';
 import { ErrorToasterModule } from './error-toasters/error-toaster.module';
 import { MaterialModule } from './material.module';
 
@@ -18,7 +19,8 @@ import { MaterialModule } from './material.module';
     HttpClientModule,
     RouterModule,
     MaterialModule,
-    ErrorToasterModule
+    ErrorToasterModule,
+    ActionToasterModule
   ]
 })
 export class SharedModule {}

From b8a5a34ecfebfcbeab4b831964b6bf834bd9ea88 Mon Sep 17 00:00:00 2001
From: Lee Chun Wei <47494777+chunweii@users.noreply.github.com>
Date: Sat, 23 Apr 2022 18:14:37 +0800
Subject: [PATCH 13/13] Remove assignee check API (#933)

In a previous PR, there was a buggy implementation of
checking whether assignees are authorized to be assigned
due to lack of pagination. It makes the code unnecessarily
complex.

Let's remove the check altogether and just display the
"Validation Failed" message from GitHub to the user as it is.
---
 src/app/app.module.ts                         |  2 +-
 .../core/services/error-handling.service.ts   |  2 ++
 .../factories/factory.issue.service.ts        |  6 ++--
 src/app/core/services/github.service.ts       | 22 ---------------
 src/app/core/services/issue.service.ts        | 28 ++++++++-----------
 .../issue/assignee/assignee.component.ts      |  2 +-
 .../issues-faulty.component.spec.ts           |  2 +-
 .../issues-pending.component.spec.ts          |  2 +-
 .../issues-responded.component.spec.ts        |  2 +-
 .../shared/issue-tables/search-filter.spec.ts |  2 +-
 .../issue/assignee/assignee.component.spec.ts | 11 ++------
 11 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 59a5fde75..a90d87bf8 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -87,7 +87,7 @@ import { SharedModule } from './shared/shared.module';
     {
       provide: IssueService,
       useFactory: IssueServiceFactory,
-      deps: [GithubService, UserService, PhaseService, ElectronService, DataService]
+      deps: [GithubService, UserService, PhaseService, ElectronService, DataService, LoggingService]
     },
     {
       provide: ErrorHandler,
diff --git a/src/app/core/services/error-handling.service.ts b/src/app/core/services/error-handling.service.ts
index ea27b5669..b38eec07b 100644
--- a/src/app/core/services/error-handling.service.ts
+++ b/src/app/core/services/error-handling.service.ts
@@ -25,6 +25,8 @@ export class ErrorHandlingService implements ErrorHandler {
       this.handleHttpError(error, actionCallback);
     } else if (error.constructor.name === 'RequestError') {
       this.handleHttpError(error as RequestError, actionCallback);
+    } else if (typeof error === 'string') {
+      this.handleGeneralError(error);
     } else {
       this.handleGeneralError(error.message || JSON.stringify(error));
     }
diff --git a/src/app/core/services/factories/factory.issue.service.ts b/src/app/core/services/factories/factory.issue.service.ts
index f167da027..ea67a2271 100644
--- a/src/app/core/services/factories/factory.issue.service.ts
+++ b/src/app/core/services/factories/factory.issue.service.ts
@@ -3,6 +3,7 @@ import { DataService } from '../data.service';
 import { ElectronService } from '../electron.service';
 import { GithubService } from '../github.service';
 import { IssueService } from '../issue.service';
+import { LoggingService } from '../logging.service';
 import { MockIssueService } from '../mocks/mock.issue.service';
 import { PhaseService } from '../phase.service';
 import { UserService } from '../user.service';
@@ -12,10 +13,11 @@ export function IssueServiceFactory(
   userService: UserService,
   phaseService: PhaseService,
   electronService: ElectronService,
-  dataService: DataService
+  dataService: DataService,
+  logger: LoggingService
 ) {
   if (AppConfig.test) {
     return new MockIssueService(githubService, phaseService, dataService);
   }
-  return new IssueService(githubService, userService, phaseService, electronService, dataService);
+  return new IssueService(githubService, userService, phaseService, electronService, dataService, logger);
 }
diff --git a/src/app/core/services/github.service.ts b/src/app/core/services/github.service.ts
index 0916fab54..ef390614f 100644
--- a/src/app/core/services/github.service.ts
+++ b/src/app/core/services/github.service.ts
@@ -259,28 +259,6 @@ export class GithubService {
     octokit.issues.updateLabel({ owner: ORG_NAME, repo: REPO, name: labelName, current_name: labelName, color: labelColor });
   }
 
-  /**
-   * Checks if the given list of users are allowed to be assigned to an issue.
-   * @param assignees - GitHub usernames to be checked
-   */
-  areUsersAssignable(assignees: string[]): Observable<void> {
-    return from(
-      octokit.issues.listAssignees({
-        owner: ORG_NAME,
-        repo: REPO
-      })
-    ).pipe(
-      map(({ data }: { data: { login: string }[] }) => data.map(({ login }) => login)),
-      map((assignables: string[]) =>
-        assignees.forEach((assignee) => {
-          if (!assignables.includes(assignee)) {
-            throw new Error(`Cannot assign ${assignee} to the issue. Please check if ${assignee} is authorized.`);
-          }
-        })
-      )
-    );
-  }
-
   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>) => {
diff --git a/src/app/core/services/issue.service.ts b/src/app/core/services/issue.service.ts
index 7671d1df7..bdad5e1bf 100644
--- a/src/app/core/services/issue.service.ts
+++ b/src/app/core/services/issue.service.ts
@@ -14,6 +14,7 @@ import { appVersion } from './application.service';
 import { DataService } from './data.service';
 import { ElectronService } from './electron.service';
 import { GithubService } from './github.service';
+import { LoggingService } from './logging.service';
 import { PhaseService } from './phase.service';
 import { UserService } from './user.service';
 
@@ -42,7 +43,8 @@ export class IssueService {
     private userService: UserService,
     private phaseService: PhaseService,
     private electronService: ElectronService,
-    private dataService: DataService
+    private dataService: DataService,
+    private logger: LoggingService
   ) {
     this.issues$ = new BehaviorSubject(new Array<Issue>());
   }
@@ -134,11 +136,6 @@ export class IssueService {
       .pipe(map((response: GithubIssue) => this.createIssueModel(response)));
   }
 
-  updateIssueWithAssigneeCheck(issue: Issue): Observable<Issue> {
-    const assignees = this.phaseService.currentPhase === Phase.phaseModeration ? [] : issue.assignees;
-    return this.githubService.areUsersAssignable(assignees).pipe(flatMap(() => this.updateIssue(issue)));
-  }
-
   updateIssue(issue: Issue): Observable<Issue> {
     const assignees = this.phaseService.currentPhase === Phase.phaseModeration ? [] : issue.assignees;
     return this.githubService
@@ -147,6 +144,10 @@ export class IssueService {
         map((response: GithubIssue) => {
           response.comments = issue.githubComments;
           return this.createIssueModel(response);
+        }),
+        catchError((err) => {
+          this.logger.error(err); // Log full details of error first
+          return throwError(err.response.data.message); // More readable error message
         })
       );
   }
@@ -190,16 +191,11 @@ export class IssueService {
 
   createTeamResponse(issue: Issue): Observable<Issue> {
     const teamResponse = issue.createGithubTeamResponse();
-    return this.githubService.areUsersAssignable(issue.assignees || []).pipe(
-      flatMap(() =>
-        this.githubService.createIssueComment(issue.id, teamResponse).pipe(
-          flatMap((githubComment: GithubComment) => {
-            issue.githubComments = [githubComment, ...issue.githubComments.filter((c) => c.id !== githubComment.id)];
-            return this.updateIssue(issue);
-          })
-        )
-      ),
-      catchError((err) => throwError(err))
+    return this.githubService.createIssueComment(issue.id, teamResponse).pipe(
+      flatMap((githubComment: GithubComment) => {
+        issue.githubComments = [githubComment, ...issue.githubComments.filter((c) => c.id !== githubComment.id)];
+        return this.updateIssue(issue);
+      })
     );
   }
 
diff --git a/src/app/shared/issue/assignee/assignee.component.ts b/src/app/shared/issue/assignee/assignee.component.ts
index 0e20fb74f..c56de4ecf 100644
--- a/src/app/shared/issue/assignee/assignee.component.ts
+++ b/src/app/shared/issue/assignee/assignee.component.ts
@@ -54,7 +54,7 @@ export class AssigneeComponent implements OnInit {
     const newIssue = this.issue.clone(this.phaseService.currentPhase);
     const oldAssignees = newIssue.assignees;
     newIssue.assignees = this.assignees;
-    this.issueService.updateIssueWithAssigneeCheck(newIssue).subscribe(
+    this.issueService.updateIssue(newIssue).subscribe(
       (updatedIssue: Issue) => {
         this.issueUpdated.emit(updatedIssue);
         // Update assignees of duplicate issues
diff --git a/tests/app/phase-team-response/issues-faulty/issues-faulty.component.spec.ts b/tests/app/phase-team-response/issues-faulty/issues-faulty.component.spec.ts
index 9664ca9d5..83381a1a2 100644
--- a/tests/app/phase-team-response/issues-faulty/issues-faulty.component.spec.ts
+++ b/tests/app/phase-team-response/issues-faulty/issues-faulty.component.spec.ts
@@ -17,7 +17,7 @@ describe('IssuesFaultyComponent', () => {
     const DUMMY_RESPONSE = 'dummy response';
 
     beforeEach(() => {
-      issueService = new IssueService(null, null, null, null, null);
+      issueService = new IssueService(null, null, null, null, null, null);
       issueService.updateLocalStore(dummyIssue);
       issuesFaultyComponent = new IssuesFaultyComponent(issueService, userService, null);
       issuesFaultyComponent.ngOnInit();
diff --git a/tests/app/phase-team-response/issues-pending/issues-pending.component.spec.ts b/tests/app/phase-team-response/issues-pending/issues-pending.component.spec.ts
index 22df4e78d..b99657927 100644
--- a/tests/app/phase-team-response/issues-pending/issues-pending.component.spec.ts
+++ b/tests/app/phase-team-response/issues-pending/issues-pending.component.spec.ts
@@ -11,7 +11,7 @@ describe('IssuesPendingComponent', () => {
     const dummyTeam: Team = TEAM_4;
     let dummyIssue: Issue;
     let issuesPendingComponent: IssuesPendingComponent;
-    const issueService: IssueService = new IssueService(null, null, null, null, null);
+    const issueService: IssueService = new IssueService(null, null, null, null, null, null);
     const userService: UserService = new UserService(null, null);
     userService.currentUser = USER_Q;
     const DUMMY_DUPLICATE_ISSUE_ID = 1;
diff --git a/tests/app/phase-team-response/issues-responded/issues-responded.component.spec.ts b/tests/app/phase-team-response/issues-responded/issues-responded.component.spec.ts
index dcda46eac..1b6d18802 100644
--- a/tests/app/phase-team-response/issues-responded/issues-responded.component.spec.ts
+++ b/tests/app/phase-team-response/issues-responded/issues-responded.component.spec.ts
@@ -12,7 +12,7 @@ describe('IssuesRespondedComponent', () => {
     const DUMMY_RESPONSE = 'dummy response';
     let dummyIssue: Issue;
 
-    const issueService = new IssueService(null, null, null, null, null);
+    const issueService = new IssueService(null, null, null, null, null, null);
     const userService = new UserService(null, null);
     userService.currentUser = USER_Q;
     const issuesRespondedComponent = new IssuesRespondedComponent(issueService, userService);
diff --git a/tests/app/shared/issue-tables/search-filter.spec.ts b/tests/app/shared/issue-tables/search-filter.spec.ts
index 0a03446c7..e51fdbc39 100644
--- a/tests/app/shared/issue-tables/search-filter.spec.ts
+++ b/tests/app/shared/issue-tables/search-filter.spec.ts
@@ -45,7 +45,7 @@ describe('search-filter', () => {
       TABLE_COLUMNS.ASSIGNEE,
       TABLE_COLUMNS.DUPLICATED_ISSUES
     ];
-    const issueService: IssueService = new IssueService(null, null, null, null, null);
+    const issueService: IssueService = new IssueService(null, null, null, null, null, null);
 
     beforeEach(() => {
       issueService.updateLocalStore(mediumSeverityIssueWithResponse);
diff --git a/tests/app/shared/issue/assignee/assignee.component.spec.ts b/tests/app/shared/issue/assignee/assignee.component.spec.ts
index 05437c6d9..7c89a20fc 100644
--- a/tests/app/shared/issue/assignee/assignee.component.spec.ts
+++ b/tests/app/shared/issue/assignee/assignee.component.spec.ts
@@ -51,12 +51,7 @@ describe('AssigneeComponent', () => {
   });
 
   const phaseService: any = jasmine.createSpyObj('PhaseService', [], { currentPhase: Phase.phaseTeamResponse });
-  const issueService: any = jasmine.createSpyObj('IssueService', [
-    'getDuplicateIssuesFor',
-    'getLatestIssue',
-    'updateIssue',
-    'updateIssueWithAssigneeCheck'
-  ]);
+  const issueService: any = jasmine.createSpyObj('IssueService', ['getDuplicateIssuesFor', 'getLatestIssue', 'updateIssue']);
   const permissionsService: any = jasmine.createSpyObj('PermissionService', ['isIssueLabelsEditable']);
 
   beforeEach(async(() => {
@@ -131,7 +126,7 @@ describe('AssigneeComponent', () => {
     const updatedDuplicateIssue = duplicateIssue.clone(phaseService.currentPhase);
     updatedDuplicateIssue.assignees = [testStudent.loginId];
 
-    expect(issueService.updateIssueWithAssigneeCheck).toHaveBeenCalledWith(updatedIssue);
+    expect(issueService.updateIssue).toHaveBeenCalledWith(updatedIssue);
     expect(issueService.updateIssue).toHaveBeenCalledWith(updatedDuplicateIssue);
   });
 
@@ -149,7 +144,7 @@ describe('AssigneeComponent', () => {
 
   function dispatchClosedEvent() {
     const matSelectElement: HTMLElement = debugElement.query(By.css('.mat-select')).nativeElement;
-    issueService.updateIssueWithAssigneeCheck.and.callFake((updatedIssue: Issue) => of(updatedIssue));
+    issueService.updateIssue.and.callFake((updatedIssue: Issue) => of(updatedIssue));
     matSelectElement.dispatchEvent(new Event('closed'));
     fixture.detectChanges();
   }