@@ -1283,11 +1283,6 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
1283
1283
if err != nil {
1284
1284
impl .logger .Errorw ("error in rollback Create material" , "err" , err )
1285
1285
}
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
- }
1291
1286
}
1292
1287
}()
1293
1288
existingMaterials , err := impl .materialRepository .FindByAppId (createMaterialRequest .AppId )
@@ -1326,6 +1321,11 @@ func (impl CiCdPipelineOrchestratorImpl) CreateMaterials(createMaterialRequest *
1326
1321
impl .logger .Errorw ("error in updating to sensor" , "err" , err )
1327
1322
return nil , err
1328
1323
}
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
+ }
1329
1329
impl .logger .Debugw ("all materials are " , "materials" , materials )
1330
1330
return createMaterialRequest , nil
1331
1331
}
@@ -1341,11 +1341,6 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
1341
1341
if err != nil {
1342
1342
impl .logger .Errorw ("error in rollback Update material" , "err" , err )
1343
1343
}
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
- }
1349
1344
}
1350
1345
}()
1351
1346
updatedMaterial , err := impl .updateMaterial (updateMaterialDTO , tx )
@@ -1359,6 +1354,11 @@ func (impl CiCdPipelineOrchestratorImpl) UpdateMaterial(updateMaterialDTO *bean.
1359
1354
impl .logger .Errorw ("error in updating to git-sensor" , "err" , err )
1360
1355
return nil , err
1361
1356
}
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
+ }
1362
1362
return updateMaterialDTO , nil
1363
1363
}
1364
1364
0 commit comments