The_evening_detective/evening_detective_server
1
0
Fork 0
generated from VLADIMIR/template
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates proto

Browse Source
This commit is contained in:
Владимир Фёдоров
2026-10-01 14:19:43 +07:00
parent 1887b5b9a1
commit d9c5ca2956
27 changed files with 1897 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/app/users.go
+7 -7
View File
@@ -175,15 +175,15 @@ func (s *server) GetUsers(ctx context.Context, req *proto.GetUsersReq) (*proto.G
}, nil
}
func (s *server) GetUserById(ctx context.Context, req *proto.GetUserByIdReq) (*proto.GetUserByIdRsp, error) {
user, err := s.usersService.GetUserByID(ctx, int(req.Id))
func (s *server) GetUserByID(ctx context.Context, req *proto.GetUserByIDReq) (*proto.GetUserByIDRsp, error) {
user, err := s.usersService.GetUserByID(ctx, int(req.ID))
if err != nil {
return &proto.GetUserByIdRsp{
return &proto.GetUserByIDRsp{
Error: err.Error(),
}, nil
}
return &proto.GetUserByIdRsp{
return &proto.GetUserByIDRsp{
User: mapUser(user),
}, nil
}
@@ -213,7 +213,7 @@ func (s *server) AddUserRole(ctx context.Context, req *proto.AddUserRoleReq) (*p
if !roles.HasRole(claims, roles.Admin) {
return nil, status.Errorf(codes.PermissionDenied, "permission denied")
}
if err := s.usersService.AddUserRole(ctx, int(req.Id), req.Role); err != nil {
if err := s.usersService.AddUserRole(ctx, int(req.ID), req.Role); err != nil {
return &proto.AddUserRoleRsp{
Error: err.Error(),
}, nil
@@ -229,7 +229,7 @@ func (s *server) DeleteUserRole(ctx context.Context, req *proto.DeleteUserRoleRe
if !roles.HasRole(claims, roles.Admin) {
return nil, status.Errorf(codes.PermissionDenied, "permission denied")
}
if err := s.usersService.DeleteUserRole(ctx, int(req.Id), req.Role); err != nil {
if err := s.usersService.DeleteUserRole(ctx, int(req.ID), req.Role); err != nil {
return &proto.DeleteUserRoleRsp{
Error: err.Error(),
}, nil
@@ -256,7 +256,7 @@ func (s *server) ChangeUserPassword(ctx context.Context, req *proto.ChangeUserPa
if !roles.HasRole(claims, roles.Admin) {
return nil, status.Error(codes.PermissionDenied, "Недостаточно прав")
}
err := s.usersService.ChangeUserPassword(ctx, claims.UserID, int(req.GetId()), req.GetNewPassword())
err := s.usersService.ChangeUserPassword(ctx, claims.UserID, int(req.GetID()), req.GetNewPassword())
switch {
case errors.Is(err, users_service.ErrPasswordChangeForbidden):
return nil, status.Error(codes.PermissionDenied, err.Error())