feat: 节点删除接口返回的数据排除目录 TencentBlueKing#1942

* feat: 节点删除接口返回的数据排除目录 TencentBlueKing#1942 * feat: 节点删除接口返回的数据排除目录 TencentBlueKing#1942
yaoxuwan · Mar 28, 2024 · 30c49e9 · 30c49e9
1 parent 1eb163c
commit 30c49e9
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...tory/src/main/kotlin/com/tencent/bkrepo/repository/service/node/impl/NodeDeleteSupport.kt b/...tory/src/main/kotlin/com/tencent/bkrepo/repository/service/node/impl/NodeDeleteSupport.kt
@@ -203,7 +203,13 @@ open class NodeDeleteSupport(
             if (deletedNum == 0L) {
                 return NodeDeleteResult(deletedNum, deletedSize, deleteTime)
             }
-            deletedSize = nodeBaseService.aggregateComputeSize(criteria.and(TNode::deleted).isEqualTo(deleteTime))
+            var deletedCriteria = criteria.and(TNode::deleted).isEqualTo(deleteTime)
+            fullPaths?.let {
+                // 节点删除接口返回的数据排除目录
+                deletedCriteria = deletedCriteria.and(TNode::folder).isEqualTo(false)
+                deletedNum = nodeDao.count(Query(deletedCriteria))
+            }
+            deletedSize = nodeBaseService.aggregateComputeSize(deletedCriteria)
             quotaService.decreaseUsedVolume(projectId, repoName, deletedSize)
             fullPaths?.forEach {
                 if (routerControllerProperties.enabled) {