implemented adding and editing of tasks

backend/pkg/db/tasks/tasks.go

@@ -1,41 +1,34 @@
 package tasks
 
 import (
-	"fmt"
-	"time"
-
-	cache "github.com/jfarleyx/go-simple-cache"
 	"github.com/johannesbuehl/golunteer/backend/pkg/db"
 )
 
-type tasksDB struct {
-	ID      int    `db:"id"`
-	Text    string `db:"text"`
-	Enabled bool   `db:"enabled"`
+type TaskDB struct {
+	ID int `json:"id" db:"id"`
+	Task
 }
 
 type Task struct {
-	Text    string `json:"text"`
-	Enabled bool   `json:"enabled"`
+	Text    string `json:"text" db:"text"`
+	Enabled bool   `json:"enabled" db:"enabled"`
 }
 
-var c *cache.Cache
+func GetSlice() ([]TaskDB, error) {
+	var tasksRaw []TaskDB
 
-func Get() (map[int]Task, error) {
-	if tasks, hit := c.Get("tasks"); !hit {
-		refresh()
-
-		return nil, fmt.Errorf("tasks not stored cached")
+	if err := db.DB.Select(&tasksRaw, "SELECT * FROM TASKS"); err != nil {
+		return nil, err
 	} else {
-		return tasks.(map[int]Task), nil
+		return tasksRaw, nil
 	}
+
 }
 
-func refresh() {
-	// get the tasksRaw from the database
-	var tasksRaw []tasksDB
-
-	if err := db.DB.Select(&tasksRaw, "SELECT * FROM TASKS"); err == nil {
+func GetMap() (map[int]Task, error) {
+	if tasksRaw, err := GetSlice(); err != nil {
+		return nil, err
+	} else {
 		// convert the result in a map
 		tasks := map[int]Task{}
 
@@ -46,14 +39,18 @@ func refresh() {
 			}
 		}
 
-		c.Set("tasks", tasks)
+		return tasks, nil
 	}
 }
 
-func init() {
-	c = cache.New(24 * time.Hour)
+func Add(t Task) error {
+	_, err := db.DB.NamedExec("INSERT INTO TASKS (text, enabled) VALUES (:text, :enabled)", &t)
 
-	c.OnExpired(refresh)
-
-	refresh()
+	return err
+}
+
+func Update(t TaskDB) error {
+	_, err := db.DB.NamedExec("UPDATE TASKS set text = :text, enabled = :enabled WHERE id = :id", &t)
+
+	return err
 }

backend/pkg/router/router.go

@@ -87,11 +87,13 @@ func init() {
 			"events":         postEvent,
 			"users":          postUser,
 			"availabilities": postAvailabilitie,
+			"tasks":          postTask,
 		},
 		"PATCH": {
 			"users":          patchUser,
 			"events":         patchEvent,
 			"availabilities": patchAvailabilities,
+			"tasks":          patchTask,
 		},
 		"PUT": {
 			"users/password": putPassword,

backend/pkg/router/tasks.go

@@ -6,15 +6,112 @@ import (
 )
 
 func getTasks(args HandlerArgs) responseMessage {
-	response := responseMessage{}
+	// check wether the "map"-query is given
+	if args.C.QueryBool("map") {
+		if tasks, err := tasks.GetMap(); err != nil {
+			logger.Error().Msgf("can't get tasks: %v", err)
 
-	if tasks, err := tasks.Get(); err != nil {
-		response.Status = fiber.StatusInternalServerError
-
-		logger.Error().Msgf("can't get tasks: %v", err)
+			return responseMessage{
+				Status: fiber.StatusInternalServerError,
+			}
+		} else {
+			return responseMessage{
+				Data: tasks,
+			}
+		}
 	} else {
-		response.Data = tasks
-	}
+		if taskSlice, err := tasks.GetSlice(); err != nil {
+			logger.Error().Msgf("can't get tasks: %v", err)
 
-	return response
+			return responseMessage{
+				Status: fiber.StatusInternalServerError,
+			}
+		} else {
+			return responseMessage{
+				Data: struct {
+					Tasks []tasks.TaskDB `json:"tasks"`
+				}{Tasks: taskSlice},
+			}
+		}
+	}
+}
+
+func postTask(args HandlerArgs) responseMessage {
+	// check admin
+	if !args.User.Admin {
+		logger.Log().Msgf("user is not admin")
+
+		return responseMessage{
+			Status: fiber.StatusUnauthorized,
+		}
+	} else {
+		// parse the body
+		var task tasks.Task
+
+		if err := args.C.BodyParser(&task); err != nil {
+			logger.Log().Msgf("can't parse body: %v", err)
+
+			return responseMessage{
+				Status: fiber.StatusBadRequest,
+			}
+
+			// validate the body
+		} else if err := validate.Struct(&task); err != nil {
+			logger.Log().Msgf("invalid body: %v", err)
+
+			return responseMessage{
+				Status: fiber.StatusBadRequest,
+			}
+
+			// insert the task into the database
+		} else if err := tasks.Add(task); err != nil {
+			logger.Error().Msgf("can't add task: %v", err)
+
+			return responseMessage{
+				Status: fiber.StatusInternalServerError,
+			}
+		} else {
+			return responseMessage{}
+		}
+	}
+}
+
+func patchTask(args HandlerArgs) responseMessage {
+	// check admin
+	if !args.User.Admin {
+		logger.Log().Msgf("user is not admin")
+
+		return responseMessage{
+			Status: fiber.StatusUnauthorized,
+		}
+	} else {
+		// parse the body
+		var task tasks.TaskDB
+
+		if err := args.C.BodyParser(&task); err != nil {
+			logger.Log().Msgf("can't parse body: %v", err)
+
+			return responseMessage{
+				Status: fiber.StatusBadRequest,
+			}
+
+			// validate the body
+		} else if err := validate.Struct(&task); err != nil {
+			logger.Log().Msgf("invalid body: %v", err)
+
+			return responseMessage{
+				Status: fiber.StatusBadRequest,
+			}
+
+			// insert the task into the database
+		} else if err := tasks.Update(task); err != nil {
+			logger.Error().Msgf("can't update task: %v", err)
+
+			return responseMessage{
+				Status: fiber.StatusInternalServerError,
+			}
+		} else {
+			return responseMessage{}
+		}
+	}
 }