fix: allow viewing selected for development tickets

tagoro9 · Aug 24, 2023 · 58b6437 · 58b6437
1 parent 31c3f62
commit 58b6437
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 19 deletions.
diff --git a/src/issue-tracker/jira/Jira.ts b/src/issue-tracker/jira/Jira.ts
@@ -293,19 +293,20 @@ export class Jira implements Tracker {
 
   public getCurrentUserOpenIssues(): Observable<Issue[]> {
     return zip(this.getCurrentUser(), this.getStatuses()).pipe(
-      switchMap(([user, status]: [User, Partial<Record<IssueStatus, JiraIssueStatus>>]) => {
+      switchMap(([user, status]: [User, Partial<Record<IssueStatus, JiraIssueStatus[]>>]) => {
+        const qs = {
+          expand: 'transitions, renderedFields',
+          jql: `assignee=${user.accountId} AND status IN (${[
+            IssueStatus.BACKLOG,
+            IssueStatus.SELECTED_FOR_DEVELOPMENT,
+          ]
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            .flatMap((s) => (status[s] ? status[s]!.map((t) => "'" + t.name + "'") : undefined))
+            .filter((s) => s !== undefined)
+            .join(',')}) ORDER BY CREATED DESC`,
+        };
         return this.client.get<{ issues: JiraIssue[] }>(`/search`, {
-          qs: {
-            expand: 'transitions, renderedFields',
-            jql: `assignee=${user.accountId} AND status IN (${[
-              IssueStatus.BACKLOG,
-              IssueStatus.SELECTED_FOR_DEVELOPMENT,
-            ]
-              // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-              .map((s) => (status[s] ? "'" + status[s]!.name + "'" : undefined))
-              .filter((s) => s !== undefined)
-              .join(',')}) ORDER BY CREATED DESC`,
-          },
+          qs: qs,
         });
       }),
       map(prop('body')),
@@ -375,16 +376,29 @@ export class Jira implements Tracker {
       );
   }
 
-  // TODO This should be cacheable, but cacheable does not understand observables yer
-  private getStatuses(): Observable<Partial<Record<IssueStatus, JiraIssueStatus>>> {
+  /**
+   * Get all the statuses from Jira for any project and then map then to the internal fotingo statuses. Ensure no duplicate statuses are returned
+   * for each internal status
+   * @private
+   */
+  // TODO This should be cacheable, but cacheable does not understand observables yet
+  private getStatuses(): Observable<Partial<Record<IssueStatus, JiraIssueStatus[]>>> {
     return this.client.get<JiraIssueStatus[]>('/status').pipe(
       map(prop('body')),
       map((status: JiraIssueStatus[]) => {
         return Object.fromEntries(
-          Object.entries(IssueStatus).map(([key, value]) => [
-            key,
-            status.find((t) => this.config.status[value].test(t.name)),
-          ]),
+          Object.entries(IssueStatus).map(([key, value]) => {
+            // Get statuses that match the internal status regex
+            const matchedStatues = status.filter((t) => this.config.status[value].test(t.name));
+            return [
+              key,
+              // Ensure only one status per name is returned
+              matchedStatues.filter(
+                (status, index, collection) =>
+                  collection.findIndex((t) => t.name === status.name) === index,
+              ),
+            ];
+          }),
         );
       }),
     );

diff --git a/src/types.ts b/src/types.ts
@@ -96,6 +96,7 @@ export interface Issue {
     id: string;
     key: string;
   };
+  raw?: unknown;
   sanitizedSummary: string;
   summary: string;
   type: IssueType;

diff --git a/test/issue-tracker/Jira.test.ts b/test/issue-tracker/Jira.test.ts
@@ -98,4 +98,23 @@ describe('jira', () => {
       });
     });
   });
+
+  describe('getCurrentUserOpenIssues', () => {
+    it('gets the issues in all the configured selected for development status regexes', async () => {
+      httpClientMocks.get.mockReturnValueOnce(of(data.createHttpResponse(data.createJiraUser())));
+      httpClientMocks.get.mockReturnValueOnce(
+        of(data.createHttpResponse(data.createJiraStatuses())),
+      );
+      httpClientMocks.get.mockReturnValueOnce(of(data.createHttpResponse({ issues: [] })));
+      await lastValueFrom(jira.getCurrentUserOpenIssues());
+      expect(httpClientMocks.get.mock.calls[2][1]).toMatchInlineSnapshot(`
+        {
+          "qs": {
+            "expand": "transitions, renderedFields",
+            "jql": "assignee=Jerry.Rosenbaum AND status IN ('backlog','To do','to do') ORDER BY CREATED DESC",
+          },
+        }
+      `);
+    });
+  });
 });
diff --git a/test/lib/data.ts b/test/lib/data.ts
@@ -1,6 +1,6 @@
 import { faker } from '@faker-js/faker';
 import { GitConfig } from 'src/git/Config';
-import { JiraIssue } from 'src/issue-tracker/jira/types';
+import { JiraIssue, JiraIssueStatus } from 'src/issue-tracker/jira/types';
 import { HttpResponse } from 'src/network/HttpClient';
 import {
   Config,
@@ -107,6 +107,15 @@ export const data = {
       },
     };
   },
+  createJiraStatuses(): JiraIssueStatus[] {
+    return ['To do', 'to do', 'selected for development', 'backlog', 'in progress'].map(
+      (statusName) => ({
+        description: faker.lorem.paragraph(),
+        id: String(faker.datatype.number(5000)),
+        name: statusName,
+      }),
+    );
+  },
   createRelease(): Release {
     return {
       id: faker.random.word(),