diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java index 05a68c27d..0bbcc235f 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/FunderBuilder.java @@ -16,6 +16,7 @@ public class FunderBuilder extends Builder { private Date created; private Date modified; private Integer type; + private String source; public FunderBuilder id(UUID id) { this.id = id; @@ -57,6 +58,11 @@ public class FunderBuilder extends Builder { return this; } + public FunderBuilder source(String source) { + this.source = source; + return this; + } + @Override public Funder build() { Funder funder = new Funder(); @@ -68,6 +74,7 @@ public class FunderBuilder extends Builder { funder.setCreated(created); funder.setModified(modified); funder.setType(type); + funder.setSource(source); return funder; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java index 83d50731d..d0741d631 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/builders/model/models/ProjectBuilder.java @@ -27,6 +27,7 @@ public class ProjectBuilder extends Builder { private Date created; private Date modified; private String description; + private String source; public ProjectBuilder id(UUID id) { this.id = id; @@ -103,6 +104,11 @@ public class ProjectBuilder extends Builder { return this; } + public ProjectBuilder source(String source) { + this.source = source; + return this; + } + @Override public Project build() { Project project = new Project(); @@ -120,6 +126,7 @@ public class ProjectBuilder extends Builder { project.setReference(reference); project.setCreationUser(creationUser); project.setStartDate(startDate); + project.setSource(source); return project; } } diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java index fde3f1b11..1f2d732ca 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/FunderManager.java @@ -41,6 +41,7 @@ public class FunderManager { eu.eudat.models.data.funder.Funder funder = apiContext.getOperationsContext().getBuilderFactory().getBuilder(FunderBuilder.class) .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) .status(eu.eudat.data.entities.Funder.Status.fromInteger(0)) + .source(externalListingItem.getSource()) .build(); funders.add(funder); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java index 5e9b99a03..9d16adfff 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/managers/ProjectManager.java @@ -42,6 +42,7 @@ public class ProjectManager { .reference(externalListingItem.getRemoteId()).label(externalListingItem.getName()) .description(externalListingItem.getDescription()).uri(externalListingItem.getUri()) .abbreviation(externalListingItem.getAbbreviation()).status(eu.eudat.data.entities.Project.Status.fromInteger(0)) + .source(externalListingItem.getSource()) .build(); projects.add(project); diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java index fcf082da6..3ceb97016 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/external/FundersExternalSourcesModel.java @@ -13,6 +13,7 @@ public class FundersExternalSourcesModel extends ExternalListingItem private Date created; private Date modified; private Integer type; + private String source; public UUID getId() { return id; @@ -72,6 +73,13 @@ public class Funder implements DataModel this.type = type; } + public String getSource() { + return source; + } + public void setSource(String source) { + this.source = source; + } + @Override public Funder fromDataModel(eu.eudat.data.entities.Funder entity) { this.id = entity.getId(); @@ -82,6 +90,7 @@ public class Funder implements DataModel this.status = entity.getStatus(); this.created = entity.getCreated(); this.modified = entity.getModified(); + this.source = "Internal"; return this; } diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java index 5d61d0232..098f27875 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/Project.java @@ -28,6 +28,7 @@ public class Project implements DataModel files; + private String source; public UUID getId() { return id; @@ -141,6 +142,13 @@ public class Project implements DataModel'name' 'uri' 'description' + 'source' $['meta']['pagination']['page','pages','count'] diff --git a/dmp-backend/web/src/main/resources/ProjectConfiguration.xml b/dmp-backend/web/src/main/resources/ProjectConfiguration.xml index f52b78ba1..3657195f7 100644 --- a/dmp-backend/web/src/main/resources/ProjectConfiguration.xml +++ b/dmp-backend/web/src/main/resources/ProjectConfiguration.xml @@ -51,6 +51,7 @@ 'name' 'uri' 'description' + 'source' $['meta']['pagination']['page','pages','count']