diff --git a/.bumpversion.cfg b/.bumpversion.cfg index dc5108adb6b97c32757a0e84d61ab9dc10e1c02c..011209f07cb1d8dfe265becbf234916b550c1227 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.6.0 +current_version = 2.6.2 commit = True tag = True tag_name = {new_version} diff --git a/hbp.yml b/hbp.yml index ee411484e1c9f508a5a2084c76c7d5dd453082e9..95e575825136d6ba677d02bc320eaf7f57ac0371 100644 --- a/hbp.yml +++ b/hbp.yml @@ -58,9 +58,9 @@ testing: command: ./test.sh release_management: - current_version: 2.6.0 - current_code_release: https://github.com/HBPMedical/portal-backend/archive/2.6.0.zip - current_binary_release: https://pypi.python.org/pypi/portal-backend/2.6.0 + current_version: 2.6.2 + current_code_release: https://github.com/HBPMedical/portal-backend/archive/2.6.2.zip + current_binary_release: https://pypi.python.org/pypi/portal-backend/2.6.2 release_script: 'publish.sh' continuous_integration: @@ -75,10 +75,10 @@ continuous_integration: distribution: docker_hub: name: hbpmip/portal-backend - current_tag: 2.6.0 + current_tag: 2.6.2 url: https://hub.docker.com/r/hbpmip/portal-backend/ badge: https://img.shields.io/badge/docker-hbpmip%2Fportal--backend-008bb8.svg - command: docker pull hbpmip/portal-backend:2.6.0 + command: docker pull hbpmip/portal-backend:2.6.2 planning: github: diff --git a/pom.xml b/pom.xml index 5da5c5a91ad4464d9ff8e02f2c69cc92035ee897..3f71142f10524f829b335c825c5760dc5ad9d8eb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <groupId>eu.hbp.mip</groupId> <artifactId>portal-backend</artifactId> - <version>2.6.0</version><!-- BUMP_VERSION --><!-- BUMP_VERSION --> + <version>2.6.2</version><!-- BUMP_VERSION --> <packaging>jar</packaging> <name>portal-backend</name> @@ -47,14 +47,14 @@ <spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version> <spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version> <aspectjweaver.version>1.8.9</aspectjweaver.version> - <woken-messages.version>2.4.8</woken-messages.version> + <woken-messages.version>2.4.9</woken-messages.version> <javax-inject.version>1</javax-inject.version> <akka.version>2.5.9</akka.version> <spring-context.version>4.3.4.RELEASE</spring-context.version> <protobuf-java.version>3.1.0</protobuf-java.version> <scala.epoch.version>2.11</scala.epoch.version> - <scala.release.version>2.11.11</scala.release.version> + <scala.release.version>2.11.12</scala.release.version> <scala.zinc.version>1.1.0</scala.zinc.version> <scala.plugin.macro.version>2.1.1</scala.plugin.macro.version> diff --git a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java index a383a97e7ae40189dc3813e9ffb0c3eae94dd567..4685056465170049ace7bee3c89268bb0951b70d 100644 --- a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java +++ b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java @@ -4,6 +4,8 @@ package eu.hbp.mip.controllers; +import ch.chuv.lren.mip.portal.WokenConversions; +import ch.chuv.lren.woken.messages.query.filters.FilterRule; import com.github.slugify.Slugify; import com.google.gson.Gson; import com.google.gson.JsonObject; @@ -21,6 +23,7 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; +import scala.Option; import java.io.IOException; import java.util.*; @@ -282,12 +285,15 @@ public class ModelsApi { allVars.addAll(model.getDataset().getHeader()); allVars.addAll(model.getDataset().getGrouping()); - String filters = model.getQuery().getFilters(); + WokenConversions conv = new WokenConversions(); + String filtersJson = model.getQuery().getFilters(); + Option<FilterRule> filters = conv.toFilterRule(filtersJson); + String filtersSQL = conv.toSqlWhere(filters); Gson gson = new Gson(); JsonObject jsonModel = gson.fromJson(gson.toJson(model, Model.class), JsonObject.class); jsonModel.get("dataset").getAsJsonObject() - .add("data", dataUtil.getDataFromVariables(allVars, filters)); + .add("data", dataUtil.getDataFromVariables(allVars, filtersSQL)); return gson.fromJson(jsonModel, Model.class); } diff --git a/src/main/scala/ch.chuv.lren/mip/portal/WokenConversions.scala b/src/main/scala/ch.chuv.lren/mip/portal/WokenConversions.scala index 1b773335b4a12672f84ffb2212928a18d4d95bf1..a6b695e05f9828c0eb9f7593311c93356e42ad1d 100644 --- a/src/main/scala/ch.chuv.lren/mip/portal/WokenConversions.scala +++ b/src/main/scala/ch.chuv.lren/mip/portal/WokenConversions.scala @@ -3,6 +3,7 @@ package ch.chuv.lren.mip.portal import eu.hbp.mip.model.Variable import ch.chuv.lren.woken.messages.datasets.DatasetId import ch.chuv.lren.woken.messages.query.filters.FilterRule +import ch.chuv.lren.woken.messages.query.filters.FilterRule._ import ch.chuv.lren.woken.messages.query.filters.queryFiltersProtocol._ import org.springframework.stereotype.Component import spray.json._ @@ -20,4 +21,6 @@ class WokenConversions { def toDatasets(datasets: java.util.List[Variable]): Set[DatasetId] = datasets.asScala.map(v => DatasetId(v.getCode)).toSet + def toSqlWhere(filter: Option[FilterRule]): String = filter.fold("")(_.toSqlWhere) + } diff --git a/tests/docker-compose.yml b/tests/docker-compose.yml index 034d283e4764477e7afc401733b4f609f562fcd9..99c80d8e2bd87822115ae8e4387867adce99bd70 100644 --- a/tests/docker-compose.yml +++ b/tests/docker-compose.yml @@ -43,7 +43,7 @@ services: - db meta_db_setup: - image: "hbpmip/sample-meta-db-setup:0.4.1" + image: "hbpmip/sample-meta-db-setup:0.4.3" container_name: "meta-db-setup" restart: "no" networks: