Skip to content

Commit 2ab91c1

Browse files
authored
Fix for source type be (#3259)
* git material source type editable * after handling linked-ci * after reverting changes for version.gp * after changing cimaterial access in ciHandler * after changing cimaterial access in ciHandler * after changing cimaterial access in ciHandler * after fixing in build and deploy * after removing commented code * "fix in source type" * "removed commented code" * "using new update function" * "changing update function" * adding not null function
1 parent 369188e commit 2ab91c1

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

internal/sql/repository/pipelineConfig/CiPipelineMaterial.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ type CiPipelineMaterial struct {
4747
type CiPipelineMaterialRepository interface {
4848
Save(tx *pg.Tx, pipeline ...*CiPipelineMaterial) error
4949
Update(tx *pg.Tx, material ...*CiPipelineMaterial) error
50+
UpdateNotNull(tx *pg.Tx, material ...*CiPipelineMaterial) error
5051
FindByCiPipelineIdsIn(ids []int) ([]*CiPipelineMaterial, error)
5152
GetById(id int) (*CiPipelineMaterial, error)
5253
GetByPipelineId(id int) ([]*CiPipelineMaterial, error)
@@ -113,6 +114,13 @@ func (impl CiPipelineMaterialRepositoryImpl) Save(tx *pg.Tx, material ...*CiPipe
113114
}
114115

115116
func (impl CiPipelineMaterialRepositoryImpl) Update(tx *pg.Tx, materials ...*CiPipelineMaterial) error {
117+
_, err := tx.Model(&materials).Update()
118+
if err != nil {
119+
return err
120+
}
121+
return nil
122+
}
123+
func (impl CiPipelineMaterialRepositoryImpl) UpdateNotNull(tx *pg.Tx, materials ...*CiPipelineMaterial) error {
116124
/*err := tx.RunInTransaction(func(tx *pg.Tx) error {
117125
for _, material := range materials {
118126
r, err := tx.Model(material).WherePK().UpdateNotNull()
@@ -133,7 +141,6 @@ func (impl CiPipelineMaterialRepositoryImpl) Update(tx *pg.Tx, materials ...*CiP
133141

134142
return nil
135143
}
136-
137144
func (impl CiPipelineMaterialRepositoryImpl) GetRegexByPipelineId(id int) ([]*CiPipelineMaterial, error) {
138145
var ciPipelineMaterials []*CiPipelineMaterial
139146
err := impl.dbConnection.Model(&ciPipelineMaterials).

pkg/pipeline/CiCdPipelineOrchestrator.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,10 @@ func (impl CiCdPipelineOrchestratorImpl) PatchMaterialValue(createRequest *bean.
250250
} else {
251251
pipelineMaterial.CiPipelineId = createRequest.Id
252252
pipelineMaterial.CreatedBy = userId
253-
materialsUpdate = append(materialsUpdate, pipelineMaterial)
254253
pipelineMaterial.CreatedOn = createOnTimeMap[material.GitMaterialId]
255-
pipelineMaterial.CreatedBy = createByMap[material.GitMaterialId]
254+
pipelineMaterial.UpdatedOn = time.Now()
255+
pipelineMaterial.UpdatedBy = userId
256+
materialsUpdate = append(materialsUpdate, pipelineMaterial)
256257
}
257258
}
258259
if len(materialsAdd) > 0 {
@@ -453,13 +454,8 @@ func (impl CiCdPipelineOrchestratorImpl) DeleteCiPipeline(pipeline *pipelineConf
453454
if err != nil {
454455
return err
455456
}
456-
pipelineMaterial := &pipelineConfig.CiPipelineMaterial{
457-
Id: material.Id,
458-
Active: false,
459-
Type: materialDbObject.Type,
460-
AuditLog: sql.AuditLog{UpdatedBy: userId, UpdatedOn: time.Now()},
461-
}
462-
materials = append(materials, pipelineMaterial)
457+
materialDbObject.Active = false
458+
materials = append(materials, materialDbObject)
463459
}
464460

465461
if request.CiPipeline.ExternalCiConfig.Id != 0 {

0 commit comments

Comments
 (0)