From e20ab2db2b00645ea00d96d4d8f10b852fd69456 Mon Sep 17 00:00:00 2001 From: harold Date: Tue, 25 Feb 2025 11:52:19 +0500 Subject: [PATCH] add fix --- .gitignore | 3 ++- cmd/main.go | 2 +- internal/api/http/handlers/donat/donat.go | 25 ++++++++--------------- internal/config/config.yaml | 21 ------------------- internal/repository/widget/widget.go | 4 ++-- 5 files changed, 14 insertions(+), 41 deletions(-) delete mode 100644 internal/config/config.yaml diff --git a/.gitignore b/.gitignore index 723ef36..c1645c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -.idea \ No newline at end of file +.idea +internal/config/config.yaml \ No newline at end of file diff --git a/cmd/main.go b/cmd/main.go index 679a98c..0c164ec 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -11,7 +11,7 @@ import ( import ( "donat-widget/infrastructure/pg" - "donat-widget/infrastructure/weed" + //"donat-widget/infrastructure/weed" AuthClient "donat-widget/pkg/api/auth" PaymentClient "donat-widget/pkg/api/payment" ) diff --git a/internal/api/http/handlers/donat/donat.go b/internal/api/http/handlers/donat/donat.go index 28dd551..0a14d31 100644 --- a/internal/api/http/handlers/donat/donat.go +++ b/internal/api/http/handlers/donat/donat.go @@ -181,24 +181,17 @@ func UpdateDonatePage(donatService model.DonatService) echo.HandlerFunc { if form != nil { if backgroundFiles, ok := form.File["background"]; ok && len(backgroundFiles) > 0 { - backgroundFile := backgroundFiles[0] - err := saveUploadedFile(backgroundFile.Open(), "uploads/backgrounds/") - if err != nil { - slog.Error("Failed to save background:", err) - return echo.NewHTTPError(http.StatusInternalServerError, "Failed to save background") - } - } - - // Проверяем и сохраняем avatar, если он передан - if avatarFiles, ok := form.File["avatar"]; ok && len(avatarFiles) > 0 { - avatarFile := avatarFiles[0] - err := saveUploadedFile(avatarFile, "uploads/avatars/") - if err != nil { - slog.Error("Failed to save avatar:", err) - return echo.NewHTTPError(http.StatusInternalServerError, "Failed to save avatar") - } + return echo.NewHTTPError(http.StatusInternalServerError, "Failed to save background") } } + + // Проверяем и сохраняем avatar, если он передан + if avatarFiles, ok := form.File["avatar"]; ok && len(avatarFiles) > 0 { + + return echo.NewHTTPError(http.StatusInternalServerError, "Failed to save avatar") + } + + return nil } } diff --git a/internal/config/config.yaml b/internal/config/config.yaml deleted file mode 100644 index d4b6d4e..0000000 --- a/internal/config/config.yaml +++ /dev/null @@ -1,21 +0,0 @@ -db: - port: "5432" - host: "widget-db" - password: "postgres" - username: "postgres" - dbname: "postgres" - -server: - port: "8002" - -storage: - filer: "http://80.87.195.57:8111" - master: "http://80.87.195.57:9333" - -paymentService: - host: "donat-payment" - port: "8003" - -authService: - host: "donat-auth" - port: "8001" \ No newline at end of file diff --git a/internal/repository/widget/widget.go b/internal/repository/widget/widget.go index 915047c..4bb4ec3 100644 --- a/internal/repository/widget/widget.go +++ b/internal/repository/widget/widget.go @@ -118,13 +118,13 @@ func (widgetRepo *RepoWidget) SetMediaFile( size int64, collection string, ) (model.FileID, error) { - fileData, err := widgetRepo.storage.Upload(file, filename, size, collection) + fileID, err := widgetRepo.storage.Upload(file, filename, size, collection) if err != nil { slog.Error(err.Error()) return "", err } - return model.FileID(fileData.FileID), nil + return fileID, nil } func (widgetRepo *RepoWidget) GetMediaFile(