floraachy
/
console
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize notification api

This commit is contained in:
liugq 2023-04-06 21:07:29 +08:00
parent df45c4d6db
commit e8f9c83245
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugin/api/notification/notification.go
View File

@ -48,7 +48,7 @@ func (h *NotificationAPI) searchNotifications(w http.ResponseWriter, req *http.R
} }
musts := []util.MapStr{ musts := []util.MapStr{
{"term": util.MapStr{"user_id": util.MapStr{"value": user.UserId}}}, {"terms": util.MapStr{"user_id": []string{user.UserId, "*"}}},
} }
if len(reqData.Status) > 0 { if len(reqData.Status) > 0 {
musts = append(musts, util.MapStr{"terms": util.MapStr{"status": reqData.Status}}) musts = append(musts, util.MapStr{"terms": util.MapStr{"status": reqData.Status}})
@ -120,46 +120,28 @@ func (h *NotificationAPI) setNotificationsRead(w http.ResponseWriter, req *http.
queryDsl := util.MapStr{ queryDsl := util.MapStr{
"query": util.MapStr{ "query": util.MapStr{
"bool": util.MapStr{
"should": []util.MapStr{
util.MapStr{
"bool": util.MapStr{ "bool": util.MapStr{
"must": []util.MapStr{ "must": []util.MapStr{
{"term": util.MapStr{"user_id": util.MapStr{"value": user.UserId}}}, //{"term": util.MapStr{"user_id": util.MapStr{"value": user.UserId}}},
{
"term": util.MapStr{
"status": util.MapStr{
"value": model.NotificationStatusNew,
},
},
},
},
"should": []util.MapStr{
{ {
"terms": util.MapStr{ "terms": util.MapStr{
"_id": reqData.Ids, "_id": reqData.Ids,
}, },
}, },
{
"term": util.MapStr{
"status": util.MapStr{
"value": model.NotificationStatusNew,
},
},
},
},
},
},
util.MapStr{
"bool": util.MapStr{
"must": []util.MapStr{
{"term": util.MapStr{"user_id": util.MapStr{"value": user.UserId}}},
{ {
"terms": util.MapStr{ "terms": util.MapStr{
"type": reqData.Types, "type": reqData.Types,
}, },
}, },
{
"term": util.MapStr{
"status": util.MapStr{
"value": model.NotificationStatusNew,
},
},
},
},
},
},
}, },
"minimum_should_match": 1, "minimum_should_match": 1,
}, },