Resolve "Rest API should follow google guidlines"

Closes #90 (closed)

frontend-js/src/main/js/ServerConnector.js

@@ -485,59 +485,27 @@ ServerConnector.getSearchUrl = function(queryParams, filterParams) {
   });
 };
 
-ServerConnector.getDrugsByQueryUrl = function(params) {
-  var query = params.query;
-  var projectId = params.projectId;
-  var token = params.token;
-
+ServerConnector.getSearchDrugsUrl = function(queryParams, filterParams) {
   return this.getApiUrl({
-    type : "drug",
-    method : "getDrugsByQuery",
-    params : {
-      projectId : projectId,
-      query : query,
-      token : token
-    },
+    url : this.getProjectsUrl(queryParams) + "drugs:search",
+    params : filterParams,
   });
 };
 
-ServerConnector.getDrugsByTargetUrl = function(params) {
-  var query = params.query;
-  var projectId = params.projectId;
-  var token = params.token;
-  var columns = this.idsToString(params.columns);
-  var targetId = params.target.getId();
-  var targetType = params.target.getType();
-
+ServerConnector.getSearchMiRnasUrl = function(queryParams, filterParams) {
   return this.getApiUrl({
-    type : "drug",
-    method : "getDrugsByTarget",
-    params : {
-      projectId : projectId,
-      query : query,
-      columns : columns,
-      token : token,
-      targetId : targetId,
-      targetType : targetType,
-    },
+    url : this.getProjectsUrl(queryParams) + "miRnas:search",
+    params : filterParams,
   });
 };
 
-ServerConnector.getMiRnasByQueryUrl = function(params) {
-  var query = params.query;
-  var projectId = params.projectId;
-  var token = params.token;
-
+ServerConnector.getSearchChemicalsUrl = function(queryParams, filterParams) {
   return this.getApiUrl({
-    type : "miRna",
-    method : "getMiRnasByQuery",
-    params : {
-      projectId : projectId,
-      query : query,
-      token : token
-    },
+    url : this.getProjectsUrl(queryParams) + "chemicals:search",
+    params : filterParams,
   });
 };
+
 ServerConnector.getOverlaySourceUrl = function(queryParams, filterParams) {
   return this.getApiUrl({
     url : this.getOverlaysUrl(queryParams) + queryParams.overlayId + ":downloadSource",
@@ -611,66 +579,6 @@ ServerConnector.getProjectSourceUrl = function(params) {
   });
 };
 
-ServerConnector.getMiRnasByTargetUrl = function(params) {
-  var query = params.query;
-  var projectId = params.projectId;
-  var token = params.token;
-  var columns = this.idsToString(params.columns);
-  var targetId = params.target.getId();
-  var targetType = params.target.getType();
-
-  return this.getApiUrl({
-    type : "miRna",
-    method : "getMiRnasByTarget",
-    params : {
-      projectId : projectId,
-      query : query,
-      columns : columns,
-      token : token,
-      targetId : targetId,
-      targetType : targetType,
-    },
-  });
-};
-
-ServerConnector.getChemicalsByQueryUrl = function(params) {
-  var query = params.query;
-  var projectId = params.projectId;
-  var token = params.token;
-
-  return this.getApiUrl({
-    type : "chemical",
-    method : "getChemicalsByQuery",
-    params : {
-      projectId : projectId,
-      query : query,
-      token : token
-    },
-  });
-};
-
-ServerConnector.getChemicalsByTargetUrl = function(params) {
-  var query = params.query;
-  var projectId = params.projectId;
-  var token = params.token;
-  var columns = this.idsToString(params.columns);
-  var targetId = params.target.getId();
-  var targetType = params.target.getType();
-
-  return this.getApiUrl({
-    type : "chemical",
-    method : "getChemicalsByTarget",
-    params : {
-      projectId : projectId,
-      query : query,
-      columns : columns,
-      token : token,
-      targetId : targetId,
-      targetType : targetType,
-    },
-  });
-};
-
 ServerConnector.getUserUrl = function(params) {
   var userId = params.userId;
   var token = params.token;
@@ -704,7 +612,7 @@ ServerConnector.getConfiguration = function() {
       return self.readFile(self.getConfigurationUrl(null, {
         token : token
       }));
-    }).then(function(content){
+    }).then(function(content) {
       self._configuration = new Configuration(JSON.parse(content));
       return Promise.resolve(self._configuration);
     });
@@ -1072,12 +980,16 @@ ServerConnector.getElementsByQuery = function(params) {
 
 ServerConnector.getDrugsByQuery = function(params) {
   var self = this;
+  var queryParams = {};
+  var filterParams = {
+    query : params.query
+  };
   return self.getProjectId(params.projectId).then(function(result) {
-    params.projectId = result;
+    queryParams.projectId = result;
     return self.getToken();
   }).then(function(token) {
-    params.token = token;
-    return self.readFile(self.getDrugsByQueryUrl(params));
+    filterParams.token = token;
+    return self.readFile(self.getSearchDrugsUrl(queryParams, filterParams));
   }).then(function(content) {
     var array = JSON.parse(content);
     var result = [];
@@ -1090,12 +1002,16 @@ ServerConnector.getDrugsByQuery = function(params) {
 
 ServerConnector.getMiRnasByQuery = function(params) {
   var self = this;
+  var queryParams = {};
+  var filterParams = {
+    query : params.query
+  };
   return self.getProjectId(params.projectId).then(function(result) {
-    params.projectId = result;
+    queryParams.projectId = result;
     return self.getToken();
   }).then(function(token) {
-    params.token = token;
-    return self.readFile(self.getMiRnasByQueryUrl(params));
+    filterParams.token = token;
+    return self.readFile(self.getSearchMiRnasUrl(queryParams, filterParams));
   }).then(function(content) {
     var array = JSON.parse(content);
     var result = [];
@@ -1108,12 +1024,16 @@ ServerConnector.getMiRnasByQuery = function(params) {
 
 ServerConnector.getChemicalsByQuery = function(params) {
   var self = this;
+  var queryParams = {};
+  var filterParams = {
+    query : params.query
+  };
   return self.getProjectId(params.projectId).then(function(result) {
-    params.projectId = result;
+    queryParams.projectId = result;
     return self.getToken();
   }).then(function(token) {
-    params.token = token;
-    return self.readFile(self.getChemicalsByQueryUrl(params));
+    filterParams.token = token;
+    return self.readFile(self.getSearchChemicalsUrl(queryParams, filterParams));
   }).then(function(content) {
     var array = JSON.parse(content);
     var result = [];
@@ -1190,13 +1110,17 @@ ServerConnector.getProjectSourceDownloadUrl = function(params) {
 
 ServerConnector.getDrugNamesByTarget = function(params) {
   var self = this;
-  params.columns = [ "name" ];
+  var queryParams = {};
+  var filterParams = {
+    columns : [ "name" ],
+    target : params.target.getType() + ":" + params.target.getId()
+  };
   return self.getProjectId(params.projectId).then(function(result) {
-    params.projectId = result;
+    queryParams.projectId = result;
     return self.getToken();
   }).then(function(token) {
-    params.token = token;
-    return self.readFile(self.getDrugsByTargetUrl(params));
+    filterParams.token = token;
+    return self.readFile(self.getSearchDrugsUrl(queryParams, filterParams));
   }).then(function(content) {
     var result = [];
     var object = JSON.parse(content);
@@ -1209,13 +1133,17 @@ ServerConnector.getDrugNamesByTarget = function(params) {
 
 ServerConnector.getMiRnaNamesByTarget = function(params) {
   var self = this;
-  params.columns = [ "name" ];
+  var queryParams = {};
+  var filterParams = {
+    columns : [ "name" ],
+    target : params.target.getType() + ":" + params.target.getId()
+  };
   return self.getProjectId(params.projectId).then(function(result) {
-    params.projectId = result;
+    queryParams.projectId = result;
     return self.getToken();
   }).then(function(token) {
-    params.token = token;
-    return self.readFile(self.getMiRnasByTargetUrl(params));
+    filterParams.token = token;
+    return self.readFile(self.getSearchMiRnasUrl(queryParams, filterParams));
   }).then(function(content) {
     var result = [];
     var object = JSON.parse(content);
@@ -1228,13 +1156,17 @@ ServerConnector.getMiRnaNamesByTarget = function(params) {
 
 ServerConnector.getChemicalNamesByTarget = function(params) {
   var self = this;
-  params.columns = [ "name" ];
+  var queryParams = {};
+  var filterParams = {
+    columns : [ "name" ],
+    target : params.target.getType() + ":" + params.target.getId()
+  };
   return self.getProjectId(params.projectId).then(function(result) {
-    params.projectId = result;
+    queryParams.projectId = result;
     return self.getToken();
   }).then(function(token) {
-    params.token = token;
-    return self.readFile(self.getChemicalsByTargetUrl(params));
+    filterParams.token = token;
+    return self.readFile(self.getSearchChemicalsUrl(queryParams, filterParams));
   }).then(function(content) {
     var result = [];
     var object = JSON.parse(content);