diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java new file mode 100644 index 000000000..75e16a118 --- /dev/null +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/funder/FunderOverviewModel.java @@ -0,0 +1,42 @@ +package eu.eudat.models.data.funder; + +import eu.eudat.data.entities.Funder; +import eu.eudat.models.DataModel; + +import java.util.UUID; + +public class FunderOverviewModel implements DataModel { + private UUID id; + private String label; + + public UUID getId() { + return id; + } + public void setId(UUID id) { + this.id = id; + } + + public String getLabel() { + return label; + } + public void setLabel(String label) { + this.label = label; + } + + @Override + public FunderOverviewModel fromDataModel(Funder entity) { + this.id = entity.getId(); + this.label = entity.getLabel(); + return this; + } + + @Override + public Funder toDataModel() throws Exception { + return null; + } + + @Override + public String getHint() { + return null; + } +} diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantOverviewModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantOverviewModel.java index c2434c782..95cbbbf10 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantOverviewModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/grant/GrantOverviewModel.java @@ -2,6 +2,7 @@ package eu.eudat.models.data.grant; import eu.eudat.data.entities.Grant; import eu.eudat.models.DataModel; +import eu.eudat.models.data.funder.FunderOverviewModel; import java.util.Date; import java.util.UUID; @@ -14,6 +15,7 @@ public class GrantOverviewModel implements DataModel private Date startDate; private Date endDate; private String uri; + private FunderOverviewModel funder; public UUID getId() { return id; @@ -64,6 +66,13 @@ public class GrantOverviewModel implements DataModel this.uri = uri; } + public FunderOverviewModel getFunder() { + return funder; + } + public void setFunder(FunderOverviewModel funder) { + this.funder = funder; + } + @Override public GrantOverviewModel fromDataModel(Grant entity) { this.id = entity.getId(); @@ -73,6 +82,9 @@ public class GrantOverviewModel implements DataModel this.startDate = entity.getStartdate(); this.endDate = entity.getEnddate(); this.uri = entity.getUri(); + this.funder = new FunderOverviewModel(); + if (entity.getFunder() != null) + this.funder.fromDataModel(entity.getFunder()); return this; }