gorm

routers/tasks.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"io/ioutil"
 	"log"
+	"main/configs"
 	"main/models"
 	"main/utils"
 	"net/http"
@@ -17,9 +18,14 @@ func TasksGet(w http.ResponseWriter, r *http.Request) {
 	var listview models.ListView
 	listview.Page = utils.ParamInt(r.URL.Query().Get("page"), 1)
 	listview.PageSize = utils.ParamInt(r.URL.Query().Get("pageSize"), 10)
-	listview.List = models.QueryTasks(listview.Page, listview.PageSize)
-	listview.Total = models.CountTasks()
-	listview.Next = listview.Page*listview.PageSize < listview.Total
+	var task_list []models.Task
+	db := configs.ORMDB()
+	db.Offset((listview.Page - 1) * listview.PageSize).Limit(listview.PageSize).Find(&task_list)
+	for _, task := range task_list {
+		listview.List = append(listview.List, task)
+	}
+	db.Model(&models.Task{}).Count(&listview.Total)
+	listview.Next = listview.Page*listview.PageSize < int(listview.Total)
 	listview.WriteJSON(w)
 }
 
@@ -35,7 +41,7 @@ func TasksPost(w http.ResponseWriter, r *http.Request) {
 		log.Println(err)
 		return
 	}
-	task.Create()
+	configs.ORMDB().Create(&task)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(task))
 }
@@ -44,8 +50,10 @@ func TasksItemGet(w http.ResponseWriter, r *http.Request) {
 	if r.Header.Get("Upgrade") == "websocket" {
 		vars := mux.Vars(r)
 		id, _ := strconv.Atoi(vars["id"])
-		task := models.QueryTask(id)
-		if task.ID == 0 {
+
+		var task models.Task = models.Task{ID: id}
+		if err := configs.ORMDB().First(&task, id).Error; err != nil {
+			log.Println(err)
 			w.WriteHeader(http.StatusNotFound)
 			return
 		}
@@ -63,12 +71,12 @@ func TasksItemGet(w http.ResponseWriter, r *http.Request) {
 				break
 			}
 			task.Status = string(message)
-			task.Update()
+			configs.ORMDB().Model(&task).Update("status", task.Status)
 		}
 		return
 	}
 	task := models.Task{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	task.Get()
+	configs.ORMDB().First(&task)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(task))
 }
@@ -86,18 +94,13 @@ func TasksItemPatch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 	task.ID = utils.ParamInt(mux.Vars(r)["id"], 0)
-	task.Update()
+	configs.ORMDB().Model(&task).Updates(task)
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.Write(utils.ToJSON(task))
 }
 
 func TasksItemDelete(w http.ResponseWriter, r *http.Request) {
 	task := models.Task{ID: utils.ParamInt(mux.Vars(r)["id"], 0)}
-	task.Delete()
-	if task.ID == 0 {
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-	task.Delete()
+	configs.ORMDB().Delete(&task)
 	w.WriteHeader(http.StatusNoContent)
 }