Don't set severity for issues of type Task

README.md

@@ -23,7 +23,7 @@
 
 Simple CLI tool that provides an interactive interface to quickly set priority, severity and story points for your JIRA issues. No need to open the JIRA web interface.
 
-StoryPointer uses base JQL query to fetch issues that are not closed and have no story points or priority set - `Project = RHEL AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY) AND status != Closed`. The query can be customized using the CLI command options or by setting ENV variables.
+StoryPointer uses base JQL query to fetch issues that are not closed and have no story points or priority set - `Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed`. The query can be customized using the CLI command options or by setting ENV variables.
 
 ## Usage
 
@@ -109,7 +109,7 @@ Size all issues of the `curl` component:
 storypointer -c curl
 
 JIRA Version: 9.12.10
-JQL: Project = RHEL AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY) AND status != Closed AND component = curl ORDER BY id DESC
+JQL: Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = curl ORDER BY id DESC
 5 issues are waiting to be sized, prioritized, or set severity.
 
 🐛 RHEL-1234 - In Progress - Assignee

src/cli.ts

@@ -116,7 +116,7 @@
     let storyPoints: Size = issue.fields[jira.fields.storyPoints];
     const setStoryPoints = !storyPoints;
 
-    if (!storyPoints) {
+    if (setStoryPoints) {
       const answer: SizeWithControls = await select({
         message: 'Story Points',
         choices: [
@@ -177,7 +177,7 @@
     let priority = parsedPriority.success ? parsedPriority.data : undefined;
     const setPriority = !priority;
 
-    if (!priority) {
+    if (setPriority) {
       const answer: PriorityWithControls = await select({
         message: 'Priority',
         choices: [
@@ -232,10 +232,14 @@
       issue.fields[jira.fields.severity]?.value
     );
     let severity = parsedSeverity.success ? parsedSeverity.data : undefined;
-    const setSeverity = !severity;
+    let setSeverity = !severity;
 
     // This is workaround, We should use api to determine what values are available on the issue
-    if (!severity && issue.fields.issuetype.name !== 'Story') {
+    if (
+      setSeverity &&
+      issue.fields.issuetype.name !== 'Story' &&
+      issue.fields.issuetype.name !== 'Task'
+    ) {
       const answer: SeverityWithControls = await select({
         message: 'Severity',
         choices: [
@@ -278,9 +282,11 @@
       }
 
       severity = answer;
+    } else {
+      setSeverity != setSeverity;
     }
 
-    // If both values are already set, skip setting them
+    // If values are already set, skip setting them
     if (!setStoryPoints && !setPriority && !setSeverity) {
       logger.log('Nothing to do. Skipping.');
       continue;

src/jira.ts

@@ -11,7 +11,7 @@ export class Jira {
     severity: 'customfield_12316142',
   };
   readonly baseJQL =
-    'Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed';
+    'Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed';
   JQL = '';
 
   constructor(

test/unit/jira.test.ts

@@ -93,7 +93,7 @@ describe('Jira functions', () => {
   it('can be instantiated', () => {
     expect(jira).toBeInstanceOf(Jira);
     expect(jira.baseJQL).toMatchInlineSnapshot(
-      `"Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed"`
+      `"Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed"`
     );
   });
 
@@ -172,7 +172,7 @@ describe('Jira functions', () => {
       undefined
     );
     expect(jira.JQL).toMatchInlineSnapshot(
-      `"Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed ORDER BY id DESC"`
+      `"Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed ORDER BY id DESC"`
     );
     expect(mocks.searchForIssuesUsingJqlPost).toHaveBeenCalledWith({
       fields: [
@@ -185,7 +185,7 @@ describe('Jira functions', () => {
         'customfield_12310243',
         'priority',
       ],
-      jql: 'Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed ORDER BY id DESC',
+      jql: 'Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed ORDER BY id DESC',
     });
     expect(issues).toMatchInlineSnapshot(`
       [
@@ -232,7 +232,7 @@ describe('Jira functions', () => {
 
     issues = await jira.getIssues('component', undefined, undefined, undefined);
     expect(jira.JQL).toMatchInlineSnapshot(
-      `"Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = component ORDER BY id DESC"`
+      `"Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = component ORDER BY id DESC"`
     );
 
     issues = await jira.getIssues(
@@ -242,7 +242,7 @@ describe('Jira functions', () => {
       undefined
     );
     expect(jira.JQL).toMatchInlineSnapshot(
-      `"Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = component AND assignee = "assignee" ORDER BY id DESC"`
+      `"Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = component AND assignee = "assignee" ORDER BY id DESC"`
     );
 
     issues = await jira.getIssues(
@@ -252,12 +252,12 @@ describe('Jira functions', () => {
       undefined
     );
     expect(jira.JQL).toMatchInlineSnapshot(
-      `"Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = component AND assignee = "assignee" AND developer = "developer" ORDER BY id DESC"`
+      `"Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND component = component AND assignee = "assignee" AND developer = "developer" ORDER BY id DESC"`
     );
 
     issues = await jira.getIssues(undefined, undefined, undefined, 'customJQL');
     expect(jira.JQL).toMatchInlineSnapshot(
-      `"Project = RHEL AND (type = Story AND ("Story Points" is EMPTY OR priority is EMPTY) OR type != Story AND  ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND customJQL ORDER BY id DESC"`
+      `"Project = RHEL AND (type in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY) OR type not in (Story, Task) AND ("Story Points" is EMPTY OR priority is EMPTY OR Severity is EMPTY)) AND status != Closed AND customJQL ORDER BY id DESC"`
     );
   });