Commit 309e610a authored by Noel Alonso's avatar Noel Alonso
Browse files

Cambia tipo de query aceptada para layer

parent ba557421

atlas-view/src/main/java/es/redmic/atlasview/controller/layer/LayerController.java

+2 −2
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ import es.redmic.atlasview.model.layer.Layer; 
import es.redmic.atlasview.service.layer.LayerESService;

import es.redmic.exception.common.ExceptionType;

import es.redmic.models.es.common.dto.EventApplicationResult;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.viewlib.data.controller.DataController;



@Controller

@RequestMapping(value = "${controller.mapping.LAYER}")

@KafkaListener(topics = "${broker.topic.layer}")

public class LayerController extends DataController<Layer, LayerDTO, SimpleQueryDTO> {

public class LayerController extends DataController<Layer, LayerDTO, GeoDataQueryDTO> {



	@Value("${broker.topic.layer}")

	private String layer_topic;

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

+3 −3
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ import es.redmic.exception.common.ExceptionType; 
import es.redmic.exception.data.ItemNotFoundException;

import es.redmic.exception.elasticsearch.ESQueryException;

import es.redmic.models.es.common.dto.EventApplicationResult;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.models.es.data.common.model.DataHitWrapper;

import es.redmic.models.es.data.common.model.DataSearchWrapper;

import es.redmic.viewlib.data.repository.IDataRepository;



@Repository

public class LayerESRepository extends RWDataESRepository<Layer, SimpleQueryDTO>

		implements IDataRepository<Layer, SimpleQueryDTO> {

public class LayerESRepository extends RWDataESRepository<Layer, GeoDataQueryDTO>

		implements IDataRepository<Layer, GeoDataQueryDTO> {



	private static String[] INDEX = { "layer" };

	private static String TYPE = "_doc";

atlas-view/src/main/java/es/redmic/atlasview/service/layer/LayerESService.java

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ import es.redmic.atlasview.repository.layer.LayerESRepository; 
import es.redmic.exception.common.ExceptionType;

import es.redmic.models.es.common.dto.EventApplicationResult;

import es.redmic.models.es.common.dto.JSONCollectionDTO;

import es.redmic.models.es.common.query.dto.GeoDataQueryDTO;

import es.redmic.models.es.common.query.dto.MgetDTO;

import es.redmic.models.es.common.query.dto.SimpleQueryDTO;

import es.redmic.models.es.data.common.model.DataHitWrapper;

import es.redmic.models.es.data.common.model.DataHitsWrapper;

import es.redmic.models.es.data.common.model.DataSearchWrapper;
@@ -45,7 +45,7 @@ import es.redmic.viewlib.data.dto.MetaDTO; 
import es.redmic.viewlib.data.service.RDataService;



@Service

public class LayerESService extends RDataService<Layer, LayerDTO, SimpleQueryDTO> {

public class LayerESService extends RDataService<Layer, LayerDTO, GeoDataQueryDTO> {



	protected static Logger logger = LogManager.getLogger();

atlas-view/src/test/java/es/redmic/test/atlasview/integration/controller/LayerControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ public class LayerControllerTest extends DocumentationViewBaseTest { 
	public void getFilterSchema_Return200_WhenSchemaIsAvailable() throws Exception {



		Map<String, Object> schemaExpected = (Map<String, Object>) JsonToBeanTestUtil

				.getBean("/data/schemas/simplequerydtoschema.json", Map.class);

				.getBean("/data/schemas/geodataquerydtoschema.json", Map.class);



		// @formatter:off

atlas-view/src/test/resources/data/schemas/geodataquerydtoschema.json

0 → 100644
+1 −0
Original line number Diff line number Diff line 
{"schema":{"$schema":"http://json-schema.org/draft-04/schema#","title":"Geo Data Query DTO","type":"object","properties":{"from":{"type":["integer","null"],"default":"0"},"size":{"type":["integer","null"],"default":"100"},"terms":{"type":["object","null"],"additionalProperties":true},"sorts":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/SortDTO"}},"returnFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"text":{"$ref":"#/definitions/TextQueryDTO"},"suggest":{"$ref":"#/definitions/SuggestQueryDTO"},"regexp":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/RegexpDTO"}},"postFilter":{"type":["object","null"],"additionalProperties":true},"aggs":{"type":["array","null"],"uniqueItems":true,"items":{"$ref":"#/definitions/AggsPropertiesDTO"}},"activityId":{"type":["string","null"]},"bbox":{"$ref":"#/definitions/BboxQueryDTO","description":"Obtiene registros de geometrías comprendidas dentro de los límites especificados."},"precision":{"$ref":"#/definitions/PrecisionQueryDTO"}},"definitions":{"SortDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"order":{"type":"string"}},"required":["field","order"]},"TextQueryDTO":{"type":["object","null"],"properties":{"text":{"type":"string","minLength":2},"searchFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"highlightFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}}},"required":["text"]},"SuggestQueryDTO":{"type":["object","null"],"properties":{"text":{"type":"string","minLength":2},"searchFields":{"type":["array","null"],"uniqueItems":true,"items":{"type":"string"}},"size":{"type":["integer","null"]}},"required":["text"]},"RegexpDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"exp":{"type":"string"}},"required":["field","exp"]},"AggsPropertiesDTO":{"type":["object","null"],"properties":{"field":{"type":"string"},"term":{"type":"string"},"nested":{"type":["string","null"]},"size":{"type":["integer","null"],"default":"20"},"minCount":{"type":["integer","null"]}},"required":["field","term"]},"BboxQueryDTO":{"type":["object","null"],"properties":{"bottomRightLat":{"type":"number","minimum":-90,"maximum":90},"bottomRightLon":{"type":"number","minimum":-180,"maximum":180},"topLeftLat":{"type":"number","minimum":-90,"maximum":90},"topLeftLon":{"type":"number","minimum":-180,"maximum":180}},"required":["bottomRightLat","bottomRightLon","topLeftLat","topLeftLon"]},"PrecisionQueryDTO":{"type":["object","null"],"properties":{"min":{"type":["number","null"]},"max":{"type":["number","null"]}}}}}}
 
 No newline at end of file