diff --git a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java index 89ed51b39..6ab11d11b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java +++ b/dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java @@ -12,6 +12,7 @@ import eu.eudat.models.data.external.TagExternalSourcesModel; import eu.eudat.models.data.helpers.responses.ResponseItem; import eu.eudat.types.ApiMessageCode; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.env.Environment; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; @@ -33,11 +34,13 @@ import java.util.Map; public class TagController extends BaseController { private Repository datasetRepository; + private Environment environment; @Autowired - public TagController(ApiContext apiContext, Repository tagRepository) { + public TagController(ApiContext apiContext, Repository tagRepository, Environment environment) { super(apiContext); this.datasetRepository = tagRepository; + this.environment = environment; } @RequestMapping(method = RequestMethod.GET, value = {"/external/tags"}, produces = "application/json") @@ -47,9 +50,8 @@ public class TagController extends BaseController { /* List> remoteRepos = this.getApiContext().getOperationsContext().getRemoteFetcher().getTags(query, type); TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(remoteRepos);*/ - String path = "C:\\Users\\gkolokythas\\Documents\\openDmp\\dmp-backend\\web\\src\\main\\resources\\mockupTags.json"; ObjectMapper mapper = new ObjectMapper(); - List> data = mapper.readValue(new File(path), new TypeReference>>(){}); + List> data = mapper.readValue(new File(this.environment.getProperty("dataset.tags.mock")), new TypeReference>>(){}); TagExternalSourcesModel researchersExternalSourcesModel = new TagExternalSourcesModel().fromExternalItem(data); return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem().payload(researchersExternalSourcesModel).status(ApiMessageCode.NO_MESSAGE)); diff --git a/dmp-backend/web/src/main/resources/application-devel.properties b/dmp-backend/web/src/main/resources/application-devel.properties index c248050ca..4ca417e32 100644 --- a/dmp-backend/web/src/main/resources/application-devel.properties +++ b/dmp-backend/web/src/main/resources/application-devel.properties @@ -21,6 +21,9 @@ configuration.dynamicProjectUrl=/tmp/ProjectConfiguration.xml configuration.dynamicFunderUrl=/tmp/FunderConfiguration.xml configuration.h2020template=C:\\Users\\gkolokythas\\Documents\\openDmp\\dmp-backend\\web\\src\\main\\resources\\documents\\h2020.docx +####################MOCK FILES CONFIGURATIONS########## +dataset.tags.mock=/tmp/mockupTags.json + #############TWITTER LOGIN CONFIGURATIONS######### twitter.login.redirect_uri=http://127.0.0.1:4200/login/twitter