Merge branch 'deploy' of https://github.com/go-park-mail-ru/2024_2_Team7

into deploy
go-park-mail-ru · Dec 21, 2024 · 45fe48a · 45fe48a
2 parents 539113b + 1784f40
commit 45fe48a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -43,7 +43,7 @@ func main() {
 		log.Fatalf("Failed to connect to auth service: %v", err)
 	}
 
-	userHandler, err := userHandlers.NewHandlers(conf.UserServiceAddr, appLogger)
+	userHandler, err := userHandlers.NewHandlers(conf.UserServiceAddr, conf.ImageServiceAddr, appLogger)
 	if err != nil {
 		log.Fatalf("Failed to connect to user service: %v", err)
 	}

diff --git a/internal/gateway/user/user.go b/internal/gateway/user/user.go
@@ -10,7 +10,6 @@ import (
 	pbImage "kudago/internal/image/api"
 	"kudago/internal/logger"
 	pb "kudago/internal/user/api"
-	user "kudago/internal/user/api"
 
 	"github.com/asaskevich/govalidator"
 	"google.golang.org/grpc"
@@ -31,14 +30,20 @@ type UserHandlers struct {
 	logger       *logger.Logger
 }
 
-func NewHandlers(userServiceAddr string, logger *logger.Logger) (*UserHandlers, error) {
+func NewHandlers(userServiceAddr string,  imageServiceAddr string, logger *logger.Logger) (*UserHandlers, error) {
 	authConn, err := grpc.NewClient(userServiceAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		return nil, err
 	}
 
+	imageConn, err := grpc.NewClient(imageServiceAddr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	if err != nil {
+		return nil, err
+	}
+
 	return &UserHandlers{
-		UserService: user.NewUserServiceClient(authConn),
+		UserService: pb.NewUserServiceClient(authConn),
+		ImageService: pbImage.NewImageServiceClient(imageConn),
 		logger:      logger,
 	}, nil
 }