new features
This commit is contained in:
@@ -140,7 +140,7 @@ func (h *PositionsHandler) RemovePermissionFromPosition(c *gin.Context) {
|
||||
}
|
||||
|
||||
func (h *PositionsHandler) ListPermissions(c *gin.Context) {
|
||||
perms, err := h.svc.GetAllPermissions(c.Request.Context())
|
||||
perms, err := h.svc.GetAllPermissionsForLocale(c.Request.Context(), localeFromRequest(c))
|
||||
if err != nil {
|
||||
c.Error(models.ErrInternal)
|
||||
return
|
||||
@@ -149,6 +149,16 @@ func (h *PositionsHandler) ListPermissions(c *gin.Context) {
|
||||
c.JSON(http.StatusOK, perms)
|
||||
}
|
||||
|
||||
func (h *PositionsHandler) ListUsersWithPositions(c *gin.Context) {
|
||||
users, err := h.svc.GetUsersWithPositions(c.Request.Context(), localeFromRequest(c))
|
||||
if err != nil {
|
||||
c.Error(models.ErrInternal)
|
||||
return
|
||||
}
|
||||
|
||||
c.JSON(http.StatusOK, users)
|
||||
}
|
||||
|
||||
func (h *PositionsHandler) AssignPosition(c *gin.Context) {
|
||||
adminID, ok := userIDFromContext(c)
|
||||
if !ok {
|
||||
@@ -201,7 +211,7 @@ func (h *PositionsHandler) CreatePermission(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.svc.CreatePermission(c.Request.Context(), req.Code, req.Description); err != nil {
|
||||
if err := h.svc.CreatePermission(c.Request.Context(), req.Code, localeFromRequest(c), req.Description); err != nil {
|
||||
c.Error(err)
|
||||
return
|
||||
}
|
||||
@@ -218,7 +228,7 @@ func (h *PositionsHandler) UpdatePermission(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
if err := h.svc.UpdatePermission(c.Request.Context(), c.Param("code"), req.Description); err != nil {
|
||||
if err := h.svc.UpdatePermission(c.Request.Context(), c.Param("code"), localeFromRequest(c), req.Description); err != nil {
|
||||
c.Error(err)
|
||||
return
|
||||
}
|
||||
|
||||
@@ -58,28 +58,95 @@ func NewRouter(
|
||||
me.DELETE("/consent/:clientId", authMiddleware(svc, repo, "profile:consent:delete"), consents.RevokeAppAccess)
|
||||
me.GET("/positions", authMiddleware(svc, repo, "profile:read"), positions.GetMyPositions)
|
||||
|
||||
admin := api.Group("/admin", authMiddleware(svc, repo), middleware.AdminOnly())
|
||||
admin := api.Group("/admin", authMiddleware(svc, repo))
|
||||
{
|
||||
admin.GET("/permissions", positions.ListPermissions)
|
||||
admin.POST("/permissions", positions.CreatePermission)
|
||||
admin.PUT("/permissions/:code", positions.UpdatePermission)
|
||||
admin.DELETE("/permissions/:code", positions.DeletePermission)
|
||||
manage := admin.Group("", permissionMiddleware(svc, "positions.manage"))
|
||||
{
|
||||
manage.GET("/permissions", positions.ListPermissions)
|
||||
manage.POST("/permissions", positions.CreatePermission)
|
||||
manage.PUT("/permissions/:code", positions.UpdatePermission)
|
||||
manage.DELETE("/permissions/:code", positions.DeletePermission)
|
||||
|
||||
admin.GET("/positions", positions.ListPositions)
|
||||
admin.POST("/positions", positions.UpsertPosition)
|
||||
admin.PUT("/positions/:code", positions.UpdatePosition)
|
||||
admin.DELETE("/positions/:code", positions.DeletePosition)
|
||||
admin.POST("/positions/:code/permissions", positions.AddPermissionToPosition)
|
||||
admin.DELETE("/positions/:code/permissions/:permissionCode", positions.RemovePermissionFromPosition)
|
||||
manage.GET("/positions", positions.ListPositions)
|
||||
manage.POST("/positions", positions.UpsertPosition)
|
||||
manage.PUT("/positions/:code", positions.UpdatePosition)
|
||||
manage.DELETE("/positions/:code", positions.DeletePosition)
|
||||
manage.POST("/positions/:code/permissions", positions.AddPermissionToPosition)
|
||||
manage.DELETE("/positions/:code/permissions/:permissionCode", positions.RemovePermissionFromPosition)
|
||||
}
|
||||
|
||||
admin.POST("/users/:userId/positions", positions.AssignPosition)
|
||||
admin.DELETE("/users/:userId/positions/:code", positions.RevokePosition)
|
||||
usersRead := admin.Group("", permissionAnyMiddleware(svc, "positions.assign", "positions.revoke"))
|
||||
{
|
||||
usersRead.GET("/users", positions.ListUsersWithPositions)
|
||||
}
|
||||
|
||||
assign := admin.Group("", permissionMiddleware(svc, "positions.assign"))
|
||||
{
|
||||
assign.POST("/users/:userId/positions", positions.AssignPosition)
|
||||
}
|
||||
|
||||
revoke := admin.Group("", permissionMiddleware(svc, "positions.revoke"))
|
||||
{
|
||||
revoke.DELETE("/users/:userId/positions/:code", positions.RevokePosition)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return r
|
||||
}
|
||||
|
||||
func permissionAnyMiddleware(svc *services.Service, requiredPermissions ...string) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
userID, ok := UserIDFromContext(c)
|
||||
if !ok {
|
||||
c.Error(models.ErrUnauthorized)
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
|
||||
for _, permission := range requiredPermissions {
|
||||
allowed, err := svc.UserHasPermission(c.Request.Context(), userID, permission)
|
||||
if err != nil {
|
||||
c.Error(models.ErrInternal)
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
if allowed {
|
||||
c.Next()
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
c.Error(models.ErrForbidden.WithMessage("Missing required permissions"))
|
||||
c.Abort()
|
||||
}
|
||||
}
|
||||
|
||||
func permissionMiddleware(svc *services.Service, requiredPermission string) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
userID, ok := UserIDFromContext(c)
|
||||
if !ok {
|
||||
c.Error(models.ErrUnauthorized)
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
|
||||
allowed, err := svc.UserHasPermission(c.Request.Context(), userID, requiredPermission)
|
||||
if err != nil {
|
||||
c.Error(models.ErrInternal)
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
if !allowed {
|
||||
c.Error(models.ErrForbidden.WithMessage("Missing required permission: " + requiredPermission))
|
||||
c.Abort()
|
||||
return
|
||||
}
|
||||
|
||||
c.Next()
|
||||
}
|
||||
}
|
||||
|
||||
func authMiddleware(svc *services.Service, repo *repositories.OAuthRepository, requiredScopes ...string) gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
token, ok := bearerToken(c)
|
||||
|
||||
@@ -0,0 +1,119 @@
|
||||
package models
|
||||
|
||||
type FieldType string
|
||||
|
||||
const (
|
||||
FieldTypeText FieldType = "text"
|
||||
FieldTypeDate FieldType = "date"
|
||||
FieldTypeSelect FieldType = "select"
|
||||
FieldTypeMasked FieldType = "masked"
|
||||
)
|
||||
|
||||
type LocalizedString struct {
|
||||
En string `json:"en"`
|
||||
Ru string `json:"ru"`
|
||||
It string `json:"it"`
|
||||
}
|
||||
|
||||
type FieldOption struct {
|
||||
Value string `json:"value"`
|
||||
Label LocalizedString `json:"label"`
|
||||
}
|
||||
|
||||
type FieldTemplate struct {
|
||||
ID string `json:"id"`
|
||||
Name LocalizedString `json:"name"`
|
||||
Type FieldType `json:"type"`
|
||||
Required bool `json:"required"`
|
||||
Mask *string `json:"mask,omitempty"`
|
||||
Options []FieldOption `json:"options,omitempty"`
|
||||
Generated bool `json:"generated"`
|
||||
}
|
||||
|
||||
type DocumentType struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
Code string `db:"code" json:"code"`
|
||||
EmblemURL string `db:"emblem_url" json:"emblem_url"`
|
||||
Color string `db:"color" json:"color"`
|
||||
Fields []FieldTemplate `db:"fields" json:"fields"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
}
|
||||
|
||||
type DocumentApplicationStatus string
|
||||
|
||||
const (
|
||||
ApplicationStatusPending DocumentApplicationStatus = "pending"
|
||||
ApplicationStatusApproved DocumentApplicationStatus = "approved"
|
||||
ApplicationStatusRejected DocumentApplicationStatus = "rejected"
|
||||
)
|
||||
|
||||
type DocumentApplication struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
||||
DocumentTypeID uuid.UUID `db:"document_type_id" json:"document_type_id"`
|
||||
Status DocumentApplicationStatus `db:"status" json:"status"`
|
||||
ReviewedBy *uuid.UUID `db:"reviewed_by" json:"reviewed_by,omitempty"`
|
||||
ReviewedAt *time.Time `db:"reviewed_at" json:"reviewed_at,omitempty"`
|
||||
RejectReason *string `db:"reject_reason" json:"reject_reason,omitempty"`
|
||||
Data map[string]string `db:"data" json:"data"`
|
||||
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
|
||||
}
|
||||
|
||||
type DocumentApplicationLocalized struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
UserID uuid.UUID `json:"user_id"`
|
||||
DocumentType DocumentType `json:"document_type"`
|
||||
Status DocumentApplicationStatus `json:"status"`
|
||||
ReviewedBy *uuid.UUID `json:"reviewed_by,omitempty"`
|
||||
ReviewedAt *time.Time `json:"reviewed_at,omitempty"`
|
||||
RejectReason *string `json:"reject_reason,omitempty"`
|
||||
Data map[string]string `json:"data"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
type Document struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
UserID uuid.UUID `db:"user_id" json:"user_id"`
|
||||
DocumentTypeID uuid.UUID `db:"document_type_id" json:"document_type_id"`
|
||||
ApplicationID uuid.UUID `db:"application_id" json:"application_id"`
|
||||
Number string `db:"number" json:"number"`
|
||||
PhotoURL *string `db:"photo_url" json:"photo_url,omitempty"`
|
||||
Data map[string]string `db:"data" json:"data"`
|
||||
IssuedAt time.Time `db:"issued_at" json:"issued_at"`
|
||||
RevokedAt *time.Time `db:"revoked_at" json:"revoked_at,omitempty"`
|
||||
RevokedBy *uuid.UUID `db:"revoked_by" json:"revoked_by,omitempty"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
|
||||
}
|
||||
|
||||
type DocumentLocalized struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
UserID uuid.UUID `json:"user_id"`
|
||||
DocumentType DocumentType `json:"document_type"`
|
||||
ApplicationID uuid.UUID `json:"application_id"`
|
||||
Number string `json:"number"`
|
||||
PhotoURL *string `json:"photo_url,omitempty"`
|
||||
Data map[string]string `json:"data"`
|
||||
IssuedAt time.Time `json:"issued_at"`
|
||||
RevokedAt *time.Time `json:"revoked_at,omitempty"`
|
||||
RevokedBy *uuid.UUID `json:"revoked_by,omitempty"`
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
UpdatedAt time.Time `json:"updated_at"`
|
||||
}
|
||||
|
||||
type CreateDocumentApplicationInput struct {
|
||||
DocumentTypeCode string `json:"document_type_code" binding:"required"`
|
||||
Data map[string]string `json:"data" binding:"required"`
|
||||
}
|
||||
|
||||
type ReviewDocumentApplicationInput struct {
|
||||
Status DocumentApplicationStatus `json:"status" binding:"required"`
|
||||
RejectReason *string `json:"reject_reason" binding:"omitempty"`
|
||||
}
|
||||
|
||||
type RevokeDocumentInput struct {
|
||||
DocumentID uuid.UUID `json:"document_id" binding:"required"`
|
||||
}
|
||||
@@ -9,6 +9,7 @@ import (
|
||||
type Permission struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
Code string `db:"code" json:"code"`
|
||||
Name string `db:"name" json:"name"`
|
||||
Description string `db:"description" json:"description"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
}
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
package models
|
||||
|
||||
type Region struct {
|
||||
ID uuid.UUID `db:"id" json:"id"`
|
||||
Code string `db:"code" json:"code"`
|
||||
CreatedAt time.Time `db:"created_at" json:"created_at"`
|
||||
}
|
||||
|
||||
type RegionTranslation struct {
|
||||
RegionID uuid.UUID `db:"region_id" json:"region_id"`
|
||||
Locale string `db:"locale" json:"locale"`
|
||||
Name string `db:"name" json:"name"`
|
||||
}
|
||||
|
||||
type RegionLocalized struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
Code string `json:"code"`
|
||||
Name string `json:"name"`
|
||||
}
|
||||
@@ -19,6 +19,15 @@ type User struct {
|
||||
UpdatedAt time.Time `db:"updated_at" json:"updated_at"`
|
||||
}
|
||||
|
||||
type UserWithPositions struct {
|
||||
ID uuid.UUID `json:"id"`
|
||||
Email string `json:"email"`
|
||||
FirstName string `json:"first_name"`
|
||||
SecondName string `json:"second_name"`
|
||||
IsAdmin bool `json:"is_admin"`
|
||||
Positions []PositionLocalized `json:"positions"`
|
||||
}
|
||||
|
||||
type UserRegisterInput struct {
|
||||
Email string `json:"email" binding:"required,min=3"`
|
||||
Password string `json:"password" binding:"required,min=8"`
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -95,3 +95,11 @@ func (r *UserRepository) GetUserByID(ctx context.Context, id uuid.UUID) (*models
|
||||
}
|
||||
return &u, nil
|
||||
}
|
||||
|
||||
func (r *UserRepository) CountUsers(ctx context.Context) (int, error) {
|
||||
var count int
|
||||
if err := r.db.QueryRow(ctx, `SELECT COUNT(*) FROM users`).Scan(&count); err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return count, nil
|
||||
}
|
||||
|
||||
@@ -31,7 +31,7 @@ func (s *Service) Register(ctx context.Context, input models.UserRegisterInput)
|
||||
return nil, models.ErrInternal
|
||||
}
|
||||
|
||||
return s.users.CreateUser(ctx, models.User{
|
||||
user, err := s.users.CreateUser(ctx, models.User{
|
||||
Email: input.Email,
|
||||
PasswordHash: string(hash),
|
||||
FirstName: input.FirstName,
|
||||
@@ -39,6 +39,23 @@ func (s *Service) Register(ctx context.Context, input models.UserRegisterInput)
|
||||
BirthDate: input.BirthDate,
|
||||
Sex: input.Sex,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
count, err := s.users.CountUsers(ctx)
|
||||
if err != nil {
|
||||
return nil, models.ErrInternal
|
||||
}
|
||||
if count == 1 {
|
||||
position, err := s.positions.GetPositionByCode(ctx, "kotosoft_id_staff")
|
||||
if err == nil {
|
||||
now := time.Now()
|
||||
_ = s.positions.AssignPosition(ctx, user.ID, position.ID, nil, now, nil)
|
||||
}
|
||||
}
|
||||
|
||||
return user, nil
|
||||
}
|
||||
|
||||
func (s *Service) ValidateAccessToken(ctx context.Context, token string) (*TokenInfo, error) {
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
)
|
||||
|
||||
func (s *Service) GetAllPermissions(ctx context.Context) ([]models.Permission, error) {
|
||||
return s.positions.GetAllPermissions(ctx)
|
||||
return s.positions.GetAllPermissions(ctx, "en")
|
||||
}
|
||||
|
||||
func (s *Service) AddPermissionToPosition(ctx context.Context, positionCode, permissionCode string) error {
|
||||
@@ -54,6 +54,13 @@ func (s *Service) GetAllPositions(ctx context.Context, locale string) ([]models.
|
||||
return s.positions.GetAllPositions(ctx, locale)
|
||||
}
|
||||
|
||||
func (s *Service) GetUsersWithPositions(ctx context.Context, locale string) ([]models.UserWithPositions, error) {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.GetUsersWithPositions(ctx, locale)
|
||||
}
|
||||
|
||||
func (s *Service) UpsertPositionForLocale(ctx context.Context, code, locale, name string, description *string) error {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
@@ -76,7 +83,7 @@ func (s *Service) AssignPosition(ctx context.Context, adminID, targetUserID uuid
|
||||
validFrom = time.Now()
|
||||
}
|
||||
|
||||
return s.positions.AssignPosition(ctx, targetUserID, position.ID, &adminID, validFrom, (*interface{})(nil))
|
||||
return s.positions.AssignPosition(ctx, targetUserID, position.ID, &adminID, validFrom, input.ValidTo)
|
||||
}
|
||||
|
||||
func (s *Service) RevokePosition(ctx context.Context, targetUserID uuid.UUID, positionCode string) error {
|
||||
@@ -85,15 +92,32 @@ func (s *Service) RevokePosition(ctx context.Context, targetUserID uuid.UUID, po
|
||||
return models.ErrNotFound
|
||||
}
|
||||
|
||||
if position.Code == "kotosoft_id_staff" {
|
||||
return models.ErrForbidden
|
||||
}
|
||||
|
||||
return s.positions.RevokePosition(ctx, targetUserID, position.ID)
|
||||
}
|
||||
|
||||
func (s *Service) CreatePermission(ctx context.Context, code string, description *string) error {
|
||||
return s.positions.CreatePermission(ctx, code, description)
|
||||
func (s *Service) GetAllPermissionsForLocale(ctx context.Context, locale string) ([]models.Permission, error) {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.GetAllPermissions(ctx, locale)
|
||||
}
|
||||
|
||||
func (s *Service) UpdatePermission(ctx context.Context, code string, description *string) error {
|
||||
return s.positions.UpdatePermission(ctx, code, description)
|
||||
func (s *Service) CreatePermission(ctx context.Context, code, locale string, description *string) error {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.CreatePermission(ctx, code, locale, description)
|
||||
}
|
||||
|
||||
func (s *Service) UpdatePermission(ctx context.Context, code, locale string, description *string) error {
|
||||
if locale == "" {
|
||||
locale = "en"
|
||||
}
|
||||
return s.positions.UpdatePermission(ctx, code, locale, description)
|
||||
}
|
||||
|
||||
func (s *Service) DeletePermission(ctx context.Context, code string) error {
|
||||
@@ -132,7 +156,7 @@ func (s *Service) IntrospectToken(ctx context.Context, token string) (*Introspec
|
||||
positions = []models.PositionLocalized{}
|
||||
}
|
||||
|
||||
allPerms, err := s.positions.GetUserPermissions(ctx, user.ID)
|
||||
allPerms, err := s.positions.GetUserPermissions(ctx, user.ID, "en")
|
||||
if err != nil {
|
||||
return &IntrospectResponse{Active: false}, nil
|
||||
}
|
||||
|
||||
@@ -26,6 +26,7 @@ type UserRepo interface {
|
||||
GetUserByEmail(ctx context.Context, email string) (*models.User, error)
|
||||
GetUserByID(ctx context.Context, id uuid.UUID) (*models.User, error)
|
||||
IsUserExistsByEmail(ctx context.Context, email string) bool
|
||||
CountUsers(ctx context.Context) (int, error)
|
||||
}
|
||||
|
||||
type OAuthRepo interface {
|
||||
@@ -47,25 +48,26 @@ type OAuthRepo interface {
|
||||
}
|
||||
|
||||
type PositionRepo interface {
|
||||
GetAllPermissions(ctx context.Context) ([]models.Permission, error)
|
||||
GetAllPermissions(ctx context.Context, locale string) ([]models.Permission, error)
|
||||
GetPermissionByCode(ctx context.Context, code string) (*models.Permission, error)
|
||||
GetPositionPermissions(ctx context.Context, positionID uuid.UUID) ([]models.Permission, error)
|
||||
GetPositionPermissions(ctx context.Context, positionID uuid.UUID, locale string) ([]models.Permission, error)
|
||||
AddPermissionToPosition(ctx context.Context, positionID, permissionID uuid.UUID) error
|
||||
RemovePermissionFromPosition(ctx context.Context, positionID, permissionID uuid.UUID) error
|
||||
|
||||
GetPositionByCode(ctx context.Context, code string) (*models.Position, error)
|
||||
GetUserPositions(ctx context.Context, userID uuid.UUID, locale string) ([]models.PositionLocalized, error)
|
||||
GetAllPositions(ctx context.Context, locale string) ([]models.PositionLocalized, error)
|
||||
GetUsersWithPositions(ctx context.Context, locale string) ([]models.UserWithPositions, error)
|
||||
UpsertPositionForLocale(ctx context.Context, code, locale, name string, description *string) error
|
||||
|
||||
AssignPosition(ctx context.Context, userID, positionID uuid.UUID, assignedBy *uuid.UUID, validFrom any, validTo *any) error
|
||||
AssignPosition(ctx context.Context, userID, positionID uuid.UUID, assignedBy *uuid.UUID, validFrom time.Time, validTo *time.Time) error
|
||||
RevokePosition(ctx context.Context, userID, positionID uuid.UUID) error
|
||||
|
||||
UserHasPermission(ctx context.Context, userID uuid.UUID, permissionCode string) (bool, string, error)
|
||||
GetUserPermissions(ctx context.Context, userID uuid.UUID) ([]models.Permission, error)
|
||||
GetUserPermissions(ctx context.Context, userID uuid.UUID, locale string) ([]models.Permission, error)
|
||||
|
||||
CreatePermission(ctx context.Context, code string, description *string) error
|
||||
UpdatePermission(ctx context.Context, code string, description *string) error
|
||||
CreatePermission(ctx context.Context, code, locale string, description *string) error
|
||||
UpdatePermission(ctx context.Context, code, locale string, description *string) error
|
||||
DeletePositionByCode(ctx context.Context, code string) error
|
||||
DeletePermission(ctx context.Context, code string) error
|
||||
}
|
||||
|
||||
Binary file not shown.
@@ -132,11 +132,95 @@ CREATE TABLE IF NOT EXISTS public.permissions (
|
||||
created_at timestamptz NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS public.permission_translations (
|
||||
permission_id uuid NOT NULL REFERENCES public.permissions(id) ON DELETE CASCADE,
|
||||
locale text NOT NULL DEFAULT 'en',
|
||||
name text NOT NULL,
|
||||
description text,
|
||||
PRIMARY KEY (permission_id, locale)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_permission_translations_permission_id
|
||||
ON public.permission_translations (permission_id);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_permission_translations_locale
|
||||
ON public.permission_translations (locale);
|
||||
|
||||
INSERT INTO public.permissions (code, description) VALUES
|
||||
('positions.manage', 'Create and edit positions'),
|
||||
('positions.assign', 'Assign positions to users')
|
||||
('positions.assign', 'Assign positions to users'),
|
||||
('positions.revoke', 'Revoke positions from users')
|
||||
ON CONFLICT (code) DO NOTHING;
|
||||
|
||||
INSERT INTO public.permission_translations (permission_id, locale, name, description)
|
||||
SELECT id, 'en', code, description FROM public.permissions
|
||||
ON CONFLICT (permission_id, locale) DO NOTHING;
|
||||
|
||||
INSERT INTO public.permission_translations (permission_id, locale, name, description)
|
||||
SELECT id,
|
||||
'ru',
|
||||
CASE code
|
||||
WHEN 'positions.manage' THEN 'Управление должностями'
|
||||
WHEN 'positions.assign' THEN 'Назначение должностей'
|
||||
WHEN 'positions.revoke' THEN 'Отзыв должностей'
|
||||
ELSE code
|
||||
END,
|
||||
CASE code
|
||||
WHEN 'positions.manage' THEN 'Создание и редактирование должностей'
|
||||
WHEN 'positions.assign' THEN 'Назначение должностей пользователям'
|
||||
WHEN 'positions.revoke' THEN 'Отзыв должностей у пользователей'
|
||||
ELSE description
|
||||
END
|
||||
FROM public.permissions
|
||||
ON CONFLICT (permission_id, locale) DO NOTHING;
|
||||
|
||||
INSERT INTO public.permission_translations (permission_id, locale, name, description)
|
||||
SELECT id,
|
||||
'it',
|
||||
CASE code
|
||||
WHEN 'positions.manage' THEN 'Gestione posizioni'
|
||||
WHEN 'positions.assign' THEN 'Assegnazione posizioni'
|
||||
WHEN 'positions.revoke' THEN 'Revoca posizioni'
|
||||
ELSE code
|
||||
END,
|
||||
CASE code
|
||||
WHEN 'positions.manage' THEN 'Creazione e modifica delle posizioni'
|
||||
WHEN 'positions.assign' THEN 'Assegnazione delle posizioni agli utenti'
|
||||
WHEN 'positions.revoke' THEN 'Revoca delle posizioni dagli utenti'
|
||||
ELSE description
|
||||
END
|
||||
FROM public.permissions
|
||||
ON CONFLICT (permission_id, locale) DO NOTHING;
|
||||
|
||||
INSERT INTO public.positions (code)
|
||||
VALUES ('kotosoft_id_staff')
|
||||
ON CONFLICT (code) DO NOTHING;
|
||||
|
||||
INSERT INTO public.position_translations (position_id, locale, name, description)
|
||||
SELECT id, 'en', 'Kotosoft ID Staff', 'Default staff position for Kotosoft ID operators'
|
||||
FROM public.positions
|
||||
WHERE code = 'kotosoft_id_staff'
|
||||
ON CONFLICT (position_id, locale) DO NOTHING;
|
||||
|
||||
INSERT INTO public.position_translations (position_id, locale, name, description)
|
||||
SELECT id, 'ru', 'Сотрудник Kotosoft ID', 'Базовая должность сотрудника Kotosoft ID'
|
||||
FROM public.positions
|
||||
WHERE code = 'kotosoft_id_staff'
|
||||
ON CONFLICT (position_id, locale) DO NOTHING;
|
||||
|
||||
INSERT INTO public.position_translations (position_id, locale, name, description)
|
||||
SELECT id, 'it', 'Operatore Kotosoft ID', 'Posizione predefinita per operatori Kotosoft ID'
|
||||
FROM public.positions
|
||||
WHERE code = 'kotosoft_id_staff'
|
||||
ON CONFLICT (position_id, locale) DO NOTHING;
|
||||
|
||||
INSERT INTO public.position_permissions (position_id, permission_id)
|
||||
SELECT p.id, perm.id
|
||||
FROM public.positions p
|
||||
JOIN public.permissions perm ON perm.code IN ('positions.manage', 'positions.assign', 'positions.revoke')
|
||||
WHERE p.code = 'kotosoft_id_staff'
|
||||
ON CONFLICT (position_id, permission_id) DO NOTHING;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS public.position_permissions (
|
||||
position_id uuid NOT NULL REFERENCES public.positions(id) ON DELETE CASCADE,
|
||||
permission_id uuid NOT NULL REFERENCES public.permissions(id) ON DELETE CASCADE,
|
||||
@@ -199,4 +283,20 @@ DROP TRIGGER IF EXISTS positions_updated_at ON public.positions;
|
||||
CREATE TRIGGER positions_updated_at
|
||||
BEFORE UPDATE ON public.positions
|
||||
FOR EACH ROW
|
||||
EXECUTE FUNCTION public.set_updated_at();
|
||||
EXECUTE FUNCTION public.set_updated_at();
|
||||
|
||||
CREATE TABLE IF NOT EXISTS public.regions (
|
||||
id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
|
||||
code char(2) NOT NULL UNIQUE,
|
||||
created_at timestamptz NOT NULL DEFAULT now()
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS public.region_translations (
|
||||
region_id uuid NOT NULL REFERENCES public.regions(id) ON DELETE CASCADE,
|
||||
locale text NOT NULL,
|
||||
name text NOT NULL,
|
||||
PRIMARY KEY (region_id, locale)
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_region_translations_region_id
|
||||
ON public.region_translations (region_id);
|
||||
Reference in New Issue
Block a user