MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

fix dmp version flow

This commit is contained in:
amentis 2024-05-15 18:31:30 +03:00
parent 811a1dde01
commit 6bdc6d5c09
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/core/src/main/java/org/opencdmp/service/dmp/DmpServiceImpl.java
View File

@ -1061,10 +1061,10 @@ public class DmpServiceImpl implements DmpService {
dmp.setUpdatedAt(Instant.now()); dmp.setUpdatedAt(Instant.now());
dmp.setFinalizedAt(Instant.now()); dmp.setFinalizedAt(Instant.now());
this.entityManager.merge(dmp);
this.entityManager.flush();
this.updateVersionStatusAndSave(dmp, previousStatus, dmp.getStatus()); this.updateVersionStatusAndSave(dmp, previousStatus, dmp.getStatus());
dmp.setVersionStatus(DmpVersionStatus.Current);
this.entityManager.merge(dmp);
this.entityManager.flush(); this.entityManager.flush();
this.elasticService.persistDmp(dmp); this.elasticService.persistDmp(dmp);
@ -1086,13 +1086,11 @@ public class DmpServiceImpl implements DmpService {
dmp.setStatus(DmpStatus.Draft); dmp.setStatus(DmpStatus.Draft);
dmp.setUpdatedAt(Instant.now()); dmp.setUpdatedAt(Instant.now());
dmp.setVersionStatus(DmpVersionStatus.NotFinalized);
this.entityManager.merge(dmp); this.entityManager.merge(dmp);
this.entityManager.flush(); this.entityManager.flush();
this.updateVersionStatusAndSave(dmp, DmpStatus.Finalized, dmp.getStatus());
this.entityManager.flush();
this.annotationEntityTouchedIntegrationEventHandler.handleDmp(dmp.getId()); this.annotationEntityTouchedIntegrationEventHandler.handleDmp(dmp.getId());
this.sendNotification(dmp); this.sendNotification(dmp);
} }