feat：新建/编辑流水线时支持调试流水线 #8164 修复构建历史区分源材料分支和触发分支搜索

1. 构建历史支持源材料和触发材料搜索 2. 触发分支和源材料分支支持下来搜索使用服务内存搜索代替mysql搜索
TencentBlueKing · Aug 5, 2024 · a41f1d0 · a41f1d0
1 parent 628202e
commit a41f1d0
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/...-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt b/...-base/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineRuntimeService.kt
@@ -518,8 +518,20 @@ class PipelineRuntimeService @Autowired constructor(
                     debugVersion = debugVersion,
                     type = type
                 )
-                history.filter { it.webhookInfo != null && !it.webhookInfo!!.webhookBranch.isNullOrBlank() }
-                    .map { it.webhookInfo!!.webhookBranch!! }.distinct()
+                val webhookInfoList = history.filter { it.webhookInfo != null }.map { it.webhookInfo!! }
+                val aliasNames = if (!aliasList.isNullOrEmpty() && aliasList.first().isNotBlank()) {
+                    aliasList
+                } else {
+                    webhookInfoList.map { it.webhookAliasName }
+                }
+                val result = mutableListOf<String>()
+                aliasNames.distinct().forEach { alias ->
+                    val branchNames = webhookInfoList.filter {
+                        it.webhookAliasName == alias && !it.webhookBranch.isNullOrBlank()
+                    }.map { it.webhookBranch!! }.distinct()
+                    result.addAll(branchNames)
+                }
+                result.distinct()
             }
             else -> emptyList()
         }