chore: did more clean up

logic/models/classes/data_point.go

@@ -3,6 +3,8 @@ package model_classes
 import (
 	"database/sql"
 	"errors"
+
+	. "git.andr3h3nriqu3s.com/andr3/fyp/logic/db_types"
 )
 
 var FailedToGetIdAfterInsertError = errors.New("Failed to Get Id After Insert Error")
@@ -23,6 +25,6 @@ func AddDataPoint(db *sql.DB, class_id string, file_path string, mode DATA_POINT
 }
 
 func UpdateDataPointStatus(db *sql.DB, data_point_id string, status int, message *string) (err error) {
-    _, err = db.Exec("update model_data_point set status=$1, status_message=$2 where id=$3", status, message, data_point_id)
-    return
+	_, err = db.Exec("update model_data_point set status=$1, status_message=$2 where id=$3", status, message, data_point_id)
+	return
 }

logic/models/classes/list.go

@@ -1,43 +1,26 @@
 package model_classes
 
 import (
-	"strconv"
-
 	. "git.andr3h3nriqu3s.com/andr3/fyp/logic/db_types"
 	. "git.andr3h3nriqu3s.com/andr3/fyp/logic/utils"
 )
 
 func HandleList(handle *Handle) {
-	handle.Get("/models/data/list", func(c *Context) *Error {
-		if !c.CheckAuthLevel(1) {
-			return nil
-		}
-
-		id, err := GetIdFromUrl(c, "id")
-		if err != nil {
-			return c.JsonBadRequest("Model Class not found!")
-		}
-
-		page := 0
-		if c.R.URL.Query().Has("page") {
-			page_url := c.R.URL.Query().Get("page")
-			page_url_number, err := strconv.Atoi(page_url)
-			if err != nil {
-				return c.JsonBadRequest("Page is not a number")
-			}
-			page = page_url_number
-		}
-
+	type DataList struct {
+		Id   string `json:"id" validate:"required"`
+		Page int    `json:"page"`
+	}
+	PostAuthJson(handle, "/models/data/list", User_Normal, func(c *Context, dat *DataList) *Error {
 		var class_row struct {
 			Name     string
 			Model_id string
 		}
 
-		err = GetDBOnce(c, &class_row, "model_classes where id=$1", id)
+		err := GetDBOnce(c, &class_row, "model_classes where id=$1", dat.Id)
 		if err == NotFoundError {
 			return c.JsonBadRequest("Model Class not found!")
 		} else if err != nil {
-			return c.Error500(err)
+			return c.E500M("Failed to get classes", err)
 		}
 
 		type baserow struct {
@@ -47,23 +30,21 @@ func HandleList(handle *Handle) {
 			Status     int    `json:"status"`
 		}
 
-		rows, err := GetDbMultitple[baserow](c, "model_data_point where class_id=$1 limit 11 offset $2", id, page*10)
+		rows, err := GetDbMultitple[baserow](c, "model_data_point where class_id=$1 limit 11 offset $2", dat.Id, dat.Page*10)
 		if err != nil {
-			return c.Error500(err)
-		}
-
-		type ReturnType struct {
-			ImageList []*baserow `json:"image_list"`
-			Page      int        `json:"page"`
-			ShowNext  bool       `json:"showNext"`
+			return c.E500M("Failed to get classes", err)
 		}
 
 		max_len := min(11, len(rows))
 
 		c.ShowMessage = false
-		return c.SendJSON(ReturnType{
+		return c.SendJSON(struct {
+			ImageList []*baserow `json:"image_list"`
+			Page      int        `json:"page"`
+			ShowNext  bool       `json:"showNext"`
+		}{
 			ImageList: rows[0:max_len],
-			Page:      page,
+			Page:      dat.Page,
 			ShowNext:  len(rows) == 11,
 		})
 	})

logic/models/classes/types.go

@@ -1,8 +0,0 @@
-package model_classes
-
-type DATA_POINT_MODE int
-
-const (
-    DATA_POINT_MODE_TRAINING DATA_POINT_MODE = 1 
-    DATA_POINT_MODE_TESTING = 2
-)