Commit 74600671 authored by Noel Alonso's avatar Noel Alonso
Browse files

Simplifica rutas y adapta tests

parent 6f85fd6f

time-series-view/src/main/java/es/redmic/timeseriesview/controller/TimeSeriesController.java

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ import es.redmic.timeseriesview.model.timeseries.TimeSeries; 
import es.redmic.timeseriesview.service.TimeSeriesESService;



@RestController

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

@RequestMapping()

public class TimeSeriesController extends RSeriesController<TimeSeries, TimeSeriesDTO, DataQueryDTO>{



	private TimeSeriesESService serviceES;
@@ -80,7 +80,7 @@ public class TimeSeriesController extends RSeriesController<TimeSeries, TimeSeri 
		return serviceES.findTemporalDataStatistics(queryDTO);

	}



	@PostMapping(value = "${controller.mapping.SERIES_WINDROSE}/_search")

	@PostMapping(value = "${controller.mapping.TIMESERIES_ACTIVITY}/${controller.mapping.SERIES_WINDROSE}/_search")

	@ResponseBody

	public SuperDTO getRosewindData(@PathVariable(name = "activityId", required = false) String activityId,

			@Valid @RequestBody DataQueryDTO queryDTO, BindingResult bindingResult) {

time-series-view/src/main/resources/application.properties

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ redmic.elasticsearch.MAX_QUERY_SIZE=3000 
#mapping

controller.mapping.FILTER_SCHEMA=/_search/_schema



controller.mapping.TIMESERIES=/timeseries

controller.mapping.TIMESERIES_ACTIVITY=/activities/{activityId}



controller.mapping.SERIES_TEMPORALDATA=/temporaldata

controller.mapping.SERIES_TEMPORALDATA_SCHEMA=${controller.mapping.SERIES_TEMPORALDATA}${controller.mapping.FILTER_SCHEMA}

time-series-view/src/test/java/es/redmic/test/timeseriesview/integration/controller/TimeSeriesControllerTest.java

+4 −11
Original line number Diff line number Diff line
@@ -81,11 +81,6 @@ public class TimeSeriesControllerTest { 


	private String timeSeries = "/data/timeseries/timeSeriesData.json";



	private String activityId = "1286";



	@Value("${controller.mapping.TIMESERIES}")

	private String TIMESERIES_PATH;



	@Value("${controller.mapping.SERIES_TEMPORALDATA}")

	private String TEMPORALDATA_PATH;
@@ -128,8 +123,6 @@ public class TimeSeriesControllerTest { 
		mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).addFilters(springSecurityFilterChain)

				.build();



		//TIMESERIES_PATH = TIMESERIES_PATH.replace("{activityId}", activityId);



		// Guardar timeseries de prueba



		TypeReference<List<TimeSeries>> type = new TypeReference<List<TimeSeries>>() {
@@ -160,7 +153,7 @@ public class TimeSeriesControllerTest { 
		dataQuery.setInterval("1h");



		this.mockMvc

				.perform(post(TIMESERIES_PATH + TEMPORALDATA_PATH + "/_search").content(getQueryAsString(dataQuery))

				.perform(post(TEMPORALDATA_PATH + "/_search").content(getQueryAsString(dataQuery))

					.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))

				.andExpect(status().is(200))

				.andExpect(jsonPath("$.success", is(true)))
@@ -175,7 +168,7 @@ public class TimeSeriesControllerTest { 
		// @formatter:off



		this.mockMvc

				.perform(post(TIMESERIES_PATH + TEMPORALDATA_PATH + "/_search").content(getQueryAsString(dataQuery))

				.perform(post(TEMPORALDATA_PATH + "/_search").content(getQueryAsString(dataQuery))

					.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))

				.andExpect(status().is(200))

				.andExpect(jsonPath("$.success", is(true)))
@@ -195,7 +188,7 @@ public class TimeSeriesControllerTest { 
		dataQuery.getDateLimits().setEndDate(new DateTime(2018, 2, 1, 0, 0, 0, 0, DateTimeZone.UTC));



		this.mockMvc

				.perform(post(TIMESERIES_PATH + TEMPORALDATA_PATH + "/_search").content(getQueryAsString(dataQuery))

				.perform(post(TEMPORALDATA_PATH + "/_search").content(getQueryAsString(dataQuery))

					.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))

				.andExpect(status().is(200))

				.andExpect(jsonPath("$.success", is(true)))
@@ -211,7 +204,7 @@ public class TimeSeriesControllerTest { 
		// @formatter:off



		this.mockMvc

				.perform(get(TIMESERIES_PATH + TEMPORALDATA_PATH + "/_search/_schema")

				.perform(get(TEMPORALDATA_PATH + "/_search/_schema")

					.accept(MediaType.APPLICATION_JSON))

				.andExpect(status().is(200))

				.andExpect(jsonPath("$.success", is(true)))

time-series-view/src/test/java/es/redmic/test/timeseriesview/integration/controller/WindRoseControllerTest.java

+23 −24
Original line number Diff line number Diff line
@@ -80,8 +80,8 @@ public class WindRoseControllerTest { 


	private String activityId = "1286";



	@Value("${controller.mapping.TIMESERIES}")

	private String TIMESERIES_PATH;

	@Value("${controller.mapping.TIMESERIES_ACTIVITY}")

	private String TIMESERIES_ACTIVITY_PATH;



	@Value("${controller.mapping.SERIES_WINDROSE}")

	private String WINDROSE_PATH;
@@ -93,7 +93,6 @@ public class WindRoseControllerTest { 


	private static HashMap<String, Object> query;



	@SuppressWarnings("serial")

	@BeforeClass

	public static void beforeClass() {
@@ -137,7 +136,7 @@ public class WindRoseControllerTest { 
		mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).addFilters(springSecurityFilterChain)

				.build();



		TIMESERIES_PATH = TIMESERIES_PATH.replace("{activityId}", activityId);

		TIMESERIES_ACTIVITY_PATH = TIMESERIES_ACTIVITY_PATH.replace("{activityId}", activityId);



		// Guardar timeseries de prueba
@@ -172,7 +171,7 @@ public class WindRoseControllerTest { 
		((Map<String, Object>) query.get("terms")).put("numSplits", numSplits);



		this.mockMvc

				.perform(post(TIMESERIES_PATH + WINDROSE_PATH + "/_search").content(mapper.writeValueAsString(query))

				.perform(post(TIMESERIES_ACTIVITY_PATH + WINDROSE_PATH + "/_search").content(mapper.writeValueAsString(query))

					.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))

				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))
@@ -199,7 +198,7 @@ public class WindRoseControllerTest { 
		((Map<String, Object>) query.get("terms")).put("numSplits", numSplits);



		this.mockMvc

				.perform(post(TIMESERIES_PATH + WINDROSE_PATH + "/_search").content(mapper.writeValueAsString(query))

				.perform(post(TIMESERIES_ACTIVITY_PATH + WINDROSE_PATH + "/_search").content(mapper.writeValueAsString(query))

					.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))

				.andExpect(status().isOk())

				.andExpect(jsonPath("$.success", is(true)))
@@ -227,7 +226,7 @@ public class WindRoseControllerTest { 
		((Map<String, Object>) query.get("dateLimits")).put("endDate", new DateTime(2018, 2, 1, 0, 0, 0, 0, DateTimeZone.UTC));



		this.mockMvc

				.perform(post(TIMESERIES_PATH + WINDROSE_PATH + "/_search").content(mapper.writeValueAsString(query))

				.perform(post(TIMESERIES_ACTIVITY_PATH + WINDROSE_PATH + "/_search").content(mapper.writeValueAsString(query))

					.contentType(MediaType.APPLICATION_JSON).accept(MediaType.APPLICATION_JSON))

				.andExpect(status().is(204));