bug: 在工作台删除某个插件后，无法重复创建同名插件 TencentBlueKing#1334

carlyin0801 · Sep 1, 2020 · 0b4b46b · 0b4b46b
1 parent c76c587
commit 0b4b46b
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/...src/main/kotlin/com/tencent/devops/store/service/atom/impl/SampleMarketAtomServiceImpl.kt b/...src/main/kotlin/com/tencent/devops/store/service/atom/impl/SampleMarketAtomServiceImpl.kt
@@ -28,6 +28,7 @@ package com.tencent.devops.store.service.atom.impl
 
 import com.tencent.devops.common.api.pojo.Result
 import com.tencent.devops.repository.pojo.Repository
+import com.tencent.devops.repository.pojo.enums.TokenTypeEnum
 import com.tencent.devops.store.pojo.common.enums.StoreTypeEnum
 import com.tencent.devops.store.service.atom.SampleMarketAtomService
 import org.slf4j.LoggerFactory
@@ -63,7 +64,12 @@ class SampleMarketAtomServiceImpl : SampleMarketAtomService, MarketAtomServiceIm
         return Result(data = null)
     }
 
-    override fun deleteAtomRepository(userId: String, projectCode: String?, repositoryHashId: String): Result<Boolean> {
+    override fun deleteAtomRepository(
+        userId: String,
+        projectCode: String?,
+        repositoryHashId: String,
+        tokenType: TokenTypeEnum
+    ): Result<Boolean> {
         // 开源版暂不支持按代码库打成可执行包的方式
         return Result(true)
     }

diff --git a/...store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomServiceImpl.kt b/...store/src/main/kotlin/com/tencent/devops/store/service/atom/impl/MarketAtomServiceImpl.kt
@@ -41,6 +41,7 @@ import com.tencent.devops.common.service.utils.MessageCodeUtil
 import com.tencent.devops.model.store.tables.records.TAtomRecord
 import com.tencent.devops.project.api.service.ServiceProjectResource
 import com.tencent.devops.repository.pojo.Repository
+import com.tencent.devops.repository.pojo.enums.TokenTypeEnum
 import com.tencent.devops.repository.pojo.enums.VisibilityLevelEnum
 import com.tencent.devops.store.constant.StoreMessageCode
 import com.tencent.devops.store.dao.atom.AtomApproveRelDao
@@ -714,7 +715,12 @@ abstract class MarketAtomServiceImpl @Autowired constructor() : MarketAtomServic
         }
         // 删除代码库
         val atomRecord = marketAtomDao.getLatestAtomByCode(dslContext, atomCode)
-        val deleteAtomRepositoryResult = deleteAtomRepository(userId, initProjectCode, atomRecord!!.repositoryHashId)
+        val deleteAtomRepositoryResult = deleteAtomRepository(
+            userId = userId,
+            projectCode = initProjectCode,
+            repositoryHashId = atomRecord!!.repositoryHashId,
+            tokenType = TokenTypeEnum.PRIVATE_KEY
+        )
         if (deleteAtomRepositoryResult.isNotOk()) {
             return deleteAtomRepositoryResult
         }
@@ -851,5 +857,10 @@ abstract class MarketAtomServiceImpl @Autowired constructor() : MarketAtomServic
         return sb.toString()
     }
 
-    abstract fun deleteAtomRepository(userId: String, projectCode: String?, repositoryHashId: String): Result<Boolean>
+    abstract fun deleteAtomRepository(
+        userId: String,
+        projectCode: String?,
+        repositoryHashId: String,
+        tokenType: TokenTypeEnum
+    ): Result<Boolean>
 }