chore: did more clean up

logic/models/delete.go

@@ -6,7 +6,6 @@ import (
 	"path"
 
 	. "git.andr3h3nriqu3s.com/andr3/fyp/logic/db_types"
-	. "git.andr3h3nriqu3s.com/andr3/fyp/logic/models/utils"
 	. "git.andr3h3nriqu3s.com/andr3/fyp/logic/utils"
 )
 
@@ -14,44 +13,35 @@ func deleteModelJSON(c *Context, id string) *Error {
 	c.Logger.Warnf("Removing model with id: %s", id)
 	_, err := c.Db.Exec("delete from models where id=$1;", id)
 	if err != nil {
-		return c.Error500(err)
+		return c.E500M("Failed to delete models", err)
 	}
 
 	model_path := path.Join("./savedData", id)
 	c.Logger.Warnf("Removing folder of model with id: %s at %s", id, model_path)
 	err = os.RemoveAll(model_path)
 	if err != nil {
-		return c.Error500(err)
+		return c.E500M("Failed to remove data", err)
 	}
 
 	return c.SendJSON(id)
 }
 
 func handleDelete(handle *Handle) {
-	handle.Delete("/models/delete", func(c *Context) *Error {
-		if !c.CheckAuthLevel(1) {
-			return nil
-		}
-		var dat struct {
-			Id   string  `json:"id" validate:"required"`
-			Name *string `json:"name,omitempty"`
-		}
-
-		if err_ := c.ToJSON(&dat); err_ != nil {
-			return err_
-		}
-
+	type DeleteModel struct {
+		Id   string  `json:"id" validate:"required"`
+		Name *string `json:"name,omitempty"`
+	}
+	DeleteAuthJson(handle, "/models/delete", User_Normal, func(c *Context, dat *DeleteModel) *Error {
 		var model struct {
 			Id     string
 			Name   string
 			Status int
 		}
-
 		err := GetDBOnce(c, &model, "models where id=$1 and user_id=$2;", dat.Id, c.User.Id)
 		if err == NotFoundError {
 			return c.SendJSONStatus(http.StatusNotFound, "Model not found!")
 		} else if err != nil {
-			return c.Error500(err)
+			return c.E500M("Faield to get model", err)
 		}
 
 		switch model.Status {