feat: Allow skipping notification on edit (#855)

Author: ankitpokhrel

internal/cmd/epic/add/add.go

@@ -81,7 +81,7 @@ func add(cmd *cobra.Command, args []string) {
 		// There is no way to send bulk update requests as of now, so we need to send these requests
 		// in a loop. We will print failed requests with exit code 1 at the end if there are any.
 		for _, iss := range params.issues {
-			if err := client.Edit(iss, &jira.EditRequest{ParentIssueKey: params.epicKey}); err != nil {
+			if err := client.Edit(iss, &jira.EditRequest{ParentIssueKey: params.epicKey, SkipNotify: true}); err != nil {
 				msg := fmt.Sprintf("\n  - %s: %s", iss, cmdutil.NormalizeJiraError(err.Error()))
 				failed.WriteString(msg)
 			} else {

internal/cmd/epic/remove/remove.go

@@ -72,7 +72,7 @@ func remove(cmd *cobra.Command, args []string) {
 		}
 
 		for _, iss := range params.issues {
-			if err := client.Edit(iss, &jira.EditRequest{ParentIssueKey: jira.AssigneeNone}); err != nil {
+			if err := client.Edit(iss, &jira.EditRequest{ParentIssueKey: jira.AssigneeNone, SkipNotify: true}); err != nil {
 				msg := fmt.Sprintf("\n  - %s: %s", iss, cmdutil.NormalizeJiraError(err.Error()))
 				failed.WriteString(msg)
 			} else {

internal/cmd/issue/edit/edit.go

@@ -157,6 +157,7 @@ func edit(cmd *cobra.Command, args []string) {
 			FixVersions:     fixVersions,
 			AffectsVersions: affectsVersions,
 			CustomFields:    params.customFields,
+			SkipNotify:      params.skipNotify,
 		}
 		if configuredCustomFields, err := cmdcommon.GetConfiguredCustomFields(); err == nil {
 			cmdcommon.ValidateCustomFields(edr.CustomFields, configuredCustomFields)
@@ -311,6 +312,7 @@ type editParams struct {
 	fixVersions     []string
 	affectsVersions []string
 	customFields    map[string]string
+	skipNotify      bool
 	noInput         bool
 	debug           bool
 }
@@ -346,6 +348,9 @@ func parseArgsAndFlags(flags query.FlagParser, args []string, project string) *e
 	custom, err := flags.GetStringToString("custom")
 	cmdutil.ExitIfError(err)
 
+	skipNotify, err := flags.GetBool("skip-notify")
+	cmdutil.ExitIfError(err)
+
 	noInput, err := flags.GetBool("no-input")
 	cmdutil.ExitIfError(err)
 
@@ -364,6 +369,7 @@ func parseArgsAndFlags(flags query.FlagParser, args []string, project string) *e
 		fixVersions:     fixVersions,
 		affectsVersions: affectsVersions,
 		customFields:    custom,
+		skipNotify:      skipNotify,
 		noInput:         noInput,
 		debug:           debug,
 	}
@@ -445,6 +451,7 @@ func setFlags(cmd *cobra.Command) {
 	cmd.Flags().StringArray("fix-version", []string{}, "Add/Append release info (fixVersions)")
 	cmd.Flags().StringArray("affects-version", []string{}, "Add/Append release info (affectsVersions)")
 	cmd.Flags().StringToString("custom", custom, "Edit custom fields")
+	cmd.Flags().Bool("skip-notify", false, "Do not notify watchers about the issue update")
 	cmd.Flags().Bool("web", false, "Open in web browser after successful update")
 	cmd.Flags().Bool("no-input", false, "Disable prompt for non-required fields")
 }

pkg/jira/edit.go

@@ -3,7 +3,9 @@ package jira
 import (
 	"context"
 	"encoding/json"
+	"maps"
 	"net/http"
+	"slices"
 	"strconv"
 	"strings"
 )
@@ -31,6 +33,7 @@ type EditRequest struct {
 	// CustomFields holds all custom fields passed
 	// while editing the issue.
 	CustomFields map[string]string
+	SkipNotify   bool
 
 	configuredCustomFields []IssueTypeField
 }
@@ -49,7 +52,12 @@ func (c *Client) Edit(key string, req *EditRequest) error {
 		return err
 	}
 
-	res, err := c.PutV2(context.Background(), "/issue/"+key, body, Header{
+	endpoint := "/issue/" + key
+	if req.SkipNotify {
+		endpoint += "?notifyUsers=false"
+	}
+
+	res, err := c.PutV2(context.Background(), endpoint, body, Header{
 		"Accept":       "application/json",
 		"Content-Type": "application/json",
 	})
@@ -78,7 +86,7 @@ type editFields struct {
 	Priority []struct {
 		Set struct {
 			Name string `json:"name,omitempty"`
-		} `json:"set,omitempty"`
+		} `json:"set"`
 	} `json:"priority,omitempty"`
 	Labels []struct {
 		Add    string `json:"add,omitempty"`
@@ -139,16 +147,13 @@ func (cfm *editFieldsMarshaler) MarshalJSON() ([]byte, error) {
 		return m, err
 	}
 
-	var temp interface{}
+	var temp any
 	if err := json.Unmarshal(m, &temp); err != nil {
 		return nil, err
 	}
-	dm := temp.(map[string]interface{})
-
-	for key, val := range cfm.M.customFields {
-		dm[key] = val
-	}
+	dm := temp.(map[string]any)
 
+	maps.Copy(dm, cfm.M.customFields)
 	return json.Marshal(dm)
 }
 
@@ -177,7 +182,7 @@ func getRequestDataForEdit(req *EditRequest) *editRequest {
 		Priority: []struct {
 			Set struct {
 				Name string `json:"name,omitempty"`
-			} `json:"set,omitempty"`
+			} `json:"set"`
 		}{{Set: struct {
 			Name string `json:"name,omitempty"`
 		}{Name: req.Priority}}},
@@ -412,19 +417,10 @@ func splitAddAndRemove(input []string) ([]string, []string) {
 		}
 	}
 	for _, inp := range input {
-		if !strings.HasPrefix(inp, separatorMinus) && !inArray(sub, inp) {
+		if !strings.HasPrefix(inp, separatorMinus) && !slices.Contains(sub, inp) {
 			add = append(add, inp)
 		}
 	}
 
 	return add, sub
 }
-
-func inArray(array []string, item string) bool {
-	for _, i := range array {
-		if i == item {
-			return true
-		}
-	}
-	return false
-}