fix get current and next do not fail if nothing found

SwimResults · Jun 7, 2024 · ccadf1f · ccadf1f
1 parent 2706073
commit ccadf1f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/dto/current_next_heat_dto.go b/dto/current_next_heat_dto.go
@@ -3,6 +3,6 @@ package dto
 import "github.com/swimresults/start-service/model"
 
 type CurrentNextHeatDto struct {
-	Current model.Heat `json:"current"`
-	Next    model.Heat `json:"next"`
+	Current *model.Heat `json:"current"`
+	Next    *model.Heat `json:"next"`
 }
diff --git a/service/heat_service.go b/service/heat_service.go
@@ -103,9 +103,16 @@ func GetCurrentHeat(meeting string) (model.Heat, error) {
 }
 
 func GetCurrentAndNextHeat(meeting string) (*dto.CurrentNextHeatDto, error) {
+	var dto dto.CurrentNextHeatDto
 	current, err := GetCurrentHeat(meeting)
 	if err != nil {
-		return nil, err
+		if err.Error() == "no entry found" {
+			dto.Current = nil
+		} else {
+			return nil, err
+		}
+	} else {
+		dto.Current = &current
 	}
 
 	next, err := getHeatByBsonDocumentWithOptions(
@@ -121,13 +128,16 @@ func GetCurrentAndNextHeat(meeting string) (*dto.CurrentNextHeatDto, error) {
 		true,
 	)
 	if err != nil {
-		return nil, err
+		if err.Error() == "no entry found" {
+			dto.Next = nil
+		} else {
+			return nil, err
+		}
+	} else {
+		dto.Next = &next
 	}
 
-	return &dto.CurrentNextHeatDto{
-		Current: current,
-		Next:    next,
-	}, nil
+	return &dto, nil
 }
 
 func GetHeats() ([]model.Heat, error) {