Updated hierarchy routes #200
|
|
@ -30,6 +30,7 @@ type UserHierarchyDBI interface {
|
|||
UpdateUserHierarchyDB(ctx context.Context, tx pgx.Tx, paramsUpdate *typescore.UserHierarchy, returnObj ...bool) (*typescore.UserHierarchy, pgx.Tx, error)
|
||||
DeleteUserHierarchyDB(ctx context.Context, params *typescore.UserHierarchy) error
|
||||
GetApproversDB(ctx context.Context, subordinateID, departmentID, topicID, categoryID uint64, systems []string) ([]*typescore.User, error)
|
||||
GetHierarchiesWithRelations(ctx context.Context, opts typescore.ListDbOptions, userStatuses ...string) ([]*typescore.UserHierarchy, uint64, error)
|
||||
}
|
||||
|
||||
func (u *UserHierarchyDB) GetUserHierarchyListDB(ctx context.Context, opts ...typescore.ListDbOptions) ([]*typescore.UserHierarchy, uint64, error) {
|
||||
|
|
@ -284,12 +285,20 @@ func (u *UserHierarchyDB) GetApproversDB(
|
|||
return approvers, nil
|
||||
}
|
||||
|
||||
func (u *UserHierarchyDB) GetHierarchiesWithRelations(ctx context.Context, opts typescore.ListDbOptions) ([]*typescore.UserHierarchy, uint64, error) {
|
||||
// В интерфейсе UserHierarchyDBI обновите сигнатуру (или добавьте новый метод):
|
||||
// GetHierarchiesWithRelations(ctx context.Context, opts typescore.ListDbOptions, userStatus string) ([]*typescore.UserHierarchy, uint64, error)
|
||||
|
||||
func (u *UserHierarchyDB) GetHierarchiesWithRelations(ctx context.Context, opts typescore.ListDbOptions, userStatuses ...string) ([]*typescore.UserHierarchy, uint64, error) {
|
||||
options, filter, err := dbutils.GetOptionsDB[typescore.UserHierarchy](opts)
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
|
||||
userStatus := ""
|
||||
if len(userStatuses) > 0 {
|
||||
userStatus = userStatuses[0]
|
||||
}
|
||||
|
||||
query := squirrel.Select(
|
||||
"uh.id",
|
||||
"uh.subordinate_id",
|
||||
|
|
@ -301,8 +310,8 @@ func (u *UserHierarchyDB) GetHierarchiesWithRelations(ctx context.Context, opts
|
|||
"uh.target_system",
|
||||
"uh.created_at",
|
||||
"uh.updated_at",
|
||||
"sub.id", "sub.full_name", "sub.username",
|
||||
"app.id", "app.full_name", "app.username",
|
||||
"sub.id", "sub.full_name", "sub.username", "sub.is_blocked", "sub.is_fired",
|
||||
"app.id", "app.full_name", "app.username", "app.is_blocked", "app.is_fired",
|
||||
"dep.id", "dep.name",
|
||||
"cat.id", "cat.name",
|
||||
"top.id", "top.name",
|
||||
|
|
@ -317,21 +326,48 @@ func (u *UserHierarchyDB) GetHierarchiesWithRelations(ctx context.Context, opts
|
|||
|
||||
query = dbutils.SetterLimitAndOffsetQuery(query, options.Offset, options.Limit)
|
||||
|
||||
// Явная обработка фильтров
|
||||
// 1. Фильтр по сотруднику (инициатору)
|
||||
if filter.SubordinateID != nil {
|
||||
query = query.Where(squirrel.Eq{"uh.subordinate_id": *filter.SubordinateID})
|
||||
}
|
||||
|
||||
// 2. Фильтр по согласующему: ищем ВСЮ цепочку, где этот пользователь является согласующим хотя бы на одном шаге
|
||||
if filter.ApproverID != nil {
|
||||
query = query.Where(squirrel.Eq{"uh.approver_id": *filter.ApproverID})
|
||||
query = query.Where(squirrel.Expr(`
|
||||
EXISTS (
|
||||
SELECT 1 FROM user_hierarchy uh2
|
||||
WHERE uh2.approver_id = ?
|
||||
AND uh2.subordinate_id = uh.subordinate_id
|
||||
AND uh2.department_id = uh.department_id
|
||||
AND COALESCE(uh2.topic_category_id, 0) = COALESCE(uh.topic_category_id, 0)
|
||||
AND COALESCE(uh2.topic_id, 0) = COALESCE(uh.topic_id, 0)
|
||||
)
|
||||
`, *filter.ApproverID))
|
||||
}
|
||||
|
||||
// 3. Фильтр по отделу
|
||||
if filter.DepartmentID != nil {
|
||||
query = query.Where(squirrel.Eq{"uh.department_id": *filter.DepartmentID})
|
||||
}
|
||||
if filter.TopicCategoryID != nil {
|
||||
query = query.Where(squirrel.Eq{"uh.topic_category_id": *filter.TopicCategoryID})
|
||||
}
|
||||
|
||||
// 4. Починка поиска по категории: категория + все темы внутри этой категории
|
||||
if filter.TopicID != nil {
|
||||
query = query.Where(squirrel.Eq{"uh.topic_id": *filter.TopicID})
|
||||
} else if filter.TopicCategoryID != nil {
|
||||
query = query.Where(squirrel.Or{
|
||||
squirrel.Eq{"uh.topic_category_id": *filter.TopicCategoryID},
|
||||
squirrel.Eq{"top.category_id": *filter.TopicCategoryID},
|
||||
})
|
||||
}
|
||||
|
||||
// 5. Фильтр по статусу пользователя (сотрудника)
|
||||
switch userStatus {
|
||||
case "active":
|
||||
query = query.Where("COALESCE(sub.is_blocked, false) = false AND COALESCE(sub.is_fired, false) = false")
|
||||
case "fired":
|
||||
query = query.Where("COALESCE(sub.is_fired, false) = true")
|
||||
case "blocked":
|
||||
query = query.Where("COALESCE(sub.is_blocked, false) = true")
|
||||
}
|
||||
|
||||
query = query.OrderBy("uh.created_at DESC")
|
||||
|
|
@ -351,20 +387,21 @@ func (u *UserHierarchyDB) GetHierarchiesWithRelations(ctx context.Context, opts
|
|||
var totalCount uint64
|
||||
|
||||
for rows.Next() {
|
||||
h := &typescore.UserHierarchy{}
|
||||
h.Subordinate = &typescore.User{}
|
||||
h.Approver = &typescore.User{}
|
||||
h.Department = &typescore.Department{}
|
||||
h.TopicCategory = &typescore.ApprovalTopicCategory{}
|
||||
h.Topic = &typescore.ApprovalTopic{}
|
||||
h := &typescore.UserHierarchy{
|
||||
Subordinate: &typescore.User{},
|
||||
Approver: &typescore.User{},
|
||||
Department: &typescore.Department{},
|
||||
TopicCategory: &typescore.ApprovalTopicCategory{},
|
||||
Topic: &typescore.ApprovalTopic{},
|
||||
}
|
||||
|
||||
err := rows.Scan(
|
||||
&h.ID, &h.SubordinateID, &h.ApproverID, &h.DepartmentID,
|
||||
&h.TopicCategoryID, &h.TopicID, &h.Priority,
|
||||
&h.TargetSystem,
|
||||
&h.CreatedAt, &h.UpdatedAt,
|
||||
&h.Subordinate.ID, &h.Subordinate.FullName, &h.Subordinate.Username,
|
||||
&h.Approver.ID, &h.Approver.FullName, &h.Approver.Username,
|
||||
&h.Subordinate.ID, &h.Subordinate.FullName, &h.Subordinate.Username, &h.Subordinate.IsBlocked, &h.Subordinate.IsFired,
|
||||
&h.Approver.ID, &h.Approver.FullName, &h.Approver.Username, &h.Approver.IsBlocked, &h.Approver.IsFired,
|
||||
&h.Department.ID, &h.Department.Name,
|
||||
&h.TopicCategory.ID, &h.TopicCategory.Name,
|
||||
&h.Topic.ID, &h.Topic.Name,
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import (
|
|||
// @Router /api/hierarchies [get]
|
||||
func (s *HierarchiesReg) GetHierarchiesListHandler(w http.ResponseWriter, r *http.Request) (interface{}, error) {
|
||||
queryParams := r.URL.Query()
|
||||
userStatus := queryParams.Get("user_status")
|
||||
|
||||
hierarchyParams := &typescore.UserHierarchy{}
|
||||
offset, limit, likeFields, errW := utilscore.ParseParamsGetRequest(queryParams, hierarchyParams)
|
||||
|
|
@ -50,7 +51,7 @@ func (s *HierarchiesReg) GetHierarchiesListHandler(w http.ResponseWriter, r *htt
|
|||
}
|
||||
|
||||
ctx := r.Context()
|
||||
hierarchiesDbLst, total, errW := s.ipc.Database.UserHierarchy.GetHierarchiesWithRelations(ctx, options)
|
||||
hierarchiesDbLst, total, errW := s.ipc.Database.UserHierarchy.GetHierarchiesWithRelations(ctx, options, userStatus)
|
||||
if errW != nil {
|
||||
return nil, errW
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue