feat: update ppid data categories
This commit is contained in:
parent
5dfcfe0560
commit
ce79ede7ef
|
|
@ -109,6 +109,9 @@ func (_i *ppidDataCategoriesService) AllInPpidData(req request.PpidDataCategorie
|
||||||
createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, authToken)
|
createdBy := utilSvc.GetUserInfo(_i.Log, _i.UsersRepo, authToken)
|
||||||
if createdBy != nil {
|
if createdBy != nil {
|
||||||
req.LevelGroupId = &createdBy.UserLevelId
|
req.LevelGroupId = &createdBy.UserLevelId
|
||||||
|
} else {
|
||||||
|
mabesGroup := "mabes"
|
||||||
|
req.Group = &mabesGroup
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
results, paging, err := _i.Repo.GetAll(req)
|
results, paging, err := _i.Repo.GetAll(req)
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ package service
|
||||||
import (
|
import (
|
||||||
"github.com/Nerzal/gocloak/v13"
|
"github.com/Nerzal/gocloak/v13"
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
|
userLevelsRepository "go-humas-be/app/module/user_levels/repository"
|
||||||
"go-humas-be/app/module/users/mapper"
|
"go-humas-be/app/module/users/mapper"
|
||||||
"go-humas-be/app/module/users/repository"
|
"go-humas-be/app/module/users/repository"
|
||||||
"go-humas-be/app/module/users/request"
|
"go-humas-be/app/module/users/request"
|
||||||
|
|
@ -14,9 +15,10 @@ import (
|
||||||
|
|
||||||
// UsersService
|
// UsersService
|
||||||
type usersService struct {
|
type usersService struct {
|
||||||
Repo repository.UsersRepository
|
Repo repository.UsersRepository
|
||||||
Log zerolog.Logger
|
userLevelsRepo userLevelsRepository.UserLevelsRepository
|
||||||
Keycloak *config.KeycloakConfig
|
Log zerolog.Logger
|
||||||
|
Keycloak *config.KeycloakConfig
|
||||||
}
|
}
|
||||||
|
|
||||||
// UsersService define interface of IUsersService
|
// UsersService define interface of IUsersService
|
||||||
|
|
@ -48,7 +50,7 @@ func (_i *usersService) All(req request.UsersQueryRequest) (users []*response.Us
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, result := range results {
|
for _, result := range results {
|
||||||
users = append(users, mapper.UsersResponseMapper(result))
|
users = append(users, mapper.UsersResponseMapper(result, _i.userLevelsRepo))
|
||||||
}
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
@ -60,13 +62,13 @@ func (_i *usersService) Show(id uint) (users *response.UsersResponse, err error)
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
return mapper.UsersResponseMapper(result), nil
|
return mapper.UsersResponseMapper(result, _i.userLevelsRepo), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (_i *usersService) ShowUserInfo(authToken string) (users *response.UsersResponse, err error) {
|
func (_i *usersService) ShowUserInfo(authToken string) (users *response.UsersResponse, err error) {
|
||||||
userInfo := utilSvc.GetUserInfo(_i.Log, _i.Repo, authToken)
|
userInfo := utilSvc.GetUserInfo(_i.Log, _i.Repo, authToken)
|
||||||
|
|
||||||
return mapper.UsersResponseMapper(userInfo), nil
|
return mapper.UsersResponseMapper(userInfo, _i.userLevelsRepo), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (_i *usersService) Save(req request.UsersCreateRequest, authToken string) (err error) {
|
func (_i *usersService) Save(req request.UsersCreateRequest, authToken string) (err error) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue