new features

This commit is contained in:
Ivan Rezchikov
2026-05-04 11:14:30 +03:00
parent 77d429c8ba
commit 5752d5b2b4
32 changed files with 1530 additions and 217 deletions
@@ -3,6 +3,7 @@ package repositories
import (
"context"
"strings"
"time"
"github.com/dusiburg/kotosoft-id/internal/models"
"github.com/google/uuid"
@@ -17,12 +18,20 @@ func NewPositionRepository(db *pgxpool.Pool) *PositionRepository {
return &PositionRepository{db: db}
}
func (r *PositionRepository) GetAllPermissions(ctx context.Context) ([]models.Permission, error) {
func (r *PositionRepository) GetAllPermissions(ctx context.Context, locale string) ([]models.Permission, error) {
rows, err := r.db.Query(ctx, `
SELECT id, code, COALESCE(description, ''), created_at
FROM permissions
SELECT p.id,
p.code,
COALESCE(pl.name, pe.name, p.code) AS name,
COALESCE(pl.description, pe.description, p.description, '') AS description,
p.created_at
FROM permissions p
LEFT JOIN permission_translations pl
ON pl.permission_id = p.id AND pl.locale = $1
LEFT JOIN permission_translations pe
ON pe.permission_id = p.id AND pe.locale = 'en'
ORDER BY code
`)
`, strings.ToLower(locale))
if err != nil {
return nil, err
}
@@ -31,7 +40,7 @@ func (r *PositionRepository) GetAllPermissions(ctx context.Context) ([]models.Pe
var result []models.Permission
for rows.Next() {
var p models.Permission
if err := rows.Scan(&p.ID, &p.Code, &p.Description, &p.CreatedAt); err != nil {
if err := rows.Scan(&p.ID, &p.Code, &p.Name, &p.Description, &p.CreatedAt); err != nil {
return nil, err
}
result = append(result, p)
@@ -39,24 +48,76 @@ func (r *PositionRepository) GetAllPermissions(ctx context.Context) ([]models.Pe
return result, rows.Err()
}
func (r *PositionRepository) CreatePermission(ctx context.Context, code string, description *string) error {
_, err := r.db.Exec(ctx, `
func (r *PositionRepository) CreatePermission(ctx context.Context, code, locale string, description *string) error {
tx, err := r.db.Begin(ctx)
if err != nil {
return err
}
defer tx.Rollback(ctx)
var permissionID uuid.UUID
err = tx.QueryRow(ctx, `
INSERT INTO permissions (code, description)
VALUES ($1, $2)
`, code, description)
return err
RETURNING id
`, code, description).Scan(&permissionID)
if err != nil {
return err
}
_, err = tx.Exec(ctx, `
INSERT INTO permission_translations (permission_id, locale, name, description)
VALUES ($1, $2, $3, $4)
ON CONFLICT (permission_id, locale) DO UPDATE
SET name = EXCLUDED.name, description = EXCLUDED.description
`, permissionID, strings.ToLower(locale), code, description)
if err != nil {
return err
}
return tx.Commit(ctx)
}
func (r *PositionRepository) UpdatePermission(ctx context.Context, code string, description *string) error {
_, err := r.db.Exec(ctx, `
UPDATE permissions SET description = $2 WHERE code = $1
`, code, description)
return err
func (r *PositionRepository) UpdatePermission(ctx context.Context, code, locale string, description *string) error {
tx, err := r.db.Begin(ctx)
if err != nil {
return err
}
defer tx.Rollback(ctx)
var permissionID uuid.UUID
err = tx.QueryRow(ctx, `
UPDATE permissions
SET description = $2
WHERE code = $1
RETURNING id
`, code, description).Scan(&permissionID)
if err != nil {
return models.ErrNotFound
}
_, err = tx.Exec(ctx, `
INSERT INTO permission_translations (permission_id, locale, name, description)
VALUES ($1, $2, $3, $4)
ON CONFLICT (permission_id, locale) DO UPDATE
SET name = EXCLUDED.name, description = EXCLUDED.description
`, permissionID, strings.ToLower(locale), code, description)
if err != nil {
return err
}
return tx.Commit(ctx)
}
func (r *PositionRepository) DeletePermission(ctx context.Context, code string) error {
_, err := r.db.Exec(ctx, `DELETE FROM permissions WHERE code = $1`, code)
return err
tag, err := r.db.Exec(ctx, `DELETE FROM permissions WHERE code = $1`, code)
if err != nil {
return err
}
if tag.RowsAffected() == 0 {
return models.ErrNotFound
}
return nil
}
func (r *PositionRepository) GetPermissionByCode(ctx context.Context, code string) (*models.Permission, error) {
@@ -71,14 +132,22 @@ func (r *PositionRepository) GetPermissionByCode(ctx context.Context, code strin
return &p, nil
}
func (r *PositionRepository) GetPositionPermissions(ctx context.Context, positionID uuid.UUID) ([]models.Permission, error) {
func (r *PositionRepository) GetPositionPermissions(ctx context.Context, positionID uuid.UUID, locale string) ([]models.Permission, error) {
rows, err := r.db.Query(ctx, `
SELECT p.id, p.code, COALESCE(p.description, ''), p.created_at
SELECT p.id,
p.code,
COALESCE(pl.name, pe.name, p.code) AS name,
COALESCE(pl.description, pe.description, p.description, '') AS description,
p.created_at
FROM position_permissions pp
JOIN permissions p ON pp.permission_id = p.id
LEFT JOIN permission_translations pl
ON pl.permission_id = p.id AND pl.locale = $2
LEFT JOIN permission_translations pe
ON pe.permission_id = p.id AND pe.locale = 'en'
WHERE pp.position_id = $1
ORDER BY p.code
`, positionID)
`, positionID, strings.ToLower(locale))
if err != nil {
return nil, err
}
@@ -87,7 +156,7 @@ func (r *PositionRepository) GetPositionPermissions(ctx context.Context, positio
var result []models.Permission
for rows.Next() {
var p models.Permission
if err := rows.Scan(&p.ID, &p.Code, &p.Description, &p.CreatedAt); err != nil {
if err := rows.Scan(&p.ID, &p.Code, &p.Name, &p.Description, &p.CreatedAt); err != nil {
return nil, err
}
result = append(result, p)
@@ -149,7 +218,7 @@ func (r *PositionRepository) GetUserPositions(ctx context.Context, userID uuid.U
if err := rows.Scan(&positionID, &p.Code, &p.Name, &p.Description); err != nil {
return nil, err
}
perms, err := r.GetPositionPermissions(ctx, positionID)
perms, err := r.GetPositionPermissions(ctx, positionID, locale)
if err != nil {
return nil, err
}
@@ -184,7 +253,7 @@ func (r *PositionRepository) GetAllPositions(ctx context.Context, locale string)
if err := rows.Scan(&positionID, &p.Code, &p.Name, &p.Description); err != nil {
return nil, err
}
perms, err := r.GetPositionPermissions(ctx, positionID)
perms, err := r.GetPositionPermissions(ctx, positionID, locale)
if err != nil {
return nil, err
}
@@ -197,6 +266,39 @@ func (r *PositionRepository) GetAllPositions(ctx context.Context, locale string)
return result, rows.Err()
}
func (r *PositionRepository) GetUsersWithPositions(ctx context.Context, locale string) ([]models.UserWithPositions, error) {
rows, err := r.db.Query(ctx, `
SELECT id, email, first_name, second_name, is_admin
FROM users
ORDER BY first_name, second_name, email
`)
if err != nil {
return nil, err
}
defer rows.Close()
var result []models.UserWithPositions
for rows.Next() {
var u models.UserWithPositions
if err := rows.Scan(&u.ID, &u.Email, &u.FirstName, &u.SecondName, &u.IsAdmin); err != nil {
return nil, err
}
positions, err := r.GetUserPositions(ctx, u.ID, locale)
if err != nil {
return nil, err
}
if positions == nil {
positions = []models.PositionLocalized{}
}
u.Positions = positions
result = append(result, u)
}
return result, rows.Err()
}
func (r *PositionRepository) UpsertPositionForLocale(ctx context.Context, code, locale, name string, description *string) error {
tx, err := r.db.Begin(ctx)
if err != nil {
@@ -233,7 +335,7 @@ func (r *PositionRepository) DeletePositionByCode(ctx context.Context, code stri
return err
}
func (r *PositionRepository) AssignPosition(ctx context.Context, userID, positionID uuid.UUID, assignedBy *uuid.UUID, validFrom interface{}, validTo *interface{}) error {
func (r *PositionRepository) AssignPosition(ctx context.Context, userID, positionID uuid.UUID, assignedBy *uuid.UUID, validFrom time.Time, validTo *time.Time) error {
_, err := r.db.Exec(ctx, `
INSERT INTO user_positions (user_id, position_id, assigned_by, valid_from, valid_to)
VALUES ($1, $2, $3, COALESCE($4, now()), $5)
@@ -271,16 +373,24 @@ func (r *PositionRepository) UserHasPermission(ctx context.Context, userID uuid.
return true, positionCode, nil
}
func (r *PositionRepository) GetUserPermissions(ctx context.Context, userID uuid.UUID) ([]models.Permission, error) {
func (r *PositionRepository) GetUserPermissions(ctx context.Context, userID uuid.UUID, locale string) ([]models.Permission, error) {
rows, err := r.db.Query(ctx, `
SELECT DISTINCT perm.id, perm.code, COALESCE(perm.description, ''), perm.created_at
SELECT DISTINCT perm.id,
perm.code,
COALESCE(pl.name, pe.name, perm.code) AS name,
COALESCE(pl.description, pe.description, perm.description, '') AS description,
perm.created_at
FROM user_positions up
JOIN position_permissions pp ON pp.position_id = up.position_id
JOIN permissions perm ON pp.permission_id = perm.id
LEFT JOIN permission_translations pl
ON pl.permission_id = perm.id AND pl.locale = $2
LEFT JOIN permission_translations pe
ON pe.permission_id = perm.id AND pe.locale = 'en'
WHERE up.user_id = $1
AND (up.valid_to IS NULL OR up.valid_to > now())
ORDER BY perm.code
`, userID)
`, userID, strings.ToLower(locale))
if err != nil {
return nil, err
}
@@ -289,7 +399,7 @@ func (r *PositionRepository) GetUserPermissions(ctx context.Context, userID uuid
var result []models.Permission
for rows.Next() {
var p models.Permission
if err := rows.Scan(&p.ID, &p.Code, &p.Description, &p.CreatedAt); err != nil {
if err := rows.Scan(&p.ID, &p.Code, &p.Name, &p.Description, &p.CreatedAt); err != nil {
return nil, err
}
result = append(result, p)