Merge pull request #13 from one-project-one-month/ft/cms1-6

Implement GET /me and PATCH /userProfileUpdate Routes . Conflict resolved

Author: SwanHtetAungPhyo

backend/cms-sys/cmd/main.go

@@ -68,6 +68,7 @@ func main() {
 		appLogger.WithError(err).Fatal("Failed to migrate database")
 		return
 	}
+
 	if err := utils.InitRedis(); err != nil {
 		appLogger.Fatal("Failed to initialize Redis:", err)
 	}
@@ -76,7 +77,7 @@ func main() {
 		if err != nil {
 			appLogger.WithError(err).Fatal("Failed to close Redis connection")
 		}
-	}()
+  }()
 	//if err := utils.InitJWTKeysFromVault(); err != nil {
 	//	log.Fatalf("Vault key init failed: %v", err)
 	//}
@@ -91,7 +92,7 @@ func main() {
 	healthChecker := utils.NewHealthChecker(dbConnection.DB, appLogger)
 
 	app := fiber.New(fiber.Config{
-		AppName: "CMS Multi-Tenant System",
+		AppName: "CMS Multi-Tenant System ",
 		ErrorHandler: func(c *fiber.Ctx, err error) error {
 			code := fiber.StatusInternalServerError
 			var e *fiber.Error

backend/cms-sys/internal/handler/auth_handler.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/go-playground/validator/v10"
 	"github.com/gofiber/fiber/v2"
+	"github.com/google/uuid"
 
 	"github.com/multi-tenants-cms-golang/cms-sys/internal/service"
 	"github.com/multi-tenants-cms-golang/cms-sys/internal/types"
@@ -16,6 +17,8 @@ type AuthHandle interface {
 	Register(c *fiber.Ctx) error
 	Logout(c *fiber.Ctx) error
 	Refresh(c *fiber.Ctx) error
+	GetMe(c *fiber.Ctx) error
+	UpdateUserProfile(c *fiber.Ctx) error
 }
 
 type Handler struct {
@@ -115,3 +118,47 @@ func (h *Handler) Refresh(c *fiber.Ctx) error {
 
 	return utils.SuccessResponse(c, "Token refreshed successfully", tokenResponse)
 }
+
+func (h *Handler) GetMe(c *fiber.Ctx) error {
+	var req types.GetMeRequest
+	if err := c.BodyParser(&req); err != nil {
+		return utils.BadRequestResponse(c, "Invalid request body", err.Error())
+	}
+
+	if err := h.validator.Struct(&req); err != nil {
+		return utils.BadRequestResponse(c, "Validation failed", err.Error())
+	}
+
+	profileResponse, err := h.service.GetMe(req)
+
+	if err != nil {
+		return utils.UnauthorizedResponse(c, err.Error())
+	}
+
+	return utils.SuccessResponse(c, "Get User Information successfully", profileResponse)
+}
+
+func (h *Handler) UpdateUserProfile(c *fiber.Ctx) error {
+	stringId := c.Params("id")
+
+	id, err := uuid.Parse(stringId)
+
+	if err != nil {
+		return utils.BadRequestResponse(c, "The provided ID is not a valid UUID", err.Error())
+	}
+	var req types.UserUpdateRequest
+	if err := c.BodyParser(&req); err != nil {
+		return utils.BadRequestResponse(c, "Invalid request body", err.Error())
+	}
+	if err := h.validator.Struct(&req); err != nil {
+		return utils.BadRequestResponse(c, "Validation failed!", err.Error())
+	}
+
+	updatedProfileResponse, err := h.service.UpdateUserProfile(id, req)
+
+	if err != nil {
+		return utils.InternalServerErrorResponse(c, "Failed to update user profile", err.Error())
+	}
+	return utils.SuccessResponse(c, "User profile updated", updatedProfileResponse)
+
+}

backend/cms-sys/internal/routes/auth_route.go

@@ -11,4 +11,6 @@ func SetupRoutes(app *fiber.App, handler handler.AuthHandle) {
 	auth.Post("/register", handler.Register)
 	auth.Post("/logout", handler.Logout)
 	auth.Post("/refresh", handler.Refresh)
+	auth.Post("/me", handler.GetMe)
+	auth.Put("/profile/:id", handler.UpdateUserProfile)
 }

backend/cms-sys/internal/service/auth_service.go

@@ -15,6 +15,8 @@ type AuthService interface {
 	Register(req *types.RegisterRequest) (*types.AuthResponse, error)
 	RefreshToken(refreshToken string) (*types.TokenResponse, error)
 	GetUserProfile(userID uuid.UUID) (*types.UserResponse, error)
+	GetMe(req types.GetMeRequest) (*types.UserResponse, error)
+	UpdateUserProfile(id uuid.UUID, req types.UserUpdateRequest) (*types.UserResponse, error)
 	Logout(accessToken, refreshToken string) error
 }
 
@@ -196,6 +198,52 @@ func (s *Service) GetUserProfile(userID uuid.UUID) (*types.UserResponse, error)
 	}, nil
 }
 
+
+func (s *Service) GetMe(req types.GetMeRequest) (*types.UserResponse, error) {
+
+	user, err := s.repo.GetUserByEmail(req.Email)
+
+	if err != nil {
+		s.log.WithError(err).Error("Failed to get user profile")
+		return nil, errors.New("user not found")
+	}
+
+	return &types.UserResponse{
+		ID:        user.CMSUserID,
+		Name:      user.CMSUserName,
+		Email:     user.CMSUserEmail,
+		Role:      user.CMSUserRole,
+		Verified:  user.Verified,
+		CreatedAt: user.CreatedAt,
+		UpdatedAt: user.UpdatedAt,
+	}, nil
+}
+
+func (s *Service) UpdateUserProfile(id uuid.UUID, req types.UserUpdateRequest) (*types.UserResponse, error) {
+
+	user, err := s.repo.GetUserByID(id)
+	if err != nil {
+		s.log.WithError(err).Error("Failed to get user profile with id ", id)
+		return nil, errors.New("user not found")
+	}
+
+	user.CMSUserName = req.Name
+	if err := s.repo.UpdateUser(user); err != nil {
+		s.log.WithError(err).Error("Failed to update user profile")
+		return nil, errors.New("failed to update user profile")
+	}
+
+	return &types.UserResponse{
+		ID:        user.CMSUserID,
+		Name:      user.CMSUserName,
+		Email:     user.CMSUserEmail,
+		Role:      user.CMSUserRole,
+		Verified:  user.Verified,
+		CreatedAt: user.CreatedAt,
+		UpdatedAt: user.UpdatedAt,
+	}, nil
+
+
 func (s *Service) Logout(accessToken, refreshToken string) error {
 	if accessToken != "" {
 		accessClaims, err := utils.ValidateToken(accessToken)

backend/cms-sys/internal/types/request.go

@@ -26,3 +26,11 @@ type OwnerUpdateRequest struct {
 	Name      string `json:"name" validate:"required,min=2"`
 	NameSpace string `json:"namespace" validate:"required,min=3"` // TODO : Gotta remove namespace later
 }
+
+type GetMeRequest struct {
+	Email string `json:"email" validate:"required,email"`
+}
+
+type UserUpdateRequest struct {
+	Name string `json:"name" validate:"required,min=2"`
+}