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

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Sofia Papacharalampous 2024-05-16 15:35:30 +03:00
parent 2a126cd40f 6fe78b4059
commit 105d86cd98
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,7 +343,7 @@ public class DmpServiceImpl implements DmpService {
.groupIds(data.getGroupId());
dmpQuery.setOrder(new Ordering().addDescending(Dmp._version));
previousDmp = dmpQuery.collect().get(0);
previousDmp = dmpQuery.count() > 0 ? dmpQuery.collect().get(0) : null;
if (previousDmp != null){
if (previousDmp.getStatus().equals(DmpStatus.Finalized)) previousDmp.setVersionStatus(DmpVersionStatus.Current);
else previousDmp.setVersionStatus(DmpVersionStatus.NotFinalized);
@ -1101,7 +1101,7 @@ public class DmpServiceImpl implements DmpService {
.groupIds(dmp.getGroupId());
dmpQuery.setOrder(new Ordering().addDescending(Dmp._version));
DmpEntity previousDmp = dmpQuery.collect().get(0);
DmpEntity previousDmp = dmpQuery.count() > 0 ? dmpQuery.collect().get(0) : null;
if (previousDmp != null){
if (previousDmp.getStatus().equals(DmpStatus.Finalized)) previousDmp.setVersionStatus(DmpVersionStatus.Current);
else previousDmp.setVersionStatus(DmpVersionStatus.NotFinalized);