diff --git a/pom.xml b/pom.xml index 7124889..165b66e 100644 --- a/pom.xml +++ b/pom.xml @@ -93,12 +93,13 @@ - + eu.dnetlib diff --git a/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApi.java b/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApi.java index da37783..75f46e7 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApi.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApi.java @@ -1,7 +1,10 @@ package eu.dnetlib.repo.manager.service.controllers; +import eu.dnetlib.api.functionality.ValidatorServiceException; import eu.dnetlib.domain.functionality.validator.JobForValidation; import eu.dnetlib.domain.functionality.validator.RuleSet; +import eu.dnetlib.domain.functionality.validator.StoredJob; +import eu.dnetlib.repo.manager.shared.ValidationServiceException; import io.swagger.annotations.Api; import org.json.JSONException; import org.springframework.http.MediaType; @@ -39,4 +42,14 @@ public interface ValidatorApi { @ResponseBody RuleSet getRuleSet(String acronym); + @RequestMapping(value = "/getStoredJobsNew" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + List getStoredJobsNew(String user, String jobType, Integer offset, Integer limit, String dateFrom, + String dateTo, String validationStatus) throws ValidatorServiceException; + + + @RequestMapping(value = "/getStoredJobsTotalNumberNew" , method = RequestMethod.GET,produces = MediaType.APPLICATION_JSON_VALUE) + @ResponseBody + int getStoredJobsTotalNumberNew(String user, String jobType, String validationStatus) throws ValidatorServiceException; + } diff --git a/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApiImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApiImpl.java index 5556d03..04887b2 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApiImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/controllers/ValidatorApiImpl.java @@ -164,4 +164,16 @@ public class ValidatorApiImpl implements ValidatorApi{ } } + @Override + public List getStoredJobsNew(String user, String jobType, Integer offset, Integer limit, String dateFrom, + String dateTo, String validationStatus) throws ValidatorServiceException { + return getValidationService().getStoredJobsNew(user, jobType, offset, limit, dateFrom, dateTo, validationStatus); + } + + @Override + public int getStoredJobsTotalNumberNew(String user, String jobType, String validationStatus) throws ValidatorServiceException { + return getValidationService().getStoredJobsTotalNumberNew(user, jobType, validationStatus); + } + + }