From edfd9d2038f64614d6250c332eeab1f73521aff9 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Thu, 20 Aug 2020 07:28:49 +0200 Subject: [PATCH] fix: UserIDsByDomain (#608) --- internal/user/repository/view/user_view.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/internal/user/repository/view/user_view.go b/internal/user/repository/view/user_view.go index 9c8800bec..3f0447822 100644 --- a/internal/user/repository/view/user_view.go +++ b/internal/user/repository/view/user_view.go @@ -61,7 +61,10 @@ func UsersByOrgID(db *gorm.DB, table, orgID string) ([]*model.UserView, error) { } func UserIDsByDomain(db *gorm.DB, table, domain string) ([]string, error) { - users := make([]string, 0) + type id struct { + Id string + } + ids := make([]id, 0) orgIDQuery := &usr_model.UserSearchQuery{ Key: usr_model.UserSearchKeyUserName, Method: global_model.SearchMethodEndsWithIgnoreCase, @@ -70,7 +73,14 @@ func UserIDsByDomain(db *gorm.DB, table, domain string) ([]string, error) { query := repository.PrepareSearchQuery(table, model.UserSearchRequest{ Queries: []*usr_model.UserSearchQuery{orgIDQuery}, }) - _, err := query(db, &users) + _, err := query(db, &ids) + if err != nil { + return nil, err + } + users := make([]string, len(ids)) + for i, id := range ids { + users[i] = id.Id + } return users, err }