【PAC】feat：支持从代码库维度查看对应的代码库事件 #8122

TencentBlueKing · Oct 27, 2023 · 1dad974 · 1dad974
1 parent 403de73
commit 1dad974
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/...cess/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineWebhookDao.kt b/...cess/biz-base/src/main/kotlin/com/tencent/devops/process/engine/dao/PipelineWebhookDao.kt
@@ -198,24 +198,6 @@ class PipelineWebhookDao {
         }
     }
 
-    fun listWebhookPipeline(
-        dslContext: DSLContext,
-        projectId: String,
-        pipelineId: String,
-        repositoryType: String,
-        eventType: String
-    ): List<PipelineWebhook> {
-        with(T_PIPELINE_WEBHOOK) {
-            return dslContext.selectFrom(this)
-                .where(PROJECT_ID.eq(projectId))
-                .and(PIPELINE_ID.eq(pipelineId))
-                .and(REPOSITORY_TYPE.eq(repositoryType))
-                .and(EVENT_TYPE.eq(eventType))
-                .and(DELETE.eq(false))
-                .fetch().map { convert(it) }
-        }
-    }
-
     fun listWebhookPipeline(
         dslContext: DSLContext,
         projectName: String,

diff --git a/...ocess/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineWebhookService.kt b/...ocess/src/main/kotlin/com/tencent/devops/process/engine/service/PipelineWebhookService.kt
@@ -732,7 +732,10 @@ class PipelineWebhookService @Autowired constructor(
                         if (webhook.taskId.isNullOrBlank()) return@webhook
                         val element = elementMap[webhook.taskId] ?: return@webhook
                         val webhookElementParams = getElementRepositoryConfig(element, variable = params)
-                            ?: return@webhook
+                            ?: run{
+                                logger.info("webhook not find match element|${webhook.id}")
+                                return@webhook
+                            }
                         val elementRepositoryConfig = webhookElementParams.repositoryConfig
                         val webhookRepositoryConfig = getRepositoryConfig(webhook, params)
                         // 插件的配置与表中数据不一致,如保存流水线时,注册webhook失败,就会导致数据不一致，不更新