azpect/Potion
1
1
Fork 0
Code Issues 9 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '(FIX): Fixed the issue with null returns from the RotW!' (#36) from dev into master
All checks were successful
Deploy application with Docker / build_and_deploy (push) Successful in 38s
Details

Browse Source 
Reviewed-on: #36
This commit is contained in:
Hayden Hargreaves 2025-07-26 23:21:34 -07:00
commit c5bbda1b69
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/infrastructure/database/repository/recipe_repository.go
View File

@ -3,6 +3,7 @@ package repository
import ( import (
"database/sql" "database/sql"
"encoding/json" "encoding/json"
"errors"
"fmt" "fmt"
"strings" "strings"
@ -848,7 +849,8 @@ func (r *RecipeRepository) GetRecipeFavorite(recipe *domain.Recipe, userId int)
// GetRecipeOfTheWeek searches for the most recent recipe of the week. If there is not a value, // GetRecipeOfTheWeek searches for the most recent recipe of the week. If there is not a value,
// the recipe will be nil. This function simply collects the most recent entry in the recipeoftheweek // the recipe will be nil. This function simply collects the most recent entry in the recipeoftheweek
// table and return it. Any errors will be bubbled to the caller. // table and return it. If there is no entry, nil will be returned Any errors will be bubbled to
// the caller.
func (r *RecipeRepository) GetRecipeOfTheWeek(userId *int) (*domain.Recipe, error) { func (r *RecipeRepository) GetRecipeOfTheWeek(userId *int) (*domain.Recipe, error) {
tx, err := r.db.Begin() tx, err := r.db.Begin()
if err != nil { if err != nil {
@ -884,6 +886,9 @@ func (r *RecipeRepository) GetRecipeOfTheWeek(userId *int) (*domain.Recipe, erro
&recipe.Modified, &recipe.Modified,
&recipe.Created, &recipe.Created,
); err != nil { ); err != nil {
if errors.Is(err, sql.ErrNoRows) {
return nil, nil
}
return nil, fmt.Errorf("Failed to location recipe in database: %s", err.Error()) return nil, fmt.Errorf("Failed to location recipe in database: %s", err.Error())
} }