From 44eeb355c2ebef191e1cc3af48ccab04e3000403 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Mon, 12 Jun 2017 14:59:36 +0200
Subject: [PATCH] reference genomes API match with JS code
---
frontend-js/src/main/js/ServerConnector.js | 2 +-
.../UCSC/versions/eboVir3/token=MOCK_TOKEN_ID& | 0
.../lcsb/mapviewer/api/genomics/ReferenceGenomeController.java | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename frontend-js/testFiles/apiCalls/genomics/taxonomies/1570291/{types => genomeTypes}/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID& (100%)
diff --git a/frontend-js/src/main/js/ServerConnector.js b/frontend-js/src/main/js/ServerConnector.js
index eda5972567..2299ec6dd5 100644
--- a/frontend-js/src/main/js/ServerConnector.js
+++ b/frontend-js/src/main/js/ServerConnector.js
@@ -301,7 +301,7 @@ ServerConnector.getReferenceGenomeUrl = function(queryParams, filterParams) {
var version = this.getIdOrAsterisk(queryParams.version);
return this.getApiUrl({
- type : "genomics/taxonomies/" + queryParams.organism + "/types/" + queryParams.type + "/versions/" + version,
+ type : "genomics/taxonomies/" + queryParams.organism + "/genomeTypes/" + queryParams.type + "/versions/" + version + "/",
params : filterParams
});
};
diff --git a/frontend-js/testFiles/apiCalls/genomics/taxonomies/1570291/types/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/genomics/taxonomies/1570291/genomeTypes/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID&
similarity index 100%
rename from frontend-js/testFiles/apiCalls/genomics/taxonomies/1570291/types/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID&
rename to frontend-js/testFiles/apiCalls/genomics/taxonomies/1570291/genomeTypes/UCSC/versions/eboVir3/token=MOCK_TOKEN_ID&
diff --git a/rest-api/src/main/java/lcsb/mapviewer/api/genomics/ReferenceGenomeController.java b/rest-api/src/main/java/lcsb/mapviewer/api/genomics/ReferenceGenomeController.java
index e60c7ba05c..1374985424 100644
--- a/rest-api/src/main/java/lcsb/mapviewer/api/genomics/ReferenceGenomeController.java
+++ b/rest-api/src/main/java/lcsb/mapviewer/api/genomics/ReferenceGenomeController.java
@@ -21,7 +21,7 @@ public class ReferenceGenomeController extends BaseController {
@Autowired
private ReferenceGenomeRestImpl referenceGenomeController;
- @RequestMapping(value = "/genomics/taxonomies/{organismId}/genomeTypes/{type}/versions/{version}/", method = { RequestMethod.GET, RequestMethod.POST },
+ @RequestMapping(value = "/genomics/taxonomies/{organismId}/genomeTypes/{type}/versions/{version}/", method = { RequestMethod.GET },
produces = { MediaType.APPLICATION_JSON_VALUE })
public ReferenceGenomeView getDrugsByQuery(//
@CookieValue(value = Configuration.AUTH_TOKEN) String token, //
--
GitLab