new version

This commit is contained in:
Ivan Rezchikov
2026-07-11 19:04:41 +03:00
parent 3c64666299
commit b7334696e4
16 changed files with 313 additions and 269 deletions
@@ -211,24 +211,32 @@ func (r *PositionRepository) GetUserPositions(ctx context.Context, userID uuid.U
}
defer rows.Close()
var result []models.PositionLocalized
var positions []posRow
for rows.Next() {
var p models.PositionLocalized
var positionID uuid.UUID
if err := rows.Scan(&positionID, &p.Code, &p.Name, &p.Description); err != nil {
var r posRow
if err := rows.Scan(&r.id, &r.p.Code, &r.p.Name, &r.p.Description); err != nil {
return nil, err
}
perms, err := r.GetPositionPermissions(ctx, positionID, locale)
if err != nil {
return nil, err
}
p.Permissions = perms
if p.Permissions == nil {
p.Permissions = []models.Permission{}
}
result = append(result, p)
positions = append(positions, r)
}
return result, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
permMap, err := r.getPositionPermissionsBatch(ctx, positionIDs(positions), locale)
if err != nil {
return nil, err
}
result := make([]models.PositionLocalized, len(positions))
for i, pos := range positions {
pos.p.Permissions = permMap[pos.id]
if pos.p.Permissions == nil {
pos.p.Permissions = []models.Permission{}
}
result[i] = pos.p
}
return result, nil
}
func (r *PositionRepository) GetAllPositions(ctx context.Context, locale string) ([]models.PositionLocalized, error) {
@@ -246,24 +254,32 @@ func (r *PositionRepository) GetAllPositions(ctx context.Context, locale string)
}
defer rows.Close()
var result []models.PositionLocalized
var positions []posRow
for rows.Next() {
var p models.PositionLocalized
var positionID uuid.UUID
if err := rows.Scan(&positionID, &p.Code, &p.Name, &p.Description); err != nil {
var r posRow
if err := rows.Scan(&r.id, &r.p.Code, &r.p.Name, &r.p.Description); err != nil {
return nil, err
}
perms, err := r.GetPositionPermissions(ctx, positionID, locale)
if err != nil {
return nil, err
}
p.Permissions = perms
if p.Permissions == nil {
p.Permissions = []models.Permission{}
}
result = append(result, p)
positions = append(positions, r)
}
return result, rows.Err()
if err := rows.Err(); err != nil {
return nil, err
}
permMap, err := r.getPositionPermissionsBatch(ctx, positionIDs(positions), locale)
if err != nil {
return nil, err
}
result := make([]models.PositionLocalized, len(positions))
for i, pos := range positions {
pos.p.Permissions = permMap[pos.id]
if pos.p.Permissions == nil {
pos.p.Permissions = []models.Permission{}
}
result[i] = pos.p
}
return result, nil
}
func (r *PositionRepository) GetUsersWithPositions(ctx context.Context, locale string) ([]models.UserWithPositions, error) {
@@ -295,7 +311,57 @@ func (r *PositionRepository) GetUsersWithPositions(ctx context.Context, locale s
result = append(result, u)
}
return result, rows.Err()
}
type posRow struct {
id uuid.UUID
p models.PositionLocalized
}
func (pr posRow) getID() uuid.UUID { return pr.id }
func positionIDs(items []posRow) []uuid.UUID {
ids := make([]uuid.UUID, len(items))
for i, item := range items {
ids[i] = item.id
}
return ids
}
func (r *PositionRepository) getPositionPermissionsBatch(ctx context.Context, pIDs []uuid.UUID, locale string) (map[uuid.UUID][]models.Permission, error) {
if len(pIDs) == 0 {
return nil, nil
}
rows, err := r.db.Query(ctx, `
SELECT pp.position_id,
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 = ANY($1)
ORDER BY pp.position_id, p.code
`, pIDs, strings.ToLower(locale))
if err != nil {
return nil, err
}
defer rows.Close()
result := make(map[uuid.UUID][]models.Permission)
for rows.Next() {
var positionID uuid.UUID
var perm models.Permission
if err := rows.Scan(&positionID, &perm.ID, &perm.Code, &perm.Name, &perm.Description, &perm.CreatedAt); err != nil {
return nil, err
}
result[positionID] = append(result[positionID], perm)
}
return result, rows.Err()
}