ci triggeredBy updates

Author: kartik-579

client/cron/CiTriggerCron.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"github.com/caarlos0/env"
 	repository2 "github.com/devtron-labs/devtron/internal/sql/repository"
+	bean2 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"github.com/devtron-labs/devtron/pkg/bean"
 	pipelineConfigBean "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
@@ -98,7 +99,7 @@ func (impl *CiTriggerCronImpl) TriggerCiCron() {
 		ciTriggerRequest := bean.CiTriggerRequest{
 			PipelineId:         ciPipelineId,
 			CiPipelineMaterial: ciPipelineMaterials,
-			TriggeredBy:        1,
+			TriggeredBy:        bean2.SYSTEM_USER_ID,
 			InvalidateCache:    false,
 			PipelineType:       string(pipelineConfigBean.CI_JOB),
 		}

internal/sql/repository/app/AppRepository.go

@@ -48,10 +48,6 @@ func (app *App) IsEmpty() bool {
 	return app.Id == 0
 }
 
-const (
-	SYSTEM_USER_ID = 1
-)
-
 func (app *App) IsAppJobOrExternalType() bool {
 	return len(app.DisplayName) > 0
 }

pkg/build/git/gitWebhook/GitWebhookService.go

@@ -20,6 +20,7 @@ import (
 	"github.com/devtron-labs/devtron/client/gitSensor"
 	"github.com/devtron-labs/devtron/internal/sql/constants"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig"
+	bean2 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"github.com/devtron-labs/devtron/pkg/bean"
 	"github.com/devtron-labs/devtron/pkg/build/git/gitWebhook/repository"
 	"github.com/devtron-labs/devtron/pkg/pipeline"
@@ -71,7 +72,7 @@ func (impl *GitWebhookServiceImpl) HandleGitWebhook(gitWebhookRequest gitSensor.
 
 	resp, err := impl.ciHandler.HandleCIWebhook(bean.GitCiTriggerRequest{
 		CiPipelineMaterial:        ciPipelineMaterial,
-		TriggeredBy:               1, // Automatic trigger, userId is 1
+		TriggeredBy:               bean2.SYSTEM_USER_ID, // Automatic trigger, system user
 		ExtraEnvironmentVariables: gitWebhookRequest.ExtraEnvironmentVariables,
 	})
 	if err != nil {

pkg/pipeline/CiHandler.go

@@ -25,6 +25,7 @@ import (
 	"github.com/devtron-labs/common-lib/utils/workFlow"
 	"github.com/devtron-labs/devtron/internal/sql/constants"
 	"github.com/devtron-labs/devtron/internal/sql/repository/pipelineConfig/bean/workflow/cdWorkflow"
+	bean6 "github.com/devtron-labs/devtron/pkg/auth/user/bean"
 	"github.com/devtron-labs/devtron/pkg/bean/common"
 	"github.com/devtron-labs/devtron/pkg/build/artifacts/imageTagging"
 	bean4 "github.com/devtron-labs/devtron/pkg/build/pipeline/bean"
@@ -222,7 +223,7 @@ func (impl *CiHandlerImpl) reTriggerCi(retryCount int, refCiWorkflow *pipelineCo
 	}
 
 	trigger := types.Trigger{}
-	trigger.BuildTriggerObject(refCiWorkflow, ciMaterials, 1, true, nil, "")
+	trigger.BuildTriggerObject(refCiWorkflow, ciMaterials, bean6.SYSTEM_USER_ID, true, nil, "")
 	_, err = impl.ciService.TriggerCiPipeline(trigger)
 
 	if err != nil {