opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-19 10:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(keystone): fix usage empty projectTags

Browse Source
This commit is contained in:
马鸿飞
2023-11-09 15:31:07 +08:00
parent 0d66ffcaf6
commit 6412887fce
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/keystone/models/usages.go
+17 -14
View File
@@ -35,22 +35,25 @@ func Usage(result rbacutils.SPolicyResult) map[string]int {
pq = db.ObjectIdQueryWithPolicyResult(pq, ProjectManager, result)
// 根据项目标签过滤
tagFilters := tagutils.STagFilters{}
tagFilters.AddFilters(result.ProjectTags)
orConditions := []sqlchemy.ICondition{}
metadataResSQ := db.Metadata.Query().SubQuery()
for _, filter := range tagFilters.Filters {
for key, val := range filter {
orConditions = append(orConditions,
sqlchemy.AND(
sqlchemy.Equals(metadataResSQ.Field("key"), key),
sqlchemy.In(metadataResSQ.Field("value"), val),
),
)
if result.ProjectTags.Len() > 0 {
tagFilters := tagutils.STagFilters{}
tagFilters.AddFilters(result.ProjectTags)
orConditions := []sqlchemy.ICondition{}
metadataResSQ := db.Metadata.Query().SubQuery()
for _, filter := range tagFilters.Filters {
for key, val := range filter {
orConditions = append(orConditions,
sqlchemy.AND(
sqlchemy.Equals(metadataResSQ.Field("key"), key),
sqlchemy.In(metadataResSQ.Field("value"), val),
),
)
}
}
metadataResSQ = metadataResSQ.Query().Filter(sqlchemy.OR(orConditions...)).SubQuery()
pq = pq.Join(metadataResSQ, sqlchemy.Equals(pq.Field("id"), metadataResSQ.Field("obj_id")))
}
metadataResSQ = metadataResSQ.Query().Filter(sqlchemy.OR(orConditions...)).SubQuery()
pq = pq.Join(metadataResSQ, sqlchemy.Equals(pq.Field("id"), metadataResSQ.Field("obj_id")))
projCnt, _ := pq.IsFalse("is_domain").CountWithError()
results["projects"] = projCnt