opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3802 from rainzm/bugfix/notify_user_list

Browse Source 
feat(notify): Add interface contacts/users for Notify
This commit is contained in:
yunion-ci-robot
2019-11-20 16:59:23 +08:00
committed by GitHub
parent 4303f95024 7aa8b818d6
commit ef6de14d97
1 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/handlers.go
+60
View File
@@ -25,10 +25,14 @@ import (
"yunion.io/x/onecloud/pkg/appsrv"
"yunion.io/x/onecloud/pkg/cloudcommon/db"
"yunion.io/x/onecloud/pkg/cloudcommon/policy"
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient/auth"
"yunion.io/x/onecloud/pkg/mcclient/modulebase"
"yunion.io/x/onecloud/pkg/mcclient/modules"
"yunion.io/x/onecloud/pkg/notify/cache"
"yunion.io/x/onecloud/pkg/notify/models"
"yunion.io/x/onecloud/pkg/notify/options"
"yunion.io/x/onecloud/pkg/notify/utils"
)
@@ -58,6 +62,10 @@ func AddNotifyDispatcher(prefix string, app *appsrv.Application) {
fmt.Sprintf("%s/%s", prefix, modelDispatcher.KeywordPlural()),
modelDispatcher.Filter(listHandler), metadata, "list_contacts", tags)
app.AddHandler2("GET",
fmt.Sprintf("%s/%s/users", prefix, modelDispatcher.KeywordPlural()),
modelDispatcher.Filter(keyStoneUserListHandler), metadata, "list_users", tags)
app.AddHandler2("GET",
fmt.Sprintf("%s/%s/<uid>", prefix, modelDispatcher.KeywordPlural()),
modelDispatcher.Filter(getHandler), metadata, "list_by_uid", tags)
@@ -346,3 +354,55 @@ func arrangeOne(ctx context.Context, listResult *modulebase.ListResult) jsonutil
}
return jsonutils.Marshal(models.NewSContactResponse(ctx, uid, details.String()))
}
// offset ang limit is not useable for here
func keyStoneUserListHandler(ctx context.Context, w http.ResponseWriter, r *http.Request) {
manager, _, query, _ := fetchEnv(ctx, w, r)
haveContacts := jsonutils.QueryBoolean(query, "have_contacts", false)
userCred := policy.FetchUserCredential(ctx)
s := auth.GetSession(ctx, userCred, options.Options.Region, "")
users, err := modules.UsersV3.List(s, query)
if err != nil {
log.Errorf("keystone list error: %s", err)
httperrors.InternalServerError(w, err.Error())
return
}
q := models.ContactManager.Query("uid").GroupBy("uid")
row, err := q.Rows()
if err != nil {
log.Errorf("get contact's uid error: %s", err)
httperrors.InternalServerError(w, err.Error())
return
}
defer row.Close()
uidSet, uid := make(map[string]struct{}), ""
for row.Next() {
row.Scan(&uid)
uidSet[uid] = struct{}{}
}
type sPair struct {
ID string
Name string
}
newDatas := make([]sPair, 0, len(users.Data))
for _, data := range users.Data {
id, _ := data.GetString("id")
name, _ := data.GetString("name")
if _, ok := uidSet[id]; ok {
if haveContacts {
newDatas = append(newDatas, sPair{id, name})
}
continue
}
if haveContacts {
continue
}
newDatas = append(newDatas, sPair{id, name})
}
ret := jsonutils.NewDict()
ret.Add(jsonutils.Marshal(newDatas), manager.Keyword())
appsrv.SendJSON(w, ret)
}