chore: improve delete

logic/models/delete.go

@@ -1,7 +1,6 @@
 package models
 
 import (
-	"fmt"
 	"net/http"
 	"os"
 	"path"
@@ -12,26 +11,26 @@ import (
 )
 
 func deleteModel(handle *Handle, id string, w http.ResponseWriter, c *Context, model BaseModel) {
-	fmt.Printf("Removing model with id: %s\n", id)
+    c.Logger.Warnf("Removing model with id: %s", id)
 	_, err := handle.Db.Exec("delete from models where id=$1;", id)
 	if err != nil {
-		fmt.Println(err)
+        c.Logger.Error(err)
 		panic("TODO handle better deleteModel failed delete database query")
 	}
 
 	model_path := path.Join("./savedData", id)
-	fmt.Printf("Removing folder of model with id: %s at %s\n", id, model_path)
+	c.Logger.Warnf("Removing folder of model with id: %s at %s", id, model_path)
 	err = os.RemoveAll(model_path)
 	if err != nil {
-		fmt.Println(err)
+        c.Logger.Error(err)
 		panic("TODO handle better deleteModel failed to delete folder")
 	}
 
-    if c.Mode == HTML {
-        // TODO move this to a constant so i don't forget
-        w.WriteHeader(309)
-        c.Mode = HTMLFULL
-    }
+	if c.Mode == HTML {
+		// TODO move this to a constant so i don't forget
+		w.WriteHeader(309)
+		c.Mode = HTMLFULL
+	}
 
 	LoadBasedOnAnswer(c.Mode, w, "/models/delete.html", c.AddMap(AnyMap{
 		"Model": model,
@@ -44,13 +43,14 @@ func handleDelete(handle *Handle) {
 			panic("TODO handle json on models/delete")
 		}
 
+		// This is required to parse delete forms with bodies
 		f, err := MyParseForm(r)
 		if err != nil {
-			return ErrorCode(err, 400, nil)
+			return c.ErrorCode(err, 400, nil)
 		}
 
 		if !CheckId(f, "id") {
-			return ErrorCode(nil, http.StatusNotFound, AnyMap{
+			return c.ErrorCode(nil, http.StatusNotFound, AnyMap{
 				"NotFoundMessage": "Model not found",
 				"GoBackLink":      "/models",
 			})
@@ -61,40 +61,41 @@ func handleDelete(handle *Handle) {
 		// TODO handle admin users
 		rows, err := handle.Db.Query("select name, status from models where id=$1 and user_id=$2;", id, c.User.Id)
 		if err != nil {
-			return Error500(err)
+			return c.ErrorCode(err, http.StatusInternalServerError, nil)
 		}
-        defer rows.Close()
+		defer rows.Close()
 
 		if !rows.Next() {
-			return ErrorCode(nil, http.StatusNotFound, AnyMap{
+            c.Logger.Warn("Could not find model for", id, c.User.Id)
+			return c.ErrorCode(nil, http.StatusNotFound, AnyMap{
 				"NotFoundMessage": "Model not found",
 				"GoBackLink":      "/models",
 			})
 		}
 
-        model := BaseModel{}
+		model := BaseModel{}
 		model.Id = id
 
-		err = rows.Scan(&model.Name, &model.Status)
-		if err != nil {
-			return Error500(err)
+		if err = rows.Scan(&model.Name, &model.Status); err != nil {
+			return c.Error500(err)
 		}
 
 		switch model.Status {
 		case FAILED_TRAINING:
-            fallthrough
+			fallthrough
 		case FAILED_PREPARING_TRAINING:
-            fallthrough
+			fallthrough
 		case FAILED_PREPARING:
 			deleteModel(handle, id, w, c, model)
 			return nil
-        case READY:
-            fallthrough
+		case READY:
+			fallthrough
 		case CONFIRM_PRE_TRAINING:
-
 			if CheckEmpty(f, "name") {
-				// TODO improve result
-				return ErrorCode(nil, http.StatusBadRequest, nil)
+				return c.Error400(nil, "Name is empty", w, "/models/edit.html", "delete-model-card", AnyMap{
+					"NameDoesNotMatch": true,
+					"Model":            model,
+				})
 			}
 
 			name := f.Get("name")