Skip to content

CDA-95: Level-as-time-series retrieval bug #1605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
zack-rma wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

CDA-95: Level-as-time-series retrieval bug #1605

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions cwms-data-api/src/test/java/cwms/cda/api/LevelsControllerTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
import io.restassured.path.json.JsonPath;
import io.restassured.response.ExtractableResponse;
import io.restassured.response.Response;
import java.math.BigInteger;
import mil.army.usace.hec.cwms.rating.io.xml.RatingContainerXmlFactory;
import mil.army.usace.hec.cwms.rating.io.xml.RatingSetContainerXmlFactory;
import mil.army.usace.hec.cwms.rating.io.xml.RatingSpecXmlFactory;
Expand Down Expand Up @@ -97,7 +98,7 @@

@AfterEach
void cleanup() throws Exception {
CwmsDataApiSetupCallback.getDatabaseLink().connection(c -> {

Check failure on line 101 in cwms-data-api/src/test/java/cwms/cda/api/LevelsControllerTestIT.java

View workflow job for this annotation

GitHub Actions / build and test (jdk 11, schema latest)

LevelsControllerTestIT.LevelsControllerTestIT.test_level_as_timeseries_intervals (schema: latest-dev) 

java.lang.RuntimeException: Failed to delete Location Level

Check failure on line 101 in cwms-data-api/src/test/java/cwms/cda/api/LevelsControllerTestIT.java

View workflow job for this annotation

GitHub Actions / build and test (jdk 11, schema release)

LevelsControllerTestIT.LevelsControllerTestIT.test_level_as_timeseries_intervals (schema: 25.07.01) 

java.lang.RuntimeException: Failed to delete Location Level

Check failure on line 101 in cwms-data-api/src/test/java/cwms/cda/api/LevelsControllerTestIT.java

View workflow job for this annotation

GitHub Actions / build and test (jdk 11, schema next-release)

LevelsControllerTestIT.LevelsControllerTestIT.test_level_as_timeseries_intervals (schema: 26.02.17-RC01) 

java.lang.RuntimeException: Failed to delete Location Level
DSLContext dsl = dslContext(c, OFFICE);
LocationLevelsDaoImpl dao = new LocationLevelsDaoImpl(dsl);
for (LocationLevel level : levelList) {
Expand Down Expand Up @@ -344,6 +345,84 @@
assertEquals("1Day", response.path("levels[1].duration-id"));
}

@Test
void test_level_as_timeseries_intervals() throws Exception {
createLocation("level_as_timeseries", true, OFFICE);
String levelId = "level_as_timeseries.Flow.Ave.1Day.Regulating";
ZonedDateTime time = ZonedDateTime.of(2026, 3, 7, 0, 0, 0, 0, ZoneId.of("America/Los_Angeles"));
int effectiveHourCount = 48;
NavigableMap<Instant, LocationLevel> levels = new TreeMap<>();
List<SeasonalValueBean> seasonalValues = new ArrayList<>();
for (int i = 0; i < effectiveHourCount * 4; i++) {
SeasonalValueBean value = new SeasonalValueBean.Builder()
.withValue(i * 121.0)
.withOffsetMinutes(BigInteger.valueOf(15L * i))
.build();
seasonalValues.add(value);
}
LocationLevel level = new SeasonalLocationLevel.Builder(levelId, time)
.withIntervalMinutes(effectiveHourCount*60)
.withIntervalOrigin(time)
.withSeasonalValues(seasonalValues)
.withInterpolateString("T")
.withLevelUnitsId("cfs")
.build();
levelList.add(level);
levels.put(level.getLevelDate().toInstant(), level);
CwmsDataApiSetupCallback.getDatabaseLink().connection(c -> {
DSLContext dsl = dslContext(c, OFFICE);
LocationLevelsDaoImpl dao = new LocationLevelsDaoImpl(dsl);
dao.storeLocationLevel(level);
});

//Read level timeseries
TimeSeries timeSeries =
given()
.log().ifValidationFails(LogDetail.ALL,true)
.accept(Formats.JSONV2)
.contentType(Formats.JSONV2)
.queryParam(Controllers.OFFICE, OFFICE)
.queryParam(BEGIN, time.toInstant().toString())
.queryParam(END, time.plusHours(effectiveHourCount).toInstant().toString())
.queryParam(INTERVAL, "15Minutes")
.queryParam(UNIT, "cfs")
.when()
.redirects().follow(true)
.redirects().max(3)
.get("/levels/" + levelId + "/timeseries/")
.then()
.assertThat()
.log().ifValidationFails(LogDetail.ALL,true)
.statusCode(is(HttpServletResponse.SC_OK))
.extract()
.response()
.as(TimeSeries.class);
assertEquals("level_as_timeseries.Flow.Ave.15Minutes.1Day.Regulating", timeSeries.getName());
assertEquals(OFFICE, timeSeries.getOfficeId());
assertEquals(time.toInstant(), timeSeries.getBegin().toInstant());
assertEquals(time.plusHours(effectiveHourCount).toInstant(), timeSeries.getEnd().toInstant());
assertEquals(4 * effectiveHourCount + 1, timeSeries.getTotal());
assertEquals("cfs", timeSeries.getUnits());
List<SeasonalValueBean> vals = ((SeasonalLocationLevel) level).getSeasonalValues();
List<TimeSeries.Record> values = timeSeries.getValues();
assertEquals(vals.size(), values.size() - 1);
Map<Long, Double> valuesMap = new TreeMap<>();
for (int i = 0; i < values.size(); i++) {
Long longTime = values.get(i).getDateTime().toInstant().toEpochMilli();
if (valuesMap.get(longTime) != null) {
throw new IllegalStateException("Duplicate time found: " + longTime);
}
valuesMap.put(longTime, values.get(i).getValue());
}
Map<Long, Double> expectedValuesMap = new TreeMap<>();

for (int i = 0; i < vals.size(); i++) {
Long longTime = time.plusMinutes(vals.get(i).getOffsetMinutes().longValue()).toInstant().toEpochMilli();
expectedValuesMap.put(longTime, vals.get(i).getValue());
}
expectedValuesMap.forEach((k, v) -> assertEquals(v, valuesMap.get(k), 0.0001, "Value check failed at iteration: " + k));
}

@Test
void test_level_as_timeseries() throws Exception {
createLocation("level_as_timeseries", true, OFFICE);
Expand Down
Loading