fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-20 08:03:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keystone): fix usage for projectNum (#18663)

Browse Source 
* feat(region): support action to reBilling

* fix(keystone): fix keystone usage for projectNum

---------

Co-authored-by: 马鸿飞 <mahongfei@yunion.cn>
This commit is contained in:
gouqi11
2023-11-14 19:32:13 +08:00
committed by GitHub
parent d0e8ec1d7e
commit f38441c251
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/keystone/models/usages.go
View File

@@ -39,7 +39,7 @@ func Usage(result rbacutils.SPolicyResult) map[string]int {
tagFilters := tagutils.STagFilters{}
tagFilters.AddFilters(result.ProjectTags)
orConditions := []sqlchemy.ICondition{}
metadataResSQ := db.Metadata.Query().SubQuery()
metadataResSQ := db.Metadata.Query().Equals("obj_type", "project").SubQuery()
for _, filter := range tagFilters.Filters {
for key, val := range filter {
orConditions = append(orConditions,
@@ -50,8 +50,10 @@ func Usage(result rbacutils.SPolicyResult) map[string]int {
)
}
}
metadataResSQ = metadataResSQ.Query().Filter(sqlchemy.OR(orConditions...)).SubQuery()
pq = pq.Join(metadataResSQ, sqlchemy.Equals(pq.Field("id"), metadataResSQ.Field("obj_id")))
metadataResQ := metadataResSQ.Query().AppendField(sqlchemy.COUNT("count", metadataResSQ.Field("obj_id")), metadataResSQ.Field("obj_id"), metadataResSQ.Field("key"), metadataResSQ.Field("value"))
metadataResSQ = metadataResQ.Filter(sqlchemy.OR(orConditions...)).GroupBy("obj_id").SubQuery()
metadataResSecSQ := metadataResSQ.Query().GE("count", len(orConditions)).SubQuery()
pq = pq.Join(metadataResSecSQ, sqlchemy.Equals(pq.Field("id"), metadataResSecSQ.Field("obj_id")))
}
projCnt, _ := pq.IsFalse("is_domain").CountWithError()