fix getSessionData

go-park-mail-ru · Dec 21, 2024 · 639e652 · 639e652
1 parent 49dfb3e
commit 639e652
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/microservices/auth_service/cmd/main.go b/microservices/auth_service/cmd/main.go
@@ -60,7 +60,7 @@ func main() {
 
 	sessionService := session.NewSessionService(redisStore)
 	auRepository := authRepository.NewAuthRepository(db)
-	auUseCase := authUseCase.NewAuthUseCase(auRepository, minioService)
+	auUseCase := authUseCase.NewAuthUseCase(auRepository, minioService, redisStore)
 	authServer := grpcAuth.NewGrpcAuthHandler(auUseCase, sessionService, jwtToken)
 
 	grpcServer := grpc.NewServer(

diff --git a/microservices/auth_service/controller/auth_grpc.go b/microservices/auth_service/controller/auth_grpc.go
@@ -219,7 +219,7 @@ func (h *GrpcAuthHandler) PutUser(ctx context.Context, in *gen.PutUserRequest) (
 		Birthdate:  (in.Creds.Birthdate).AsTime(),
 		IsHost:     in.Creds.IsHost,
 	}
-	err = h.usecase.PutUser(ctx, Payload, userID, in.Avatar)
+	err = h.usecase.PutUser(ctx, Payload, userID, in.Avatar, in.SessionId)
 	if err != nil {
 		logger.AccessLogger.Warn("Failed to put user",
 			zap.String("request_id", requestID),

diff --git a/microservices/auth_service/usecase/auth_usecase.go b/microservices/auth_service/usecase/auth_usecase.go
@@ -5,19 +5,21 @@ import (
 	"2024_2_FIGHT-CLUB/internal/service/images"
 	"2024_2_FIGHT-CLUB/internal/service/logger"
 	"2024_2_FIGHT-CLUB/internal/service/middleware"
+	"2024_2_FIGHT-CLUB/internal/service/session"
 	"2024_2_FIGHT-CLUB/internal/service/validation"
 	"context"
 	"errors"
 	"github.com/mailru/easyjson"
 	"go.uber.org/zap"
 	"net/http"
 	"regexp"
+	"time"
 )
 
 type AuthUseCase interface {
 	RegisterUser(ctx context.Context, creds *domain.User) error
 	LoginUser(ctx context.Context, creds *domain.User) (*domain.User, error)
-	PutUser(ctx context.Context, creds *domain.User, userID string, avatar []byte) error
+	PutUser(ctx context.Context, creds *domain.User, userID string, avatar []byte, sessionId string) error
 	GetAllUser(ctx context.Context) ([]domain.User, error)
 	GetUserById(ctx context.Context, userID string) (*domain.User, error)
 	UpdateUserRegions(ctx context.Context, regions domain.UpdateUserRegion, userId string) error
@@ -27,12 +29,14 @@ type AuthUseCase interface {
 type authUseCase struct {
 	authRepository domain.AuthRepository
 	minioService   images.MinioServiceInterface
+	store          session.RedisInterface
 }
 
-func NewAuthUseCase(authRepository domain.AuthRepository, minioService images.MinioServiceInterface) AuthUseCase {
+func NewAuthUseCase(authRepository domain.AuthRepository, minioService images.MinioServiceInterface, store session.RedisInterface) AuthUseCase {
 	return &authUseCase{
 		authRepository: authRepository,
 		minioService:   minioService,
+		store:          store,
 	}
 }
 
@@ -157,7 +161,7 @@ func (uc *authUseCase) LoginUser(ctx context.Context, creds *domain.User) (*doma
 	return requestedUser, nil
 }
 
-func (uc *authUseCase) PutUser(ctx context.Context, creds *domain.User, userID string, avatar []byte) error {
+func (uc *authUseCase) PutUser(ctx context.Context, creds *domain.User, userID string, avatar []byte, sessionId string) error {
 	requestID := middleware.GetRequestID(ctx)
 	const maxLen = 255
 	validCharPattern := regexp.MustCompile(`^[a-zA-Zа-яА-Я0-9@.,\s\-_]*$`)
@@ -225,6 +229,20 @@ func (uc *authUseCase) PutUser(ctx context.Context, creds *domain.User, userID s
 		}
 		return err
 	}
+
+	sessionStore := uc.store
+	sessionData, err := sessionStore.Get(ctx, sessionId)
+	if err != nil {
+		logger.AccessLogger.Warn("Failed to get session from Redis", zap.String("request_id", requestID), zap.Error(err))
+		return errors.New("failed to update Redis")
+	}
+
+	sessionData.Avatar = creds.Avatar
+	if err := sessionStore.Set(ctx, sessionId, sessionData, 24*time.Hour); err != nil {
+		logger.AccessLogger.Warn("Failed to update session in Redis", zap.String("request_id", requestID), zap.Error(err))
+		return errors.New("failed to update Redis")
+	}
+
 	return nil
 }