diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java index 015c76af3..8f72a044d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java @@ -16,6 +16,7 @@ public abstract class RecentActivityModel { private Date finalizedAt; private Date publishedAt; private String profile; + private RecentActivityType type; public String getId() { return id; @@ -121,5 +122,39 @@ public abstract class RecentActivityModel { this.profile = profile; } + public RecentActivityType getType() { + return type; + } + + public void setType(RecentActivityType type) { + this.type = type; + } + public abstract RecentActivityModel fromEntity(T entity); + + public enum RecentActivityType { + DMP(1), DATASET(2); + + private final int index; + + RecentActivityType(int index) { + this.index = index; + } + + public int getIndex() { + return index; + } + + public static RecentActivityType fromIndex(int index) { + switch (index) { + case 1: + return DMP; + case 2: + return DATASET; + default: + throw new IllegalArgumentException("Recent Activity Type : \"" + index + "\" is not supported."); + } + + } + } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java index 58156453c..c1eddfd42 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDatasetModel.java @@ -4,7 +4,6 @@ import eu.eudat.data.entities.Dataset; import eu.eudat.logic.utilities.helpers.LabelBuilder; import eu.eudat.models.data.dataset.DataRepository; import eu.eudat.models.data.dataset.Service; -import eu.eudat.models.data.listingmodels.DatasetListingModel; import java.util.Date; import java.util.stream.Collectors; @@ -80,6 +79,7 @@ public class RecentDatasetModel extends RecentActivityModel { } public RecentDatasetModel fromDmpEntity(Dataset entity) { + this.setType(RecentActivityType.DATASET); this.setId(entity.getId().toString()); this.setTitle(entity.getLabel()); this.setDescription(entity.getDescription()); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java index 9c28bdec2..82b630cd9 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentDmpModel.java @@ -90,6 +90,7 @@ public class RecentDmpModel extends RecentActivityModel { @Override @Transactional public RecentActivityModel fromEntity(DMP entity) { + this.setType(RecentActivityType.DMP); this.setId(entity.getId().toString()); this.setTitle(entity.getLabel()); this.setDescription(entity.getDescription());