Commit 4510993e authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade query por actividades y variable para tests

parent 05f084c5

.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ variables: 
    OAUTH_SERVER: http://docker:8081

    OAUTH_IMAGE_NAME: registry.gitlab.com/redmic-project/server/oauth/master

    OAUTH_IMAGE_TAG: latest

    SPRING_DATASOURCE_URL: jdbc:postgresql://docker:5432/redmic?currentSchema=app

  services:

    - ${DIND_IMAGE_NAME}:${DIND_IMAGE_TAG}

  before_script: &maven-build-microservice-before-script

atlas-view/src/main/java/es/redmic/atlasview/repository/layer/LayerESRepository.java

+17 −9
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder; 


import java.io.IOException;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



import org.apache.lucene.search.join.ScoreMode;

import org.elasticsearch.action.search.MultiSearchRequest;

import org.elasticsearch.action.search.MultiSearchResponse;

import org.elasticsearch.action.search.MultiSearchResponse.Item;
@@ -277,6 +279,12 @@ public class LayerESRepository extends RWDataESRepository<Layer, GeoDataQueryDTO 
		if (terms.containsKey("atlas")) {

			query.must(QueryBuilders.termQuery("atlas", Boolean.valueOf(terms.get("atlas").toString())));

		}

		if (terms.containsKey("activities")) {



			List<Integer> ids = (List<Integer>) terms.get("activities");

			query.must(QueryBuilders.nestedQuery("activities", QueryBuilders.boolQuery().filter(QueryBuilders.termsQuery("activities.id", ids)),

				ScoreMode.Avg));

		}

		return super.getTermQuery(terms, query);

	}