feat:【流水线插件】支持历史大版本下的小版本更新 TencentBlueKing#1841

carlyin0801 · Sep 8, 2021 · 59bb42b · 59bb42b
1 parent e1aad31
commit 59bb42b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 1 deletion.
diff --git a/...ore/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserMarketAtomResource.kt b/...ore/api-store/src/main/kotlin/com/tencent/devops/store/api/atom/UserMarketAtomResource.kt
@@ -232,6 +232,18 @@ interface UserMarketAtomResource {
         atomCode: String
     ): Result<Boolean>
 
+    @ApiOperation("根据插件标识获取插件最新版本详情")
+    @GET
+    @Path("/atoms/{atomCode}/newest/detail")
+    fun getNewestAtomInfoByCode(
+        @ApiParam("userId", required = true)
+        @HeaderParam(AUTH_HEADER_USER_ID)
+        userId: String,
+        @ApiParam("atomCode", required = true)
+        @PathParam("atomCode")
+        atomCode: String
+    ): Result<AtomVersion?>
+
     @ApiOperation("查看插件的yml信息")
     @GET
     @Path("/atoms/{atomCode}/yml/detail")

diff --git a/...ore/src/main/kotlin/com/tencent/devops/store/resources/atom/UserMarketAtomResourceImpl.kt b/...ore/src/main/kotlin/com/tencent/devops/store/resources/atom/UserMarketAtomResourceImpl.kt
@@ -135,11 +135,18 @@ class UserMarketAtomResourceImpl @Autowired constructor(
         return marketAtomService.deleteAtom(userId, atomCode)
     }
 
+    override fun getNewestAtomInfoByCode(userId: String, atomCode: String): Result<AtomVersion?> {
+        TODO("Not yet implemented")
+    }
+
     override fun getAtomYmlInfo(userId: String, atomCode: String, defaultShowFlag: Boolean?): Result<String?> {
         return Result(marketAtomService.generateCiYaml(atomCode = atomCode, defaultShowFlag = defaultShowFlag ?: false))
     }
 
     override fun getAtomYmlV2Info(userId: String, atomCode: String, defaultShowFlag: Boolean?): Result<String?> {
-        return Result(marketAtomService.generateCiV2Yaml(atomCode = atomCode, defaultShowFlag = defaultShowFlag ?: false))
+        return Result(marketAtomService.generateCiV2Yaml(
+            atomCode = atomCode,
+            defaultShowFlag = defaultShowFlag ?: false)
+        )
     }
 }
diff --git a/...tore/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/MarketAtomService.kt b/...tore/biz-store/src/main/kotlin/com/tencent/devops/store/service/atom/MarketAtomService.kt
@@ -165,4 +165,9 @@ interface MarketAtomService {
      * 查找带post属性的插件
      */
     fun getPostAtoms(projectCode: String, atomItems: Set<AtomPostReqItem>): Result<AtomPostResp>
+
+    /**
+     * 根据插件标识获取插件最新版本详情
+     */
+    fun getNewestAtomInfoByCode(userId: String, atomCode: String): Result<AtomVersion?>
 }
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
@@ -568,6 +568,18 @@ abstract class MarketAtomServiceImpl @Autowired constructor() : MarketAtomServic
         return getAtomVersion(atomId, userId)
     }
 
+    /**
+     * 根据插件标识获取插件最新版本详情
+     */
+    override fun getNewestAtomInfoByCode(userId: String, atomCode: String): Result<AtomVersion?> {
+        val record = marketAtomDao.getNewestAtomByCode(dslContext, atomCode)
+        return (if (null == record) {
+            Result(data = null)
+        } else {
+            getAtomVersion(record.id, userId)
+        })
+    }
+
     @Suppress("UNCHECKED_CAST")
     private fun getAtomVersion(atomId: String, userId: String): Result<AtomVersion?> {
         val record = marketAtomDao.getAtomById(dslContext, atomId)