diff --git a/backend/api_test.go b/backend/api_test.go index a5eaf29..f1b6f46 100644 --- a/backend/api_test.go +++ b/backend/api_test.go @@ -361,10 +361,6 @@ func TestGetTaskWhenNoTasks(t *testing.T) { result.Length().IsEqual(0) } -func createTestTask(e *httpexpect.Expect) int { - return createTestTaskWithAmount(e, 100) -} - func createTestTaskWithAmount(e *httpexpect.Expect, amount int) int { requestBody := map[string]interface{}{ "name": "Test Task", @@ -594,6 +590,39 @@ func TestCompleteTask(t *testing.T) { } } +func TestCompleteTaskAllowanceWeightsSumTo0(t *testing.T) { + e := startServer(t) + taskId := createTestTaskWithAmount(e, 101) + + e.GET("/tasks").Expect().Status(200).JSON().Array().Length().IsEqual(1) + + // Update rest allowance + e.PUT("/user/1/allowance/0").WithJSON(UpdateAllowanceRequest{ + Weight: 0, + }).Expect().Status(200) + // Create an allowance goal + createTestAllowance(e, "Test Allowance 1", 1000, 0) + + // Complete the task + e.POST("/task/" + strconv.Itoa(taskId) + "/complete").Expect().Status(200) + + // Verify the task is marked as completed + e.GET("/task/" + strconv.Itoa(taskId)).Expect().Status(404) + + // Verify the allowances are updated for user 1 + allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array() + allowances.Length().IsEqual(2) + allowances.Value(0).Object().Value("id").Number().IsEqual(0) + allowances.Value(0).Object().Value("progress").Number().IsEqual(101) + allowances.Value(1).Object().Value("id").Number().IsEqual(1) + allowances.Value(1).Object().Value("progress").Number().IsEqual(0) +} + +func TestCompleteTaskInvalidId(t *testing.T) { + e := startServer(t) + e.POST("/task/999/complete").Expect().Status(404) +} + func TestCompleteTaskAllowanceWeightsSumTo0(t *testing.T) { e := startServer(t) taskId := createTestTaskWithAmount(e, 101) @@ -626,21 +655,10 @@ func TestCompleteTaskAllowanceWeightsSumTo0(t *testing.T) { allowances.Value(1).Object().Value("progress").Number().IsEqual(0) } -func TestCompleteTaskInvalidId(t *testing.T) { - e := startServer(t) - e.POST("/task/999/complete").Expect().Status(404) -} - func TestCompleteAllowance(t *testing.T) { e := startServer(t) createTestTaskWithAmount(e, 100) - - // Create allowance goal - e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{ - Name: "Test Allowance 1", - Target: 100, - Weight: 50, - }).Expect().Status(201) + createTestAllowance(e, "Test Allowance 1", 100, 50) // Complete the task e.POST("/task/1/complete").Expect().Status(200) @@ -670,8 +688,54 @@ func TestCompleteAllowanceInvalidAllowanceId(t *testing.T) { e.POST("/user/1/allowance/999/complete").Expect().Status(404) } +func TestPutBulkAllowance(t *testing.T) { + e := startServer(t) + + createTestAllowance(e, "Test Allowance 1", 1000, 1) + createTestAllowance(e, "Test Allowance 2", 1000, 2) + + // Bulk edit + request := []map[string]interface{}{ + { + "id": 1, + "weight": 5, + }, + { + "id": 0, + "weight": 99, + }, + { + "id": 2, + "weight": 10, + }, + } + e.PUT("/user/1/allowance").WithJSON(request).Expect().Status(200) + + // Verify the allowances are updated + allowances := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array() + allowances.Length().IsEqual(3) + allowances.Value(0).Object().Value("id").Number().IsEqual(0) + allowances.Value(0).Object().Value("weight").Number().IsEqual(99) + allowances.Value(1).Object().Value("id").Number().IsEqual(1) + allowances.Value(1).Object().Value("weight").Number().IsEqual(5) + allowances.Value(2).Object().Value("id").Number().IsEqual(2) + allowances.Value(2).Object().Value("weight").Number().IsEqual(10) +} + func getDelta(base time.Time, delta float64) (time.Time, time.Time) { start := base.Add(-time.Duration(delta) * time.Second) end := base.Add(time.Duration(delta) * time.Second) return start, end } + +func createTestAllowance(e *httpexpect.Expect, name string, target int, weight float64) { + e.POST("/user/1/allowance").WithJSON(CreateAllowanceRequest{ + Name: name, + Target: target, + Weight: weight, + }).Expect().Status(201) +} + +func createTestTask(e *httpexpect.Expect) int { + return createTestTaskWithAmount(e, 100) +} diff --git a/backend/db.go b/backend/db.go index 100040c..fe02ac2 100644 --- a/backend/db.go +++ b/backend/db.go @@ -251,6 +251,31 @@ func (db *Db) UpdateAllowance(userId int, allowanceId int, allowance *UpdateAllo return tx.Commit() } +func (db *Db) BulkUpdateAllowance(userId int, allowances []BulkUpdateAllowanceRequest) error { + tx, err := db.db.Begin() + if err != nil { + return err + } + defer tx.MustRollback() + + for _, allowance := range allowances { + if allowance.ID == 0 { + err = tx.Query("update users set weight=? where id = ?"). + Bind(allowance.Weight, userId). + Exec() + } else { + err = tx.Query("update allowances set weight=? where id = ? and user_id = ?"). + Bind(allowance.Weight, allowance.ID, userId). + Exec() + } + if err != nil { + return err + } + } + + return tx.Commit() +} + func (db *Db) CreateTask(task *CreateTaskRequest) (int, error) { tx, err := db.db.Begin() if err != nil { diff --git a/backend/dto.go b/backend/dto.go index 78f75f6..1cd3b27 100644 --- a/backend/dto.go +++ b/backend/dto.go @@ -31,23 +31,28 @@ type Task struct { } type Allowance struct { - ID int `json:"id"` - Name string `json:"name"` - Target int `json:"target"` - Progress int `json:"progress"` - Weight int `json:"weight"` + ID int `json:"id"` + Name string `json:"name"` + Target int `json:"target"` + Progress int `json:"progress"` + Weight float64 `json:"weight"` } type CreateAllowanceRequest struct { - Name string `json:"name"` - Target int `json:"target"` - Weight int `json:"weight"` + Name string `json:"name"` + Target int `json:"target"` + Weight float64 `json:"weight"` } type UpdateAllowanceRequest struct { - Name string `json:"name"` - Target int `json:"target"` - Weight int `json:"weight"` + Name string `json:"name"` + Target int `json:"target"` + Weight float64 `json:"weight"` +} + +type BulkUpdateAllowanceRequest struct { + ID int `json:"id"` + Weight float64 `json:"weight"` } type CreateGoalResponse struct { diff --git a/backend/main.go b/backend/main.go index 512bdf3..2102399 100644 --- a/backend/main.go +++ b/backend/main.go @@ -189,6 +189,44 @@ func createUserAllowance(c *gin.Context) { c.IndentedJSON(http.StatusCreated, response) } +func bulkPutUserAllowance(c *gin.Context) { + userIdStr := c.Param("userId") + + userId, err := strconv.Atoi(userIdStr) + if err != nil { + log.Printf(ErrInvalidUserID+": %v", err) + c.JSON(http.StatusBadRequest, gin.H{"error": ErrInvalidUserID}) + return + } + + exists, err := db.UserExists(userId) + if err != nil { + log.Printf(ErrCheckingUserExist, err) + c.JSON(http.StatusInternalServerError, gin.H{"error": ErrInternalServerError}) + return + } + if !exists { + c.JSON(http.StatusNotFound, gin.H{"error": ErrUserNotFound}) + return + } + + var allowanceRequest []BulkUpdateAllowanceRequest + if err := c.ShouldBindJSON(&allowanceRequest); err != nil { + log.Printf("Error parsing request body: %v", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "Invalid request body"}) + return + } + + err = db.BulkUpdateAllowance(userId, allowanceRequest) + if err != nil { + log.Printf("Error updating allowance: %v", err) + c.JSON(http.StatusInternalServerError, gin.H{"error": ErrInternalServerError}) + return + } + + c.IndentedJSON(http.StatusOK, gin.H{"message": "Allowance updated successfully"}) +} + func deleteUserAllowance(c *gin.Context) { userIdStr := c.Param("userId") allowanceIdStr := c.Param("allowanceId") @@ -558,6 +596,7 @@ func start(ctx context.Context, config *ServerConfig) { router.GET("/api/user/:userId/history", getHistory) router.GET("/api/user/:userId/allowance", getUserAllowance) router.POST("/api/user/:userId/allowance", createUserAllowance) + router.PUT("/api/user/:userId/allowance", bulkPutUserAllowance) router.GET("/api/user/:userId/allowance/:allowanceId", getUserAllowanceById) router.DELETE("/api/user/:userId/allowance/:allowanceId", deleteUserAllowance) router.PUT("/api/user/:userId/allowance/:allowanceId", putUserAllowance)