From 730db6655da2593fc9d76b9aa084924b82a71eb3 Mon Sep 17 00:00:00 2001 From: annabakouli Date: Wed, 17 Jan 2018 14:20:48 +0200 Subject: [PATCH] no message --- .../java/eu/eudat/controllers/ExternalDatasets.java | 2 +- .../java/eu/eudat/dao/entities/DatasetDaoImpl.java | 13 +++++-------- .../eu/eudat/managers/ExternalDatasetManager.java | 9 --------- .../eu/eudat/models/criteria/DatasetCriteria.java | 11 +++++++++++ 4 files changed, 17 insertions(+), 18 deletions(-) diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java index 1f2e273e7..1d05a0076 100644 --- a/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java +++ b/dmp-backend/src/main/java/eu/eudat/controllers/ExternalDatasets.java @@ -45,7 +45,7 @@ public class ExternalDatasets extends BaseController{ } } - @RequestMapping(method = RequestMethod.POST, value = {"/externaldatasets/getWithExternal"}, consumes = "application/json", produces = "application/json") + @RequestMapping(method = RequestMethod.POST, value = {"/external/datasets"}, consumes = "application/json", produces = "application/json") public @ResponseBody ResponseItem> getWithExternal(@RequestBody ExternalDatasetCriteria externalDatasetCriteria, Principal principal) { try { List dataTable = new ExternalDatasetManager().getWithExternal(this.getApiContext().getDatabaseRepository().getExternalDatasetDao(), externalDatasetCriteria, this.getApiContext().getRemoteFetcher()); diff --git a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java index df8a0f946..386ad835c 100644 --- a/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java +++ b/dmp-backend/src/main/java/eu/eudat/dao/entities/DatasetDaoImpl.java @@ -33,14 +33,11 @@ public class DatasetDaoImpl implements DatasetDao { @Override public QueryableList getWithCriteria(DatasetCriteria criteria) { QueryableList query = databaseService.getQueryable(Dataset.class, Dataset.getHints()); - if (criteria.getLike() != null && !criteria.getLike().isEmpty()) - query.where((builder, root) -> builder.like(root.get("label"), "%" + criteria.getLike() + "%")); - if (criteria.getStatus() != null) - query.where((builder, root) -> builder.equal(root.get("status"), criteria.getStatus())); - if (criteria.getPeriodEnd() != null) - query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd())); - if (criteria.getPeriodStart() != null) - query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart())); + if (criteria.getLike() != null && !criteria.getLike().isEmpty())query.where((builder, root) -> builder.like(root.get("label"), "%" + criteria.getLike() + "%")); + if (criteria.getStatus() != null)query.where((builder, root) -> builder.equal(root.get("status"), criteria.getStatus())); + if (criteria.getPeriodEnd() != null)query.where((builder, root) -> builder.lessThan(root.get("created"), criteria.getPeriodEnd())); + if (criteria.getPeriodStart() != null) query.where((builder, root) -> builder.greaterThan(root.get("created"), criteria.getPeriodStart())); + if (criteria.getDmpIds() != null && !criteria.getDmpIds().isEmpty()) query.where((builder, root) -> root.get("dmp.id").in( criteria.getDmpIds())); return query; } diff --git a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java b/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java index 536696ba1..4f06600d3 100644 --- a/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java +++ b/dmp-backend/src/main/java/eu/eudat/managers/ExternalDatasetManager.java @@ -38,15 +38,6 @@ public class ExternalDatasetManager { public List getWithExternal(ExternalDatasetDao externalDatasetDao , ExternalDatasetCriteria criteria, RemoteFetcher remoteFetcher) throws HugeResultSet, NoURLFound, InstantiationException, IllegalAccessException { QueryableList items = externalDatasetDao.getWithCriteria(criteria); List externalDatasets = new DomainModelConverter().fromDataModel(items.toList(), ExternalDatasetListingModel.class); - List> remoteRepos = remoteFetcher.getDatasets(criteria.getLike()); - ExternalDatasetModel externalSourcesItemModels = new ExternalDatasetModel().fromExternalItem(remoteRepos); - for (ExternalSourcesItemModel externalListingItem : externalSourcesItemModels) { - ExternalDatasetListingModel externalDatasetListingModel = new ExternalDatasetListingModel(); - externalDatasetListingModel.setReference(externalListingItem.getRemoteId()); - externalDatasetListingModel.setLabel(externalListingItem.getName()); - externalDatasetListingModel.setAbbreviation(externalListingItem.getAbbreviation()); - externalDatasets.add(externalDatasetListingModel); - } return externalDatasets; } diff --git a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java index ab5c97959..06ae71f79 100644 --- a/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java +++ b/dmp-backend/src/main/java/eu/eudat/models/criteria/DatasetCriteria.java @@ -3,6 +3,8 @@ package eu.eudat.models.criteria; import eu.eudat.entities.Dataset; import java.util.Date; +import java.util.List; +import java.util.UUID; /** * Created by ikalyvas on 12/15/2017. @@ -11,6 +13,7 @@ public class DatasetCriteria extends Criteria{ private Integer status; private Date periodStart; private Date periodEnd; + private List dmpIds; public Integer getStatus() { return status; @@ -35,4 +38,12 @@ public class DatasetCriteria extends Criteria{ public void setPeriodEnd(Date periodEnd) { this.periodEnd = periodEnd; } + + public List getDmpIds() { + return dmpIds; + } + + public void setDmpIds(List dmpIds) { + this.dmpIds = dmpIds; + } }