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 #10336 from rainzm/fix/filter_receiver

Browse Source 
fix(notify): enable filter of contact type 'email' and 'mobile'
This commit is contained in:
yunion-ci-robot
2021-03-06 10:57:27 +08:00
committed by GitHub
parent b03d01fa01 c3b4cbef59
commit 765366f8bc
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/notify/models/receiver.go
+19 -4
View File
@@ -510,14 +510,29 @@ func (r *SReceiver) PushCache(ctx context.Context) error {
}
func (rm *SReceiverManager) EnabledContactFilter(contactType string, q *sqlchemy.SQuery) *sqlchemy.SQuery {
subQuery := SubContactManager.Query("receiver_id").Equals("type", contactType).IsTrue("enabled").SubQuery()
q = q.Join(subQuery, sqlchemy.Equals(subQuery.Field("receiver_id"), q.Field("id")))
switch contactType {
case api.MOBILE:
q = q.IsTrue("enabled_mobile")
case api.EMAIL:
q = q.IsTrue("enabled_email")
default:
subQuery := SubContactManager.Query("receiver_id").Equals("type", contactType).IsTrue("enabled").SubQuery()
q = q.Join(subQuery, sqlchemy.Equals(subQuery.Field("receiver_id"), q.Field("id")))
}
return q
}
func (rm *SReceiverManager) VerifiedContactFilter(contactType string, q *sqlchemy.SQuery) *sqlchemy.SQuery {
subQuery := SubContactManager.Query("receiver_id").Equals("type", contactType).IsTrue("verified").SubQuery()
q = q.Join(subQuery, sqlchemy.Equals(subQuery.Field("receiver_id"), q.Field("id")))
switch contactType {
case api.MOBILE:
q = q.IsTrue("verified_mobile")
case api.EMAIL:
q = q.IsTrue("verified_email")
default:
subQuery := SubContactManager.Query("receiver_id").Equals("type", contactType).IsTrue("verified").SubQuery()
q = q.Join(subQuery, sqlchemy.Equals(subQuery.Field("receiver_id"), q.Field("id")))
}
return q
}