updated user filters #37
|
|
@ -38,6 +38,7 @@ type UserDBI interface {
|
|||
GetObserversForCategoryDB(ctx context.Context, categoryCode string) ([]*typescore.User, error)
|
||||
GetUsersByRoleCodeDB(ctx context.Context, roleCode string) ([]*typescore.User, error)
|
||||
GetObserversForApprovalDB(ctx context.Context, categoryCode string, topicID *uint64) ([]*typescore.User, error)
|
||||
GetUsersListByRoleIDsDB(ctx context.Context, opts typescore.ListDbOptions, roleIDs []uint64) ([]*typescore.User, uint64, error)
|
||||
}
|
||||
|
||||
func (u *UserDB) GetUsersListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.User, uint64, error) {
|
||||
|
|
@ -49,9 +50,27 @@ func (u *UserDB) GetUsersListDB(ctx context.Context, opts ...typescore.ListDbOpt
|
|||
return nil, 0, err
|
||||
}
|
||||
|
||||
// ✅ Сохраняем значение поиска и удаляем из LikeFields
|
||||
searchName := ""
|
||||
if options.LikeFields != nil && options.LikeFields["full_name"] != "" {
|
||||
searchName = options.LikeFields["full_name"]
|
||||
delete(options.LikeFields, "full_name")
|
||||
}
|
||||
|
||||
// ✅ Обнуляем FullName в filter
|
||||
filter.FullName = nil
|
||||
|
||||
query := dbutils.BuildSelectQuery(dbcoretablenames.TableNameUsers.ToString(), selectFields)
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
|
||||
// ✅ Сначала добавляем условие поиска
|
||||
if searchName != "" {
|
||||
query = query.Where("LOWER(full_name) LIKE LOWER(?)", "%"+searchName+"%")
|
||||
}
|
||||
|
||||
// ✅ Потом применяем остальные фильтры
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameUsers.ToString())
|
||||
|
||||
query = query.OrderBy("created_at DESC")
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
|
|
@ -59,6 +78,8 @@ func (u *UserDB) GetUsersListDB(ctx context.Context, opts ...typescore.ListDbOpt
|
|||
return nil, 0, err
|
||||
}
|
||||
|
||||
logrus.Debugf("GetUsersListDB SQL: %s, Args: %v", sql, args)
|
||||
|
||||
rows, err := u.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
|
|
@ -448,3 +469,93 @@ func (u *UserDB) GetUsersByRoleCodeDB(ctx context.Context, roleCode string) ([]*
|
|||
}
|
||||
return users, nil
|
||||
}
|
||||
|
||||
// GetUsersListByRoleIDsDB - фильтрация пользователей по массиву ID ролей
|
||||
func (u *UserDB) GetUsersListByRoleIDsDB(ctx context.Context, opts typescore.ListDbOptions, roleIDs []uint64) ([]*typescore.User, uint64, error) {
|
||||
if len(roleIDs) == 0 {
|
||||
return u.GetUsersListDB(ctx, opts)
|
||||
}
|
||||
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.User](opts)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
searchName := ""
|
||||
if options.LikeFields != nil && options.LikeFields["full_name"] != "" {
|
||||
searchName = options.LikeFields["full_name"]
|
||||
delete(options.LikeFields, "full_name")
|
||||
}
|
||||
|
||||
filter.FullName = nil
|
||||
|
||||
logrus.Infof("🔍 GetUsersListByRoleIDsDB: searchName='%s', filter.FullName=%v, options.Offset=%d, options.Limit=%d",
|
||||
searchName, filter.FullName, options.Offset, options.Limit)
|
||||
|
||||
countQuery := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select("COUNT(DISTINCT u.id)").
|
||||
From(dbcoretablenames.TableNameUsers.ToString() + " u").
|
||||
Join(dbcoretablenames.TableNameUserRoles.ToString() + " ur ON ur.user_id = u.id").
|
||||
Where(squirrel.Eq{"ur.role_id": roleIDs})
|
||||
|
||||
if searchName != "" {
|
||||
countQuery = countQuery.Where("LOWER(u.full_name) LIKE LOWER(?)", "%"+searchName+"%")
|
||||
}
|
||||
countQuery = dbutils.ApplyFilters(countQuery, filter, options.LikeFields, dbcoretablenames.TableNameUsers.ToString())
|
||||
|
||||
countSQL, countArgs, err := countQuery.ToSql()
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
var totalCount uint64
|
||||
err = u.pool.QueryRow(ctx, countSQL, countArgs...).Scan(&totalCount)
|
||||
if err != nil {
|
||||
logrus.Errorf("🔍 GetUsersListByRoleIDsDB Count error: %v", err)
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
query := squirrel.StatementBuilder.PlaceholderFormat(squirrel.Dollar).
|
||||
Select("u.*").
|
||||
From(dbcoretablenames.TableNameUsers.ToString() + " u").
|
||||
Join(dbcoretablenames.TableNameUserRoles.ToString() + " ur ON ur.user_id = u.id").
|
||||
Where(squirrel.Eq{"ur.role_id": roleIDs}).
|
||||
GroupBy("u.id")
|
||||
|
||||
if searchName != "" {
|
||||
query = query.Where("LOWER(u.full_name) LIKE LOWER(?)", "%"+searchName+"%")
|
||||
}
|
||||
|
||||
query = dbutils.ApplyFilters(query, filter, options.LikeFields, dbcoretablenames.TableNameUsers.ToString())
|
||||
|
||||
query = query.OrderBy("u.created_at DESC")
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
|
||||
sql, args, err := query.ToSql()
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
rows, err := u.pool.Query(ctx, sql, args...)
|
||||
if err != nil {
|
||||
logrus.Errorf("🔍 GetUsersListByRoleIDsDB Query error: %v", err)
|
||||
return nil, 0, err
|
||||
}
|
||||
defer rows.Close()
|
||||
|
||||
var users []*typescore.User
|
||||
for rows.Next() {
|
||||
user := &typescore.User{}
|
||||
if err := dbutils.ScanRowsToStructRows(rows, user, nil); err != nil {
|
||||
logrus.Warn("GetUsersListByRoleIDsDB:ScanRowsToStructRows", err)
|
||||
continue
|
||||
}
|
||||
users = append(users, user)
|
||||
}
|
||||
|
||||
if err = rows.Err(); err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
return users, totalCount, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,6 +37,29 @@ func (s *UserReg) GetUserListHandler(w http.ResponseWriter, r *http.Request) (in
|
|||
return nil, errW
|
||||
}
|
||||
|
||||
logrus.Infof("🔍 После ParseParamsGetRequest: offset=%d, limit=%d, likeFields=%v, userParams.FullName=%v",
|
||||
offset, limit, likeFields, userParams.FullName)
|
||||
|
||||
search := queryParams.Get("full_name")
|
||||
logrus.Infof("🔍 search из queryParams.Get('full_name'): '%s'", search)
|
||||
|
||||
if search != "" {
|
||||
if likeFields == nil {
|
||||
likeFields = make(map[string]string)
|
||||
}
|
||||
likeFields["full_name"] = search
|
||||
userParams.FullName = nil
|
||||
}
|
||||
|
||||
var roleIDs []uint64
|
||||
if roleIDsStr := queryParams["role_ids[]"]; len(roleIDsStr) > 0 {
|
||||
for _, idStr := range roleIDsStr {
|
||||
if id, err := strconv.ParseUint(idStr, 10, 64); err == nil {
|
||||
roleIDs = append(roleIDs, id)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
options := typescore.ListDbOptions{
|
||||
Filtering: userParams,
|
||||
Offset: offset,
|
||||
|
|
@ -45,14 +68,22 @@ func (s *UserReg) GetUserListHandler(w http.ResponseWriter, r *http.Request) (in
|
|||
}
|
||||
|
||||
ctx := r.Context()
|
||||
userDbLst, total, errW := s.ipc.Database.User.GetUsersListDB(ctx, options)
|
||||
if errW != nil {
|
||||
return nil, errW
|
||||
|
||||
var userDbLst []*typescore.User
|
||||
var total uint64
|
||||
var err error
|
||||
|
||||
if len(roleIDs) > 0 {
|
||||
userDbLst, total, err = s.ipc.Database.User.GetUsersListByRoleIDsDB(ctx, options, roleIDs)
|
||||
} else {
|
||||
userDbLst, total, err = s.ipc.Database.User.GetUsersListDB(ctx, options)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// 🚀 Подгружаем связанные данные для каждого пользователя
|
||||
for _, user := range userDbLst {
|
||||
// Подгружаем отдел
|
||||
if user.DepartmentID != nil {
|
||||
department, err := s.ipc.Database.Department.GetDepartmentByIDDB(ctx, *user.DepartmentID)
|
||||
if err == nil && department != nil {
|
||||
|
|
@ -60,12 +91,10 @@ func (s *UserReg) GetUserListHandler(w http.ResponseWriter, r *http.Request) (in
|
|||
}
|
||||
}
|
||||
|
||||
// Подгружаем роли пользователя
|
||||
userRoles, _, err := s.ipc.Database.UserRole.GetUserRolesListDB(ctx, typescore.ListDbOptions{
|
||||
Filtering: &typescore.UserRole{UserID: user.ID},
|
||||
})
|
||||
if err == nil && len(userRoles) > 0 {
|
||||
// Для каждой роли подгружаем информацию о роли
|
||||
for _, ur := range userRoles {
|
||||
if ur.RoleID != nil {
|
||||
role, err := s.ipc.Database.Role.GetRoleByIDDB(ctx, *ur.RoleID)
|
||||
|
|
@ -234,3 +263,34 @@ func (s *UserReg) UpdateUserHandler(w http.ResponseWriter, r *http.Request) (int
|
|||
|
||||
return upUser, nil
|
||||
}
|
||||
|
||||
func (s *UserReg) DeleteUserHandler(w http.ResponseWriter, r *http.Request) (interface{}, error) {
|
||||
idStr := chi.URLParam(r, "id")
|
||||
if idStr == "" {
|
||||
return nil, errors.New("user id is required")
|
||||
}
|
||||
|
||||
id, err := strconv.ParseUint(idStr, 10, 64)
|
||||
if err != nil {
|
||||
return nil, errors.New("invalid user id")
|
||||
}
|
||||
|
||||
ctx := r.Context()
|
||||
|
||||
// Проверяем, что пользователь существует
|
||||
existingUser, err := s.ipc.Database.User.GetUserByIDDB(ctx, id)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if existingUser == nil {
|
||||
return nil, errors.New("user not found")
|
||||
}
|
||||
|
||||
// Удаляем пользователя
|
||||
err = s.ipc.Database.User.DeleteUserDB(ctx, &typescore.User{ID: &id})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return true, nil
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ func RegisterUserRoutes(
|
|||
handlers.RegisterRoute(r, http.MethodGet, "/", s.GetUserListHandler)
|
||||
handlers.RegisterRoute(r, http.MethodPut, "/", s.UpdateUserHandler)
|
||||
|
||||
handlers.RegisterRoute(r, http.MethodDelete, "/{id}", s.DeleteUserHandler)
|
||||
|
||||
r.Get("/{id}", handlers.WrapHandlerF(handlers.WrapHandlerParams{
|
||||
HandlerFunc: s.GetUserByIDHandler,
|
||||
}))
|
||||
|
|
|
|||
Loading…
Reference in New Issue