From 07feb21880af7e75ab4f95feaf60203533b284dc Mon Sep 17 00:00:00 2001 From: mm Date: Tue, 29 Oct 2024 23:08:16 +0500 Subject: [PATCH] dev --- internal/api/http/handlers/target/target.go | 8 ++++---- internal/repository/target/target.go | 2 +- pkg/logger/logger.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/api/http/handlers/target/target.go b/internal/api/http/handlers/target/target.go index 2727ece..64ad184 100644 --- a/internal/api/http/handlers/target/target.go +++ b/internal/api/http/handlers/target/target.go @@ -34,7 +34,7 @@ func CreateTarget(targetService model.TargetService, authClient model.AuthClient err = targetService.CreateTarget(ctx, model.StreamerID(authData.StreamerID), body.Amount, body.Text) if err != nil { slog.Error(err.Error()) - return request.JSON(http.StatusInternalServerError, err) + return request.JSON(http.StatusInternalServerError, err.Error()) } return request.String(http.StatusOK, "Created target successfully") } @@ -59,7 +59,7 @@ func GetAllTarget(targetService model.TargetService) echo.HandlerFunc { targets, err := targetService.GetAllTarget(ctx, body.StreamerID) if err != nil { slog.Error(err.Error()) - return request.JSON(http.StatusInternalServerError, err) + return request.JSON(http.StatusInternalServerError, err.Error()) } return request.JSON(http.StatusOK, targets) @@ -88,13 +88,13 @@ func AddAmountTarget( donat, err := donatService.GetDonatByOrderID(ctx, body.OrderID) if err != nil { slog.Error(err.Error()) - return request.JSON(http.StatusInternalServerError, err) + return request.JSON(http.StatusInternalServerError, err.Error()) } err = targetService.AddAmountToTarget(ctx, donat.TargetID, donat.Amount) if err != nil { slog.Error(err.Error()) - return request.JSON(http.StatusInternalServerError, err) + return request.JSON(http.StatusInternalServerError, err.Error()) } return request.JSON(http.StatusOK, "Added target successfully") } diff --git a/internal/repository/target/target.go b/internal/repository/target/target.go index 508f137..2a35314 100644 --- a/internal/repository/target/target.go +++ b/internal/repository/target/target.go @@ -56,7 +56,7 @@ func (targetRepo *RepoTarget) GetAllTarget( var targets []*model.Target err = pgxscan.ScanAll(&targets, rows) if err != nil { - slog.Error("targetRepo.db.Query", err) + slog.Error(err.Error()) return nil, err } if len(targets) == 0 { diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go index 50ee8e7..cbdbfe7 100644 --- a/pkg/logger/logger.go +++ b/pkg/logger/logger.go @@ -10,6 +10,6 @@ func New() { Level: slog.LevelDebug, AddSource: true, } - logger := slog.New(slog.NewJSONHandler(os.Stdout, opts)) + logger := slog.New(slog.NewTextHandler(os.Stdout, opts)) slog.SetDefault(logger) }