diff --git a/internal/sql/repository/pipelineConfig/CiPipelineMaterial.go b/internal/sql/repository/pipelineConfig/CiPipelineMaterial.go index e6e882129f..30ebf7f54d 100644 --- a/internal/sql/repository/pipelineConfig/CiPipelineMaterial.go +++ b/internal/sql/repository/pipelineConfig/CiPipelineMaterial.go @@ -47,6 +47,7 @@ type CiPipelineMaterial struct { type CiPipelineMaterialRepository interface { Save(tx *pg.Tx, pipeline ...*CiPipelineMaterial) error Update(tx *pg.Tx, material ...*CiPipelineMaterial) error + UpdateNotNull(tx *pg.Tx, material ...*CiPipelineMaterial) error FindByCiPipelineIdsIn(ids []int) ([]*CiPipelineMaterial, error) GetById(id int) (*CiPipelineMaterial, error) GetByPipelineId(id int) ([]*CiPipelineMaterial, error) @@ -113,6 +114,13 @@ func (impl CiPipelineMaterialRepositoryImpl) Save(tx *pg.Tx, material ...*CiPipe } func (impl CiPipelineMaterialRepositoryImpl) Update(tx *pg.Tx, materials ...*CiPipelineMaterial) error { + _, err := tx.Model(&materials).Update() + if err != nil { + return err + } + return nil +} +func (impl CiPipelineMaterialRepositoryImpl) UpdateNotNull(tx *pg.Tx, materials ...*CiPipelineMaterial) error { /*err := tx.RunInTransaction(func(tx *pg.Tx) error { for _, material := range materials { r, err := tx.Model(material).WherePK().UpdateNotNull() @@ -133,7 +141,6 @@ func (impl CiPipelineMaterialRepositoryImpl) Update(tx *pg.Tx, materials ...*CiP return nil } - func (impl CiPipelineMaterialRepositoryImpl) GetRegexByPipelineId(id int) ([]*CiPipelineMaterial, error) { var ciPipelineMaterials []*CiPipelineMaterial err := impl.dbConnection.Model(&ciPipelineMaterials). diff --git a/pkg/pipeline/CiCdPipelineOrchestrator.go b/pkg/pipeline/CiCdPipelineOrchestrator.go index 853ccc369e..be2ac06ae5 100644 --- a/pkg/pipeline/CiCdPipelineOrchestrator.go +++ b/pkg/pipeline/CiCdPipelineOrchestrator.go @@ -250,9 +250,10 @@ func (impl CiCdPipelineOrchestratorImpl) PatchMaterialValue(createRequest *bean. } else { pipelineMaterial.CiPipelineId = createRequest.Id pipelineMaterial.CreatedBy = userId - materialsUpdate = append(materialsUpdate, pipelineMaterial) pipelineMaterial.CreatedOn = createOnTimeMap[material.GitMaterialId] - pipelineMaterial.CreatedBy = createByMap[material.GitMaterialId] + pipelineMaterial.UpdatedOn = time.Now() + pipelineMaterial.UpdatedBy = userId + materialsUpdate = append(materialsUpdate, pipelineMaterial) } } if len(materialsAdd) > 0 { @@ -453,13 +454,8 @@ func (impl CiCdPipelineOrchestratorImpl) DeleteCiPipeline(pipeline *pipelineConf if err != nil { return err } - pipelineMaterial := &pipelineConfig.CiPipelineMaterial{ - Id: material.Id, - Active: false, - Type: materialDbObject.Type, - AuditLog: sql.AuditLog{UpdatedBy: userId, UpdatedOn: time.Now()}, - } - materials = append(materials, pipelineMaterial) + materialDbObject.Active = false + materials = append(materials, materialDbObject) } if request.CiPipeline.ExternalCiConfig.Id != 0 {