updated core types && updated admins table #46

Merged
romanskijdev merged 1 commits from fix-permissions into main 2026-06-30 11:52:23 +03:00
2 changed files with 61 additions and 7 deletions

View File

@ -11,17 +11,22 @@ type Admin struct {
Name *string `gorm:"type:text;column:name" json:"name,omitempty" db:"name" mapstructure:"name"`
PasswordHash *string `gorm:"type:text;not null;column:password_hash" json:"-" db:"password_hash" mapstructure:"password_hash"`
IsRoot *bool `gorm:"type:boolean;not null;default:false;column:is_root" json:"is_root" db:"is_root" mapstructure:"is_root"`
IsObserver *bool `gorm:"type:boolean;not null;default:false;column:is_observer" json:"is_observer" db:"is_observer" mapstructure:"is_observer"`
TelegramID *int64 `gorm:"type:bigint;column:telegram_id" json:"telegram_id,omitempty" db:"telegram_id" mapstructure:"telegram_id"`
CreatedAt *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:created_at" json:"created_at" db:"created_at"`
LastLogin *time.Time `gorm:"type:timestamp;default:CURRENT_TIMESTAMP;column:last_login" json:"last_login" db:"last_login"`
LastIPLogin *string `gorm:"type:text;column:last_ip_login" json:"last_ip_login" db:"last_ip_login" mapstructure:"last_ip_login"`
IsBlocked *bool `gorm:"type:boolean;not null;index;default:false;column:is_blocked" json:"is_blocked" db:"is_blocked" mapstructure:"is_blocked"`
Password *string `gorm:"-" json:"password,omitempty"`
Password *string `gorm:"-" json:"password,omitempty"`
TelegramUser *User `gorm:"-" json:"telegram_user,omitempty"`
}
type AdminReq struct {
Login *string `json:"login"`
Name *string `json:"name"`
Password *string `json:"password"` // Пароль пользователя
IsRoot *bool `json:"is_root"`
Login *string `json:"login"`
Name *string `json:"name"`
Password *string `json:"password"`
IsRoot *bool `json:"is_root"`
IsObserver *bool `json:"is_observer"`
TelegramID *int64 `json:"telegram_id"`
}

View File

@ -45,6 +45,16 @@ func (s *AdminsReg) GetAdminsListHandler(w http.ResponseWriter, r *http.Request)
return nil, errW
}
ctx := r.Context()
for _, admin := range adminsDbLst {
if admin.TelegramID != nil {
telegramUser, err := s.ipc.Database.User.GetUserByTelegramIDDB(ctx, *admin.TelegramID)
if err == nil && telegramUser != nil {
admin.TelegramUser = telegramUser
}
}
}
return &typescore.ApiResponseBase{
TotalCount: total,
Data: adminsDbLst,
@ -68,7 +78,6 @@ func (s *AdminsReg) CreateAdminHandler(w http.ResponseWriter, r *http.Request) (
return nil, errors.New("current admin not found")
}
// 🆕 Проверяем is_root, а не login
if currentAdmins[0].IsRoot == nil || !*currentAdmins[0].IsRoot {
return nil, errors.New("only_root_can_create_admins")
}
@ -87,6 +96,18 @@ func (s *AdminsReg) CreateAdminHandler(w http.ResponseWriter, r *http.Request) (
return nil, errors.New("login is required")
}
// 🆕 Валидация наблюдателя
if req.IsObserver != nil && *req.IsObserver {
if req.TelegramID == nil {
return nil, errors.New("telegram_id_required_for_observer")
}
// Проверяем, что пользователь с таким telegram_id существует
telegramUser, err := s.ipc.Database.User.GetUserByTelegramIDDB(r.Context(), *req.TelegramID)
if err != nil || telegramUser == nil {
return nil, errors.New("telegram_user_not_found")
}
}
// Проверка уникальности логина
usersList, _, err := s.ipc.Database.Admin.GetAdminsListDB(typescore.ListDbOptions{
Filtering: &typescore.Admin{Login: req.Login},
@ -113,6 +134,8 @@ func (s *AdminsReg) CreateAdminHandler(w http.ResponseWriter, r *http.Request) (
Name: req.Name,
PasswordHash: tempPasswordHash,
IsRoot: req.IsRoot,
IsObserver: req.IsObserver,
TelegramID: req.TelegramID,
}
newAdmin, _, err := s.ipc.Database.Admin.CreateAdminDB(nil, newAdminObj, true)
@ -164,11 +187,11 @@ func (s *AdminsReg) UpdateAdminHandler(w http.ResponseWriter, r *http.Request) (
}
currentIsRoot := currentAdmins[0].IsRoot != nil && *currentAdmins[0].IsRoot
// Проверки root-прав (как было)
if req.IsRoot != nil {
if !currentIsRoot {
return nil, errors.New("only_root_can_manage_root_rights")
}
if *req.ID == currentUserID && !*req.IsRoot {
return nil, errors.New("cannot_remove_root_from_self")
}
@ -200,6 +223,26 @@ func (s *AdminsReg) UpdateAdminHandler(w http.ResponseWriter, r *http.Request) (
return nil, errors.New("cannot_block_self")
}
isObserver := existing.IsObserver
telegramID := existing.TelegramID
if req.IsObserver != nil {
isObserver = req.IsObserver
}
if req.TelegramID != nil {
telegramID = req.TelegramID
}
if isObserver != nil && *isObserver {
if telegramID == nil {
return nil, errors.New("telegram_id_required_for_observer")
}
telegramUser, err := s.ipc.Database.User.GetUserByTelegramIDDB(r.Context(), *telegramID)
if err != nil || telegramUser == nil {
return nil, errors.New("telegram_user_not_found")
}
}
// Создаём объект для обновления
updateObj := &typescore.Admin{
ID: req.ID,
@ -213,6 +256,12 @@ func (s *AdminsReg) UpdateAdminHandler(w http.ResponseWriter, r *http.Request) (
if req.IsRoot != nil {
updateObj.IsRoot = req.IsRoot
}
if req.IsObserver != nil {
updateObj.IsObserver = req.IsObserver
}
if req.TelegramID != nil {
updateObj.TelegramID = req.TelegramID
}
updated, _, err := s.ipc.Database.Admin.UpdateAdminDB(nil, updateObj, true)
if err != nil {