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-14 14:32:50 +03:00
parent 7cb6651401 37a5c49cc8
commit ee611ed7e0
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -335,19 +335,19 @@ public class DmpServiceImpl implements DmpService {
EntityDoiQuery entityDoiQuery = this.queryFactory.query(EntityDoiQuery.class).disableTracking().authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermission).types(EntityType.DMP).entityIds(data.getId()); EntityDoiQuery entityDoiQuery = this.queryFactory.query(EntityDoiQuery.class).disableTracking().authorize(AuthorizationFlags.OwnerOrDmpAssociatedOrPermission).types(EntityType.DMP).entityIds(data.getId());
if (entityDoiQuery.count() > 0) throw new MyApplicationException("DMP is deposited can not deleted"); if (entityDoiQuery.count() > 0) throw new MyApplicationException("DMP is deposited can not deleted");
DmpEntity previousFinalized = null; DmpEntity previousDmp = null;
if (data.getVersionStatus().equals(DmpVersionStatus.Current)){ if (!data.getVersionStatus().equals(DmpVersionStatus.Previous)){
DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class) DmpQuery dmpQuery = this.queryFactory.query(DmpQuery.class)
.statuses(DmpStatus.Finalized)
.excludedIds(data.getId()) .excludedIds(data.getId())
.isActive(IsActive.Active) .isActive(IsActive.Active)
.groupIds(data.getGroupId()); .groupIds(data.getGroupId());
dmpQuery.setOrder(new Ordering().addDescending(Dmp._version)); dmpQuery.setOrder(new Ordering().addDescending(Dmp._version));
previousFinalized = dmpQuery.first(); previousDmp = dmpQuery.first();
if (previousFinalized != null){ if (previousDmp != null){
previousFinalized.setVersionStatus(DmpVersionStatus.Current); if (previousDmp.getStatus().equals(DmpStatus.Finalized)) previousDmp.setVersionStatus(DmpVersionStatus.Current);
this.entityManager.merge(previousFinalized); else previousDmp.setVersionStatus(DmpVersionStatus.NotFinalized);
this.entityManager.merge(previousDmp);
} }
data.setVersionStatus(DmpVersionStatus.NotFinalized); data.setVersionStatus(DmpVersionStatus.NotFinalized);
this.entityManager.merge(data); this.entityManager.merge(data);
@ -355,7 +355,7 @@ public class DmpServiceImpl implements DmpService {
} }
this.deleterFactory.deleter(DmpDeleter.class).deleteAndSaveByIds(List.of(id), false); this.deleterFactory.deleter(DmpDeleter.class).deleteAndSaveByIds(List.of(id), false);
if (previousFinalized != null) this.elasticService.persistDmp(previousFinalized); if (previousDmp != null) this.elasticService.persistDmp(previousDmp);
this.annotationEntityRemovalIntegrationEventHandler.handleDmp(data.getId()); this.annotationEntityRemovalIntegrationEventHandler.handleDmp(data.getId());
} }

2
dmp-frontend/src/app/ui/dmp/overview/dmp-overview.component.ts
View File

@ -409,7 +409,7 @@ export class DmpOverviewComponent extends BaseComponent implements OnInit {
} }
onUpdateCallbackError(error) { onUpdateCallbackError(error) {
this.uiNotificationService.snackBarNotification(error.error.message ? error.error.message : this.language.instant('DATASET-UPLOAD.SNACK-BAR.UNSUCCESSFUL'), SnackBarNotificationLevel.Error); this.uiNotificationService.snackBarNotification(error.error.error ? error.error.error : this.language.instant('DATASET-UPLOAD.SNACK-BAR.UNSUCCESSFUL'), SnackBarNotificationLevel.Error);
} }
downloadXml(id: string) { downloadXml(id: string) {