seeseemelk/allowance_planner_2000
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix colour not being sent properly by backend (#81)
All checks were successful
Backend Deploy / build (push) Successful in 2m46s
Details
Backend Build and Test / build (push) Successful in 3m0s
Details

Browse Source 
Reviewed-on: #81
This commit is contained in:
Sebastiaan de Schaetzen 2025-05-25 14:36:17 +02:00
parent 5a233073c7
commit f9fb956efd
4 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitea/workflows/deploy.yml
View File

@ -19,9 +19,9 @@ jobs:
- name: Build
run: |
cd backend
docker build -t gitea.seeseepuff.be/seeseemelk/wolproxy:$(git rev-parse --short HEAD) .
docker build -t gitea.seeseepuff.be/seeseemelk/allowance-planner:$(git rev-parse --short HEAD) .
- name: Push
run: |
cd backend
docker push gitea.seeseepuff.be/seeseemelk/wolproxy:$(git rev-parse --short HEAD)
docker push gitea.seeseepuff.be/seeseemelk/allowance-planner:$(git rev-parse --short HEAD)

38
backend/api_test.go
View File

@ -9,7 +9,7 @@ import (
)
const (
TestAllowanceName = "Test History"
TestHistoryName = "Test History"
)
func startServer(t *testing.T) *httpexpect.Expect {
@ -62,7 +62,7 @@ func TestGetUserAllowance(t *testing.T) {
// Create a new allowance
requestBody := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 5000,
"weight": 10,
}
@ -73,7 +73,7 @@ func TestGetUserAllowance(t *testing.T) {
result.Length().IsEqual(2)
item := result.Value(1).Object()
item.Value("id").IsEqual(1)
item.Value("name").IsEqual(TestAllowanceName)
item.Value("name").IsEqual(TestHistoryName)
item.Value("target").IsEqual(5000)
item.Value("weight").IsEqual(10)
item.Value("progress").IsEqual(0)
@ -95,7 +95,7 @@ func TestCreateUserAllowance(t *testing.T) {
// Create a new allowance
requestBody := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 5000,
"weight": 10,
}
@ -120,7 +120,7 @@ func TestCreateUserAllowance(t *testing.T) {
allowance := allowances.Value(1).Object()
allowance.Value("id").IsEqual(allowanceId)
allowance.Value("name").IsEqual(TestAllowanceName)
allowance.Value("name").IsEqual(TestHistoryName)
allowance.Value("target").IsEqual(5000)
allowance.Value("weight").IsEqual(10)
allowance.Value("progress").IsEqual(0)
@ -130,7 +130,7 @@ func TestCreateUserAllowanceNoUser(t *testing.T) {
e := startServer(t)
requestBody := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 5000,
"weight": 10,
}
@ -171,7 +171,7 @@ func TestCreateUserAllowanceBadId(t *testing.T) {
e := startServer(t)
requestBody := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 5000,
"weight": 10,
}
@ -187,7 +187,7 @@ func TestDeleteUserAllowance(t *testing.T) {
// Create a new allowance to delete
createRequest := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 1000,
"weight": 5,
}
@ -434,7 +434,7 @@ func TestPutTaskInvalidTaskId(t *testing.T) {
e.PUT("/task/999").WithJSON(requestBody).Expect().Status(404)
}
func TestPostAllowance(t *testing.T) {
func TestPostHistory(t *testing.T) {
e := startServer(t)
e.POST("/user/1/history").WithJSON(PostHistory{Allowance: 100}).Expect().Status(200)
@ -445,7 +445,7 @@ func TestPostAllowance(t *testing.T) {
response.Value("allowance").Number().IsEqual(100 + 20 - 10)
}
func TestPostAllowanceInvalidUserId(t *testing.T) {
func TestPostHistoryInvalidUserId(t *testing.T) {
e := startServer(t)
e.POST("/user/999/history").WithJSON(PostHistory{Allowance: 100}).Expect().
@ -472,9 +472,10 @@ func TestGetUserAllowanceById(t *testing.T) {
// Create a new allowance
requestBody := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 5000,
"weight": 10,
"colour": "#FF5733",
}
resp := e.POST("/user/1/allowance").WithJSON(requestBody).Expect().Status(201).JSON().Object()
allowanceId := int(resp.Value("id").Number().Raw())
@ -482,10 +483,21 @@ func TestGetUserAllowanceById(t *testing.T) {
// Retrieve the created allowance by ID
result := e.GET("/user/1/allowance/" + strconv.Itoa(allowanceId)).Expect().Status(200).JSON().Object()
result.Value("id").IsEqual(allowanceId)
result.Value("name").IsEqual(TestAllowanceName)
result.Value("name").IsEqual(TestHistoryName)
result.Value("target").IsEqual(5000)
result.Value("weight").IsEqual(10)
result.Value("progress").IsEqual(0)
result.Value("colour").IsEqual("#FF5733")
resultArray := e.GET("/user/1/allowance").Expect().Status(200).JSON().Array()
resultArray.Length().IsEqual(2)
result = resultArray.Value(1).Object()
result.Value("id").IsEqual(allowanceId)
result.Value("name").IsEqual(TestHistoryName)
result.Value("target").IsEqual(5000)
result.Value("weight").IsEqual(10)
result.Value("progress").IsEqual(0)
result.Value("colour").IsEqual("#FF5733")
}
func TestGetUserByAllowanceIdInvalidAllowance(t *testing.T) {
@ -513,7 +525,7 @@ func TestPutAllowanceById(t *testing.T) {
// Create a new allowance
requestBody := map[string]interface{}{
"name": TestAllowanceName,
"name": TestHistoryName,
"target": 5000,
"weight": 10,
"colour": "#FF5733",

4
backend/colour.go
View File

@ -28,3 +28,7 @@ func ConvertStringToColour(colourStr string) (int, error) {
}
return colour, nil
}
func ConvertColourToString(colour int) string {
return fmt.Sprintf("#%06X", colour)
}

13
backend/db.go
View File

@ -2,7 +2,6 @@ package main
import (
"errors"
"fmt"
"log"
"math"
"time"
@ -84,13 +83,14 @@ func (db *Db) GetUserAllowances(userId int) ([]Allowance, error) {
totalAllowance.Progress = float64(progress) / 100.0
allowances = append(allowances, totalAllowance)
for row := range db.db.Query("select id, name, target, balance, weight from allowances where user_id = ?").
for row := range db.db.Query("select id, name, target, balance, weight, colour from allowances where user_id = ?").
Bind(userId).Range(&err) {
allowance := Allowance{}
var target, progress int
err = row.Scan(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight)
var target, progress, colour int
err = row.Scan(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight, &colour)
allowance.Target = float64(target) / 100.0
allowance.Progress = float64(progress) / 100.0
allowance.Colour = ConvertColourToString(colour)
if err != nil {
return nil, err
}
@ -113,13 +113,14 @@ func (db *Db) GetUserAllowanceById(userId int, allowanceId int) (*Allowance, err
return nil, err
}
} else {
var target, progress, colour int64
var target, progress int64
var colour int
err := db.db.Query("select id, name, target, balance, weight, colour from allowances where user_id = ? and id = ?").
Bind(userId, allowanceId).
ScanSingle(&allowance.ID, &allowance.Name, &target, &progress, &allowance.Weight, &colour)
allowance.Target = float64(target) / 100.0
allowance.Progress = float64(progress) / 100.0
allowance.Colour = fmt.Sprintf("#%06X", colour)
allowance.Colour = ConvertColourToString(colour)
if err != nil {
return nil, err
}