Added /unapprove quick action to mr_approve.go

Merged comment and approve api calls into a single one.

Signed-off-by: Lucas Zampieri <[email protected]>

cmd/mr_approve.go

@@ -63,7 +63,7 @@ var mrApproveCmd = &cobra.Command{
 			}
 		}
 
-		msgs = append(msgs, "\n  /approve")
+		msgs = append(msgs, "/approve")
 		createNote(rn, true, int(id), msgs, filename, linebreak, "", !note)
 
 		fmt.Printf("Merge Request !%d approved\n", id)

cmd/mr_unapprove.go

@@ -23,16 +23,32 @@ var mrUnapproveCmd = &cobra.Command{
 		lab mr unapprove upstream -m "A helpfull\nComment" --force-linebreak`),
 	PersistentPreRun: labPersistentPreRun,
 	Run: func(cmd *cobra.Command, args []string) {
+		var (
+			linebreak = false
+			canUnapprove = false
+		)
+
 		rn, id, err := parseArgsWithGitBranchMR(args)
 		if err != nil {
 			log.Fatal(err)
 		}
 
-		p, err := lab.FindProject(rn)
+		approvalConfig, err := lab.GetMRApprovalsConfiguration(rn, int(id))
 		if err != nil {
 			log.Fatal(err)
 		}
 
+		for _, approvers := range approvalConfig.ApprovedBy {
+			if approvers.User.Username == lab.User() {
+				canUnapprove = true
+			}
+		}
+
+		if !canUnapprove {
+			fmt.Printf("Merge Request !%d already unapproved\n", id)
+			os.Exit(1)
+		}
+
 		comment, err := cmd.Flags().GetBool("with-comment")
 		if err != nil {
 			log.Fatal(err)
@@ -48,26 +64,17 @@ var mrUnapproveCmd = &cobra.Command{
 			log.Fatal(err)
 		}
 
-		err = lab.MRUnapprove(p.ID, int(id))
-		if err != nil {
-			if err == lab.ErrStatusForbidden {
-				log.Fatal(err)
-			}
-			if err == lab.ErrActionRepeated {
-				fmt.Printf("Merge Request !%d already unapproved\n", id)
-				os.Exit(1)
-			}
-		}
-
-		if comment || len(msgs) > 0 || filename != "" {
-			linebreak, err := cmd.Flags().GetBool("force-linebreak")
+		note := comment || len(msgs) > 0 || filename != ""
+		if note {
+			linebreak, err = cmd.Flags().GetBool("force-linebreak")
 			if err != nil {
 				log.Fatal(err)
 			}
-
-			createNote(rn, true, int(id), msgs, filename, linebreak, "", false)
 		}
 
+		msgs = append(msgs, "/unapprove")
+		createNote(rn, true, int(id), msgs, filename, linebreak, "", !note)
+
 		fmt.Printf("Merge Request !%d unapproved\n", id)
 	},
 }