Commit 253c435e authored by Noel Alonso's avatar Noel Alonso
Browse files

Añade a query para comprobar actividad 

De esta manera se asegura que los datos corresponden con la actividad
esperada
parent 6947890c

time-series-view/src/main/java/es/redmic/timeseriesview/common/query/SeriesQueryUtils.java

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ public abstract class SeriesQueryUtils extends DataQueryUtils { 


		BoolQueryBuilder query = getOrInitializeBaseQuery(getBaseQuery(queryDTO, internalQuery, partialQuery));



		addMustTermIfExist(query, getActivityIdQuery(queryDTO.getActivityId()));



		addMustTermIfExist(query, getFlagQuery(queryDTO.getQFlags(), QFLAG_PROPERTY));

		addMustTermIfExist(query, getFlagQuery(queryDTO.getVFlags(), VFLAG_PROPERTY));

		addMustTermIfExist(query, getDateLimitsQuery(queryDTO.getDateLimits(), DATETIME_FIELD));

time-series-view/src/main/java/es/redmic/timeseriesview/service/WindRoseESService.java

+2 −1
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ public class WindRoseESService { 
	@SuppressWarnings({ "unchecked" })

	public ElasticSearchDTO getWindRoseData(DataQueryDTO query, String activityId) {



		// TODO: comprobar que la actividad corresponde con la buscada

		// Añade a query para comprobar que la actividad corresponde con la buscada

		query.setActivityId(activityId);



		// Se obliga a que los datos sean buenos

		if (query.getQFlags() != null)