From d6180ddc3e7b6f09ef2b9f9a4a45c8b8ca758170 Mon Sep 17 00:00:00 2001 From: harold Date: Fri, 18 Apr 2025 18:12:52 +0500 Subject: [PATCH] add fix for eroor notification --- internal/api/http/handlers/donat/donat.go | 3 +++ internal/repository/donat/donat.go | 3 +++ internal/repository/widget/widget.go | 1 - internal/service/donat/donat.go | 8 ++++++-- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/internal/api/http/handlers/donat/donat.go b/internal/api/http/handlers/donat/donat.go index 3b5bbbe..5ac0c73 100644 --- a/internal/api/http/handlers/donat/donat.go +++ b/internal/api/http/handlers/donat/donat.go @@ -704,6 +704,9 @@ func GetDonatForPlaying(donatService model.DonatService) echo.HandlerFunc { slog.Error("Failed to get playing donat", "error", err) return echo.NewHTTPError(http.StatusInternalServerError, "Failed to get playing donat") } + if playingDonat.OrderID == "" { + return echo.NewHTTPError(http.StatusNotFound, "Not found active donat!") + } return request.JSON(http.StatusOK, playingDonat) } diff --git a/internal/repository/donat/donat.go b/internal/repository/donat/donat.go index c774d40..0ec8c6b 100644 --- a/internal/repository/donat/donat.go +++ b/internal/repository/donat/donat.go @@ -847,6 +847,9 @@ func (repoDonat *RepoDonat) GetPlayingDonat( ) if err != nil { + if errors.Is(err, pgx.ErrNoRows) { + return model.PlayingDonat{}, nil + } slog.Error("Failed to get playing donats", "error", err) return model.PlayingDonat{}, err } diff --git a/internal/repository/widget/widget.go b/internal/repository/widget/widget.go index d13ff2e..67d1649 100644 --- a/internal/repository/widget/widget.go +++ b/internal/repository/widget/widget.go @@ -73,7 +73,6 @@ func (widgetRepo *RepoWidget) CheckWidgetName( err := row.Scan(&widgetId) if err != nil { if errors.Is(err, pgx.ErrNoRows) { - println("no rows") return false, nil } slog.Error("failed to check widget name", "error", err.Error()) diff --git a/internal/service/donat/donat.go b/internal/service/donat/donat.go index a10903b..ff33517 100644 --- a/internal/service/donat/donat.go +++ b/internal/service/donat/donat.go @@ -650,6 +650,10 @@ func (donatService *ServiceDonat) GetPlayingDonat( return model.PlayingDonat{}, err } + if playingDonat.OrderID == "" { + return playingDonat, nil + } + if playingDonat.Image != nil { imageUuid, err := uuid.Parse(*playingDonat.Image) if err != nil { @@ -660,11 +664,11 @@ func (donatService *ServiceDonat) GetPlayingDonat( } if playingDonat.Audio != nil { - imageUuid, err := uuid.Parse(*playingDonat.Audio) + audioUuid, err := uuid.Parse(*playingDonat.Audio) if err != nil { return model.PlayingDonat{}, err } - fileUrl := donatService.storage.DownloadLink(imageUuid) + fileUrl := donatService.storage.DownloadLink(audioUuid) playingDonat.Audio = &fileUrl }