Merge branch 'staging' of https://github.com/iota-uz/iota-sdk into staging

Author: Diyor Khaydarov

Diff for: modules/core/domain/aggregates/user/user_repository.go

@@ -40,6 +40,7 @@ type Repository interface {
 	GetByPhone(ctx context.Context, phone string) (User, error)
 	GetPaginated(ctx context.Context, params *FindParams) ([]User, error)
 	GetByID(ctx context.Context, id uint) (User, error)
+	PhoneExists(ctx context.Context, phone string) (bool, error)
 	Create(ctx context.Context, user User) (User, error)
 	Update(ctx context.Context, user User) error
 	UpdateLastAction(ctx context.Context, id uint) error

Diff for: modules/core/domain/aggregates/user/user_validator.go

@@ -0,0 +1,9 @@
+package user
+
+import (
+	"context"
+)
+
+type Validator interface {
+	ValidateCreate(ctx context.Context, u User) error
+}

Diff for: modules/core/infrastructure/persistence/user_repository.go

@@ -40,6 +40,8 @@ const (
 
 	userCountQuery = `SELECT COUNT(u.id) FROM users u`
 
+	userExistsQuery = `SELECT 1 FROM users u`
+
 	userUpdateLastLoginQuery = `UPDATE users SET last_login = NOW() WHERE id = $1`
 
 	userUpdateLastActionQuery = `UPDATE users SET last_action = NOW() WHERE id = $1`
@@ -260,6 +262,22 @@ func (g *PgUserRepository) GetByPhone(ctx context.Context, phone string) (user.U
 	return users[0], nil
 }
 
+func (g *PgUserRepository) PhoneExists(ctx context.Context, phone string) (bool, error) {
+	tx, err := composables.UseTx(ctx)
+	if err != nil {
+		return false, errors.Wrap(err, "failed to get transaction")
+	}
+
+	base := repo.Join(userExistsQuery, "WHERE u.phone = $1")
+	query := repo.Exists(base)
+
+	exists := false
+	if err := tx.QueryRow(ctx, query, phone).Scan(&exists); err != nil {
+		return false, errors.Wrap(err, "checking phone existence failed")
+	}
+	return exists, nil
+}
+
 func (g *PgUserRepository) Create(ctx context.Context, data user.User) (user.User, error) {
 	tx, err := composables.UseTx(ctx)
 	if err != nil {

Diff for: modules/core/module.go

@@ -2,7 +2,7 @@ package core
 
 import (
 	"embed"
-
+	"github.com/iota-uz/iota-sdk/modules/core/validators"
 	"github.com/iota-uz/iota-sdk/pkg/spotlight"
 
 	icons "github.com/iota-uz/icons/phosphor"
@@ -50,9 +50,12 @@ func (m *Module) Register(app application.Application) error {
 	roleRepo := persistence.NewRoleRepository()
 	permRepo := persistence.NewPermissionRepository()
 
+	// custom validations
+	userValidator := validators.NewUserValidator(userRepo)
+
 	app.RegisterServices(
 		services.NewUploadService(uploadRepo, fsStorage, app.EventPublisher()),
-		services.NewUserService(userRepo, app.EventPublisher()),
+		services.NewUserService(userRepo, userValidator, app.EventPublisher()),
 		services.NewSessionService(persistence.NewSessionRepository(), app.EventPublisher()),
 	)
 	app.RegisterServices(

Diff for: modules/core/presentation/controllers/user_controller.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"bytes"
 	"context"
+	"errors"
 	"net/http"
 	"net/url"
 	"sort"
@@ -28,6 +29,7 @@ import (
 	"github.com/iota-uz/iota-sdk/pkg/server"
 	"github.com/iota-uz/iota-sdk/pkg/shared"
 	"github.com/iota-uz/iota-sdk/pkg/types"
+	"github.com/iota-uz/iota-sdk/pkg/validators"
 	"github.com/nicksnyder/go-i18n/v2/i18n"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/text/language"
@@ -412,22 +414,17 @@ func (c *UsersController) Create(
 	roleService *services.RoleService,
 	groupService *services.GroupService,
 ) {
-	dto, err := composables.UseForm(&user.CreateDTO{}, r)
-	if err != nil {
-		logger.Errorf("Error parsing form: %v", err)
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
+	respondWithForm := func(errors map[string]string, dto *user.CreateDTO) {
+		ctx := r.Context()
 
-	if errors, ok := dto.Ok(r.Context()); !ok {
-		roles, err := roleService.GetAll(r.Context())
+		roles, err := roleService.GetAll(ctx)
 		if err != nil {
 			logger.Errorf("Error retrieving roles: %v", err)
 			http.Error(w, "Error retrieving roles", http.StatusInternalServerError)
 			return
 		}
 
-		groups, err := groupService.GetAll(r.Context())
+		groups, err := groupService.GetAll(ctx)
 		if err != nil {
 			logger.Errorf("Error retrieving groups: %v", err)
 			http.Error(w, "Error retrieving groups", http.StatusInternalServerError)
@@ -440,16 +437,27 @@ func (c *UsersController) Create(
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
+
 		props := &users.CreateFormProps{
 			User:             *mappers.UserToViewModel(userEntity),
 			Roles:            mapping.MapViewModels(roles, mappers.RoleToViewModel),
 			Groups:           mapping.MapViewModels(groups, mappers.GroupToViewModel),
 			PermissionGroups: c.permissionGroups(c.app.RBAC()),
 			Errors:           errors,
 		}
-		templ.Handler(
-			users.CreateForm(props), templ.WithStreaming(),
-		).ServeHTTP(w, r)
+
+		templ.Handler(users.CreateForm(props), templ.WithStreaming()).ServeHTTP(w, r)
+	}
+
+	dto, err := composables.UseForm(&user.CreateDTO{}, r)
+	if err != nil {
+		logger.Errorf("Error parsing form: %v", err)
+		http.Error(w, err.Error(), http.StatusBadRequest)
+		return
+	}
+
+	if errs, ok := dto.Ok(r.Context()); !ok {
+		respondWithForm(errs, dto)
 		return
 	}
 
@@ -487,6 +495,12 @@ func (c *UsersController) Create(
 	}
 
 	if err := userService.Create(r.Context(), userEntity); err != nil {
+		var errs *validators.ValidationError
+		if errors.As(err, &errs) {
+			respondWithForm(errs.Fields, dto)
+			return
+		}
+
 		logger.Errorf("Error creating user: %v", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return

Diff for: modules/core/presentation/locales/en.json

@@ -227,6 +227,9 @@
       "Delete": "Delete user",
       "DeleteConfirmation": "Are you sure you want to delete this user?",
       "Permissions": "User Permissions"
+    },
+    "Errors": {
+      "PhoneUnique": "Phone number is already used"
     }
   },
   "Roles": {

Diff for: modules/core/presentation/locales/ru.json

@@ -299,6 +299,9 @@
       "Delete": "Удалить пользователя",
       "DeleteConfirmation": "Вы уверены что хотите удалить пользователя?",
       "Permissions": "Разрешения пользователя"
+    },
+    "Errors": {
+      "PhoneUnique": "Номер телефона уже используется"
     }
   },
   "Projects": {

Diff for: modules/core/presentation/locales/uz.json

@@ -227,6 +227,9 @@
       "Delete": "Foydalanuvchini o'chirish",
       "DeleteConfirmation": "Haqiqatan ham bu foydalanuvchini o'chirmoqchimisiz?",
       "Permissions": "Foydalanuvchi ruxsatlari"
+    },
+    "Errors": {
+      "PhoneUnique": "Telefon raqami allaqachon foydalanilgan"
     }
   },
   "Roles": {

Diff for: modules/core/services/user_service.go

@@ -11,12 +11,14 @@ import (
 
 type UserService struct {
 	repo      user.Repository
+	validator user.Validator
 	publisher eventbus.EventBus
 }
 
-func NewUserService(repo user.Repository, publisher eventbus.EventBus) *UserService {
+func NewUserService(repo user.Repository, validator user.Validator, publisher eventbus.EventBus) *UserService {
 	return &UserService{
 		repo:      repo,
+		validator: validator,
 		publisher: publisher,
 	}
 }
@@ -66,6 +68,9 @@ func (s *UserService) Create(ctx context.Context, data user.User) error {
 	if err := composables.CanUser(ctx, permissions.UserCreate); err != nil {
 		return err
 	}
+	if err := s.validator.ValidateCreate(ctx, data); err != nil {
+		return err
+	}
 	logger := composables.UseLogger(ctx)
 	tx, err := composables.BeginTx(ctx)
 	if err != nil {

Diff for: modules/core/validators/user_validator.go

@@ -0,0 +1,45 @@
+package validators
+
+import (
+	"context"
+	"fmt"
+	"github.com/iota-uz/iota-sdk/modules/core/domain/aggregates/user"
+	"github.com/iota-uz/iota-sdk/pkg/composables"
+	"github.com/iota-uz/iota-sdk/pkg/validators"
+	"github.com/nicksnyder/go-i18n/v2/i18n"
+)
+
+type UserValidator struct {
+	repo user.Repository
+}
+
+func NewUserValidator(repo user.Repository) *UserValidator {
+	return &UserValidator{repo: repo}
+}
+
+func (v *UserValidator) ValidateCreate(ctx context.Context, u user.User) error {
+	l, ok := composables.UseLocalizer(ctx)
+	if !ok {
+		panic(composables.ErrNoLocalizer)
+	}
+
+	errors := map[string]string{}
+
+	if u.Phone().Value() != "" {
+		exists, err := v.repo.PhoneExists(ctx, u.Phone().Value())
+		if err != nil {
+			return fmt.Errorf("failed to check phone existence: %w", err)
+		}
+		if exists {
+			errors["Phone"] = l.MustLocalize(&i18n.LocalizeConfig{
+				MessageID: "Users.Errors.PhoneUnique",
+			})
+		}
+	}
+
+	if len(errors) > 0 {
+		return validators.NewValidationError(errors)
+	}
+
+	return nil
+}

Diff for: pkg/repo/repo.go

@@ -68,6 +68,16 @@ func Join(expressions ...string) string {
 	return strings.Join(expressions, " ")
 }
 
+// Exists wraps a SELECT query inside SELECT EXISTS (...).
+//
+// Example usage:
+//
+//	query := repo.Exists("SELECT 1 FROM users WHERE phone = $1")
+//	// Returns: "SELECT EXISTS (SELECT 1 FROM users WHERE phone = $1)"
+func Exists(inner string) string {
+	return "SELECT EXISTS (" + inner + ")"
+}
+
 // OrderBy generates an SQL ORDER BY clause for the given fields and sort direction.
 // Returns an empty string if no fields are provided.
 //

Diff for: pkg/validators/validation_error.go

@@ -0,0 +1,26 @@
+package validators
+
+type ValidationError struct {
+	Fields map[string]string
+}
+
+func (v *ValidationError) Error() string {
+	return "validators failed"
+}
+
+func NewValidationError(fields map[string]string) *ValidationError {
+	return &ValidationError{Fields: fields}
+}
+
+func (v *ValidationError) HasField(field string) bool {
+	_, exists := v.Fields[field]
+	return exists
+}
+
+func (v *ValidationError) Field(field string) string {
+	return v.Fields[field]
+}
+
+func (v *ValidationError) FieldsMap() map[string]string {
+	return v.Fields
+}