Skip to content

CDA-123: Level retrieval TSID failure test #1839

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 4 commits into
base: develop
Choose a base branch
from
Draft

CDA-123: Level retrieval TSID failure test #1839

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a63e68b
Level retrieval TSID failure test
zack-rma Jul 14, 2026
50a36ff
Merge branch 'develop' into bugfix/level-tsid-fail
zack-rma Jul 14, 2026
7360fc8
Merge remote-tracking branch 'hec/develop' into bugfix/level-tsid-fail
zack-rma Aug 5, 2026
1697324
Update tests to respect level time as Instant
zack-rma Aug 5, 2026
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
130 changes: 127 additions & 3 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 @@ -51,12 +51,14 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

import com.codahale.metrics.MetricRegistry;
import cwms.cda.ApiServlet;
import cwms.cda.data.dao.LocationCategoryDao;
import cwms.cda.data.dao.LocationGroupDao;
import cwms.cda.data.dao.LocationLevelsDaoImpl;
import cwms.cda.data.dao.RatingDao;
import cwms.cda.data.dao.RatingSetDao;
import cwms.cda.data.dao.TimeSeriesDaoImpl;
import cwms.cda.data.dto.AssignedLocation;
import cwms.cda.data.dto.LocationCategory;
import cwms.cda.data.dto.LocationGroup;
Expand All @@ -66,6 +68,7 @@
import cwms.cda.data.dto.locationlevel.SeasonalLocationLevel;
import cwms.cda.data.dto.locationlevel.SeasonalValueBean;
import cwms.cda.data.dto.locationlevel.TimeSeriesLocationLevel;
import cwms.cda.data.dto.locationlevel.VirtualLocationLevel;
import cwms.cda.formatters.ContentType;
import cwms.cda.formatters.Formats;
import fixtures.CwmsDataApiSetupCallback;
Expand All @@ -89,6 +92,9 @@
import java.util.NavigableMap;
import java.util.TreeMap;
import javax.servlet.http.HttpServletResponse;
import java.math.BigInteger;
import java.sql.Timestamp;
import java.time.Duration;
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 @@ -116,7 +122,12 @@
DSLContext dsl = dslContext(c, OFFICE);
LocationLevelsDaoImpl dao = new LocationLevelsDaoImpl(dsl);
for (LocationLevel level : levelList) {
dao.deleteLocationLevel(level.getLocationLevelId(), level.getLevelDate(), level.getOfficeId(), false);
try {
dao.deleteLocationLevel(level.getLocationLevelId(), level.getLevelDate(), level.getOfficeId(),
false);
} catch (Exception ex) {
// ignore
}
}
});
}
Expand Down Expand Up @@ -2500,6 +2511,94 @@
.body("source", is("User Input"));
}

@Test
void test_tsid_failure_bulk_creation() throws Exception {
String locId = "level_bulk_fail";
String levelId = locId + ".Elev.Ave.1Day.Regulating";
String virtualLevelId = locId + ".Elev.Inst.0.Virtual";
String tsId = locId + ".Elev.Inst.0.0.Regulating";
createLocation(locId, true, OFFICE);
final ZonedDateTime time = ZonedDateTime.of(2023, 6, 1, 0, 0, 0, 0, ZoneId.of("America"
+ "/Los_Angeles"));
String specXml = createRatingSpec(locId);
String setXml = createRatingSet(locId);
String ratingId = locId + ".Stage;Flow.COE.Production";
createVirtualLocation(specXml, setXml, time, virtualLevelId, null, "m");
CwmsDataApiSetupCallback.getDatabaseLink().connection(c -> {
DSLContext dsl = dslContext(c, OFFICE);
LocationLevelsDaoImpl dao = new LocationLevelsDaoImpl(dsl);
TimeSeriesDaoImpl tsDao = new TimeSeriesDaoImpl(dsl, new MetricRegistry());
TimeSeries ts = buildTimeSeries(tsId, OFFICE, time, "m");
tsDao.create(ts);
for (int i = 1; i <= 100; i++) {
if (i % 3 == 0) {
LocationLevel level = new SeasonalLocationLevel.Builder(levelId, time.plusHours(i * 1L).toInstant())
.withOfficeId(OFFICE)
.withLevelUnitsId("m")
.withIntervalOrigin(time.toInstant())
.withIntervalMinutes(60 * 12)
.withSeasonalValues(buildSeasonalValues(i))
.withInterpolateString("F")
.build();
levelList.add(level);
dao.storeLocationLevel(level);
} else if (i % 3 == 1) {
LocationLevel level = new TimeSeriesLocationLevel.Builder(levelId, time.plusHours(i * 1L).toInstant(), tsId)
.withOfficeId(OFFICE)
.withLevelUnitsId("m")
.withInterpolateString("F")
.build();
levelList.add(level);
dao.storeLocationLevel(level);
} else {
LocationLevel level = new ConstantLocationLevel.Builder(levelId, time.plusHours(i * 1L).toInstant())
.withOfficeId(OFFICE)
.withLevelUnitsId("m")
.withConstantValue(10.3 * i)
.withInterpolateString("F")
.build();
levelList.add(level);
dao.storeLocationLevel(level);
}
}
List<VirtualLocationLevel.RatingConstituent> ratingConstituents = new ArrayList<>();
VirtualLocationLevel.RatingConstituent constituent = new VirtualLocationLevel.RatingConstituent.Builder("R1", "RATING", ratingId).build();
ratingConstituents.add(constituent);
VirtualLocationLevel.LocationLevelConstituent levelConstituent = new VirtualLocationLevel.LocationLevelConstituent.Builder("L1", "LOCATION_LEVEL", levelId, "Stor", 2.0).build();
ratingConstituents.add(levelConstituent);
LocationLevel level = new VirtualLocationLevel.Builder(virtualLevelId, time.toInstant())
.withOfficeId(OFFICE)
.withLevelUnitsId("m")
.withConstituents(ratingConstituents)
.withConstituentConnections("L1=R1I1")
.withExpirationDate(time.plusWeeks(12).toInstant())
.withInterpolateString("F")
.build();
levelList.add(level);
dao.storeLocationLevel(level);
});

ExtractableResponse<Response> response = given()
.log().ifValidationFails(LogDetail.ALL, true)
.accept(Formats.JSONV2)
.contentType(Formats.JSONV2)
.queryParam(Controllers.OFFICE, OFFICE)
.queryParam(LEVEL_ID_MASK, locId + ".*")
.queryParam(BEGIN, time.toString())
.queryParam(END, time.plusHours(100).toString())
.when()
.redirects().follow(true)
.redirects().max(3)
.get("/levels/")
.then()
.log().ifValidationFails(LogDetail.ALL, true)
.assertThat()
.statusCode(is(HttpServletResponse.SC_OK))
.extract();

assertThat(response.path("levels.size()"),is(100));

Check failure on line 2599 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 previous)

LevelsControllerTestIT.LevelsControllerTestIT.test_tsid_failure_bulk_creation (schema: 25.07.01) 

java.lang.AssertionError: 
Expected: is <100>
     but: was <23>

Check failure on line 2599 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_tsid_failure_bulk_creation (schema: 26.02.17) 

java.lang.AssertionError: 
Expected: is <100>
     but: was <23>
}

enum GetAllTestNewAliases {
DEFAULT(Formats.DEFAULT, Formats.JSONV2),
JSON(Formats.JSON, Formats.JSONV2),
Expand All @@ -2524,6 +2623,27 @@
return RatingSpecXmlFactory.toXml(specContainer, "", 0, true);
}

private List<SeasonalValueBean> buildSeasonalValues(int i) {
List<SeasonalValueBean> seasonalValues = new ArrayList<>();
for (int j = 0; j < 12; j++) {
SeasonalValueBean bean = new SeasonalValueBean.Builder()
.withValue(11.7 * i * j)
.withOffsetMinutes(BigInteger.valueOf(60L * j))
.build();
seasonalValues.add(bean);
}
return seasonalValues;
}

private TimeSeries buildTimeSeries(String name, String officeId, ZonedDateTime begin, String units) {
TimeSeries ts = new TimeSeries(null, 10, 10, name, officeId, begin, begin.plusDays(1L), units, Duration.ZERO);
for (int j = 0; j < 24; j++) {
Timestamp time = Timestamp.from(begin.plusHours(j).toInstant());
ts.addValue(time, 3.45 * j, 0);
}
return ts;
}

private String createRatingSet(String locationName) throws Exception {
String ratingXml = readResourceFile("cwms/cda/api/Zanesville_Stage_Flow_COE_Production.xml");
ratingXml = ratingXml.replaceAll("Zanesville", locationName);
Expand All @@ -2533,6 +2653,10 @@
}

private void createVirtualLocation(String specXml, String setXml, ZonedDateTime time, String levelId, String levelId2) throws SQLException {
createVirtualLocation(specXml, setXml, time, levelId, levelId2, "ac-ft");
}

private void createVirtualLocation(String specXml, String setXml, ZonedDateTime time, String levelId, String levelId2, String units) throws SQLException {
CwmsDataApiSetupCallback.getDatabaseLink().connection(c -> {
DSLContext dsl = dslContext(c, OFFICE);
RatingDao ratingDao = new RatingSetDao(dsl);
Expand All @@ -2550,7 +2674,7 @@
}
LocationLevel level = new ConstantLocationLevel.Builder(levelId, time.toInstant())
.withOfficeId(OFFICE)
.withLevelUnitsId("ac-ft")
.withLevelUnitsId(units)
.withConstantValue(1.0)
.build();
levelList.add(level);
Expand All @@ -2559,7 +2683,7 @@
if (levelId2 != null) {
level = new ConstantLocationLevel.Builder(levelId2, time.toInstant())
.withOfficeId(OFFICE)
.withLevelUnitsId("ac-ft")
.withLevelUnitsId(units)
.withConstantValue(10.0)
.build();
levelList.add(level);
Expand Down
Loading