feat: 节点清理节点支持指定清理指定目录 #1405 (#1408)

* feat: 节点清理节点支持指定清理指定目录 #1405 * feat: 代码格式调整 #1405
TencentBlueKing · Nov 9, 2023 · d9833dc · d9833dc
1 parent 57da2f6
commit d9833dc
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git a/...itory/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserNodeController.kt b/...itory/src/main/kotlin/com/tencent/bkrepo/repository/controller/user/UserNodeController.kt
@@ -190,7 +190,10 @@ class UserNodeController(
         @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) date: LocalDateTime
     ): Response<NodeDeleteResult> {
         return ResponseBuilder.success(
-            nodeService.deleteBeforeDate(artifactInfo.projectId, artifactInfo.repoName, date, userId)
+            nodeService.deleteBeforeDate(
+                artifactInfo.projectId, artifactInfo.repoName,
+                date, userId, artifactInfo.getArtifactFullPath()
+            )
         )
     }
 

diff --git a/...ository/src/main/kotlin/com/tencent/bkrepo/repository/service/node/NodeDeleteOperation.kt b/...ository/src/main/kotlin/com/tencent/bkrepo/repository/service/node/NodeDeleteOperation.kt
@@ -69,5 +69,8 @@ interface NodeDeleteOperation {
     /**
      * 根据创建时间删除[date]之前的历史数据
      */
-    fun deleteBeforeDate(projectId: String, repoName: String, date: LocalDateTime, operator: String): NodeDeleteResult
+    fun deleteBeforeDate(
+        projectId: String, repoName: String,
+        date: LocalDateTime, operator: String, path: String
+    ): NodeDeleteResult
 }
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
@@ -156,10 +156,11 @@ open class NodeDeleteSupport(
         projectId: String,
         repoName: String,
         date: LocalDateTime,
-        operator: String
+        operator: String,
+        path: String
     ): NodeDeleteResult {
         val option = NodeListOption(includeFolder = false, deep = true)
-        val criteria = NodeQueryHelper.nodeListCriteria(projectId, repoName, PathUtils.ROOT, option)
+        val criteria = NodeQueryHelper.nodeListCriteria(projectId, repoName, path, option)
             .and(TNode::createdDate).lt(date)
         val query = Query(criteria)
         return delete(query, operator, criteria, projectId, repoName)

diff --git a/...sitory/src/main/kotlin/com/tencent/bkrepo/repository/service/node/impl/NodeServiceImpl.kt b/...sitory/src/main/kotlin/com/tencent/bkrepo/repository/service/node/impl/NodeServiceImpl.kt
@@ -125,9 +125,10 @@ class NodeServiceImpl(
         projectId: String,
         repoName: String,
         date: LocalDateTime,
-        operator: String
+        operator: String,
+        path: String
     ): NodeDeleteResult {
-        return NodeDeleteSupport(this).deleteBeforeDate(projectId, repoName, date, operator)
+        return NodeDeleteSupport(this).deleteBeforeDate(projectId, repoName, date, operator, path)
     }
 
     @Transactional(rollbackFor = [Throwable::class])

diff --git a/...m/tencent/bkrepo/repository/service/node/impl/center/CommitEdgeCenterNodeDeleteSupport.kt b/...m/tencent/bkrepo/repository/service/node/impl/center/CommitEdgeCenterNodeDeleteSupport.kt
@@ -99,12 +99,13 @@ class CommitEdgeCenterNodeDeleteSupport(
         projectId: String,
         repoName: String,
         date: LocalDateTime,
-        operator: String
+        operator: String,
+        path: String
     ): NodeDeleteResult {
         var deletedSize = 0L
         var deletedNum = 0L
         val option = NodeListOption(includeFolder = false, deep = true)
-        val criteria = NodeQueryHelper.nodeListCriteria(projectId, repoName, PathUtils.ROOT, option)
+        val criteria = NodeQueryHelper.nodeListCriteria(projectId, repoName, path, option)
             .and(TNode::createdDate).lt(date)
         val pageSize = 1
         var queryCount: Int

diff --git a/...com/tencent/bkrepo/repository/service/node/impl/center/CommitEdgeCenterNodeServiceImpl.kt b/...com/tencent/bkrepo/repository/service/node/impl/center/CommitEdgeCenterNodeServiceImpl.kt
@@ -208,13 +208,15 @@ class CommitEdgeCenterNodeServiceImpl(
         projectId: String,
         repoName: String,
         date: LocalDateTime,
-        operator: String
+        operator: String,
+        path: String
     ): NodeDeleteResult {
         return CommitEdgeCenterNodeDeleteSupport(this, clusterProperties).deleteBeforeDate(
             projectId,
             repoName,
             date,
-            operator
+            operator,
+            path
         )
     }
 

diff --git a/...c/main/kotlin/com/tencent/bkrepo/repository/service/node/impl/edge/EdgeNodeServiceImpl.kt b/...c/main/kotlin/com/tencent/bkrepo/repository/service/node/impl/edge/EdgeNodeServiceImpl.kt
@@ -135,9 +135,10 @@ class EdgeNodeServiceImpl(
         projectId: String,
         repoName: String,
         date: LocalDateTime,
-        operator: String
+        operator: String,
+        path: String
     ): NodeDeleteResult {
-        return NodeDeleteSupport(this).deleteBeforeDate(projectId, repoName, date, operator)
+        return NodeDeleteSupport(this).deleteBeforeDate(projectId, repoName, date, operator, path)
     }
 
     @Transactional(rollbackFor = [Throwable::class])