Skip to content

Commit fdaf1c0

Browse files
code review comments incorporated
1 parent 1727c8f commit fdaf1c0

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

pkg/pipeline/CiCdPipelineOrchestrator.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,11 +1283,6 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
12831283
if err != nil {
12841284
impl.logger.Errorw("error in rollback Create material", "err", err)
12851285
}
1286-
} else {
1287-
err = impl.transactionManager.CommitTx(tx)
1288-
if err != nil {
1289-
impl.logger.Errorw("error in committing tx Create material", "err", err)
1290-
}
12911286
}
12921287
}()
12931288
existingMaterials, err := impl.materialRepository.FindByAppId(createMaterialRequest.AppId)
@@ -1326,6 +1321,11 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
13261321
impl.logger.Errorw("error in updating to sensor", "err", err)
13271322
return nil, err
13281323
}
1324+
err = impl.transactionManager.CommitTx(tx)
1325+
if err != nil {
1326+
impl.logger.Errorw("error in committing tx Create material", "err", err)
1327+
return nil, err
1328+
}
13291329
impl.logger.Debugw("all materials are ", "materials", materials)
13301330
return createMaterialRequest, nil
13311331
}
@@ -1341,11 +1341,6 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
13411341
if err != nil {
13421342
impl.logger.Errorw("error in rollback Update material", "err", err)
13431343
}
1344-
} else {
1345-
err = impl.transactionManager.CommitTx(tx)
1346-
if err != nil {
1347-
impl.logger.Errorw("error in committing tx Update material", "err", err)
1348-
}
13491344
}
13501345
}()
13511346
updatedMaterial, err := impl.updateMaterial(updateMaterialDTO, tx)
@@ -1359,6 +1354,11 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
13591354
impl.logger.Errorw("error in updating to git-sensor", "err", err)
13601355
return nil, err
13611356
}
1357+
err = impl.transactionManager.CommitTx(tx)
1358+
if err != nil {
1359+
impl.logger.Errorw("error in committing tx Update material", "err", err)
1360+
return nil, err
1361+
}
13621362
return updateMaterialDTO, nil
13631363
}
13641364

0 commit comments

Comments
 (0)