[extapi] fixed missing participations returning error

DictumMortuum · Oct 20, 2024 · 8365a16 · 8365a16
1 parent c5a8e26
commit 8365a16
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/cmd/servus-extapi/main.go b/cmd/servus-extapi/main.go
@@ -12,7 +12,7 @@ import (
 
 func Version(c *gin.Context) {
 	rs := map[string]any{
-		"version": "v0.0.31",
+		"version": "v0.0.32",
 	}
 	c.AbortWithStatusJSON(200, rs)
 }

diff --git a/pkg/model/eurovisionparticipations.go b/pkg/model/eurovisionparticipations.go
@@ -2,6 +2,7 @@ package model
 
 import (
 	"encoding/json"
+	"errors"
 
 	"gorm.io/gorm"
 	"gorm.io/gorm/clause"
@@ -98,6 +99,10 @@ func GetEurovisionParticipationsByUserId(req *Map, res *Map) error {
 
 	var data EurovisionParticipation
 	rs := DB.Preload("Boardgame").First(&data, "user_id = ? ", id)
+	if errors.Is(rs.Error, gorm.ErrRecordNotFound) {
+		res.Set("data", EurovisionParticipation{})
+		return nil
+	}
 	if rs.Error != nil {
 		return rs.Error
 	}

diff --git a/pkg/model/eurovisionvotes.go b/pkg/model/eurovisionvotes.go
@@ -51,7 +51,9 @@ func GetEurovisionVoteByUserId(req *Map, res *Map) error {
 	var data EurovisionVote
 	rs := DB.First(&data, "user_id = ? ", id)
 	if errors.Is(rs.Error, gorm.ErrRecordNotFound) {
-		res.Set("data", nil)
+		res.Set("data", EurovisionVote{
+			Votes: datatypes.JSON([]byte(`[]`)),
+		})
 		return nil
 	}
 	if rs.Error != nil {