This commit is contained in:
2026-10-02 01:01:58 +07:00
parent 7052f80144
commit d85967968f
7 changed files with 60 additions and 11 deletions
+4 -4
View File
@@ -326,23 +326,23 @@ func (s *UsersService) Refresh(
func (s *UsersService) GetUsers(
ctx context.Context,
) ([]*repos.User, error) {
) ([]*User, error) {
users, err := s.usersRepo.GetUsers(ctx)
if err != nil {
return nil, err
}
return users, nil
return mapUsers(users), nil
}
func (s *UsersService) GetUserByID(
ctx context.Context,
userID int,
) (*repos.User, error) {
) (*User, error) {
user, err := s.usersRepo.GetUserByID(ctx, userID)
if err != nil {
return nil, err
}
return user, nil
return mapUser(user), nil
}
func (s *UsersService) AddUserRole(
+13
View File
@@ -0,0 +1,13 @@
package users_service
import "time"
// User — пользователь, доступный прикладным сценариям и выдаче наружу.
type User struct {
ID int
Username string
Email string
Roles []string
IsActive bool
CreatedAt time.Time
}
@@ -0,0 +1,25 @@
package users_service
import "evening_detective_server/internal/repos"
func mapUser(user *repos.User) *User {
if user == nil {
return nil
}
return &User{
ID: user.ID,
Username: user.Username,
Email: user.Email,
Roles: user.Roles,
IsActive: user.IsActive,
CreatedAt: user.CreatedAt,
}
}
func mapUsers(users []*repos.User) []*User {
result := make([]*User, 0, len(users))
for _, user := range users {
result = append(result, mapUser(user))
}
return result
}