Skip to content

Handle missing rating specs on /ratings/{rating-id} endpoint with 404 #2011

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

Merged
adamkorynta merged 1 commit into from
Oct 22, 2026
Merged

Handle missing rating specs on /ratings/{rating-id} endpoint with 404 #2011

Show file tree
Hide file tree
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
23 changes: 21 additions & 2 deletions cwms-data-api/src/main/java/cwms/cda/data/dao/RatingSetDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,14 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import cwms.cda.api.errors.NotFoundException;
import cwms.cda.data.dto.VerticalDatumInfo;
import cwms.cda.data.dto.rating.RatingSpec;
import hec.data.RatingException;
import hec.data.cwmsRating.RatingSet;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.time.Instant;
import java.util.List;
Expand Down Expand Up @@ -125,10 +127,13 @@ public RatingSet retrieve(RatingSet.DatabaseLoadMethod method, String officeId,


} catch (DataAccessException ex) {
if (JooqDao.isNotFound(ex)) {
throw new NotFoundException("Rating specification not found: " + specificationId, ex);
}
Throwable cause = ex.getCause();
if (cause instanceof RatingException) {
if (cause.getMessage().contains("contains no rating templates")) {
return null;
if (isMissingSpec(cause)) {
throw new NotFoundException("Rating specification not found: " + specificationId, cause);
}

throw (RatingException) cause;
Expand All @@ -138,6 +143,20 @@ public RatingSet retrieve(RatingSet.DatabaseLoadMethod method, String officeId,
return retval[0];
}

private static boolean isMissingSpec(Throwable throwable) {
for (Throwable t = throwable; t != null; t = t.getCause()) {
if (t instanceof SQLException && JooqDao.isNotFound(new DataAccessException("rating", t))) {
return true;
}
String message = t.getMessage();
if (message != null && (message.contains("contains no rating templates")
|| message.contains("contains no rating specifications"))) {
return true;
}
}
return false;
}

// store/update
@Override
public void store(String ratingSetXml, boolean replaceBaseCurve, VerticalDatum vd) throws IOException, RatingException {
Expand Down
17 changes: 17 additions & 0 deletions cwms-data-api/src/test/java/cwms/cda/api/rating/RatingsControllerTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,23 @@ void get_one_with_content_length() {
.contentType(is(Formats.JSONV2));
}

@ParameterizedTest
@EnumSource(GetOneTest.class)
void test_get_one_spec_not_found_returns_404(GetOneTest test) {
given()
.log().ifValidationFails(LogDetail.ALL,true)
.accept(test.accept)
.queryParam(OFFICE, SPK)
.when()
.redirects().follow(true)
.redirects().max(3)
.get("/ratings/NoSuchLoc.Stage;Flow.Standard.NoSuchSpec")
.then()
.log().ifValidationFails(LogDetail.ALL,true)
.assertThat()
.statusCode(is(HttpServletResponse.SC_NOT_FOUND));
}

enum GetOneTest
{
DEFAULT(Formats.DEFAULT, Formats.XMLV2),
Expand Down
Loading