Initial work on undoleg

Author: Thord Setsaas

controllers/leg_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"encoding/json"
+	"io"
 	"log"
 	"net/http"
 	"strconv"
@@ -315,7 +316,20 @@ func DeleteLeg(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	err = data.DeleteLeg(legID)
+	body := struct {
+		Abandoned *bool `json:"abandoned"`
+	}{}
+	abandoned := true
+	err = json.NewDecoder(r.Body).Decode(&body)
+	if err != nil && err != io.EOF {
+		log.Println("Unable to deserialize delete leg body", err)
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+	if body.Abandoned != nil {
+		abandoned = *body.Abandoned
+	}
+	err = data.DeleteLeg(legID, abandoned)
 	if err != nil {
 		log.Println("Unable to delete leg", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)

data/leg.go

@@ -1313,7 +1313,7 @@ func StartWarmup(legID int, venueID int) error {
 }
 
 // DeleteLeg will delete the current leg and update match with previous leg
-func DeleteLeg(legID int) error {
+func DeleteLeg(legID int, abandoned bool) error {
 	leg, err := GetLeg(legID)
 	if err != nil {
 		return err
@@ -1341,8 +1341,11 @@ func DeleteLeg(legID int) error {
 			}
 			log.Printf("Delete match without any leg %d", match.ID)
 		} else {
-			_, err = tx.Exec("UPDATE matches SET current_leg_id = ?, is_abandoned = 1, is_finished = 1 WHERE id = ?", previousLeg, match.ID)
-			if err != nil {
+			query := "UPDATE matches SET current_leg_id = ? WHERE id = ?"
+			if abandoned {
+				query = "UPDATE matches SET current_leg_id = ?, is_abandoned = 1, is_finished = 1 WHERE id = ?"
+			}
+			if _, err = tx.Exec(query, previousLeg, match.ID); err != nil {
 				return err
 			}
 			log.Printf("[%d] Updated current leg of match %d", previousLeg, match.ID)