some changes
This commit is contained in:
@@ -16,7 +16,7 @@ func (s *Service) GetRoles() ([]Role, error) {
|
||||
}
|
||||
|
||||
var roles []Role
|
||||
if err := s.db.Preload("Resources").Order("id").Find(&roles).Error; err != nil {
|
||||
if err := s.db.Preload("Resources").Preload("Users").Order("id").Find(&roles).Error; err != nil {
|
||||
return nil, fmt.Errorf("db error: %w", err)
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ func (s *Service) GetRoleByID(roleID uint) (*Role, error) {
|
||||
return nil, ErrNotInitialized
|
||||
}
|
||||
var role Role
|
||||
err := s.db.Preload("Resources").First(&role, roleID).Error
|
||||
err := s.db.Preload("Resources").Preload("Users").First(&role, roleID).Error
|
||||
if err != nil {
|
||||
if errors.Is(err, gorm.ErrRecordNotFound) {
|
||||
return nil, ErrRoleNotFound
|
||||
|
||||
Reference in New Issue
Block a user