Skip to content

CMWSVue-745: BUGFIX #1699

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

Open
zack-rma wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

CMWSVue-745: BUGFIX #1699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0b2c7dd
Removed distinct from select query. Updated total to remove join with…
zack-rma Apr 20, 2026
c91107c
Updated select statement to resolve retrieval error
zack-rma Apr 20, 2026
0657e6a
Refactored paging handling
zack-rma Apr 20, 2026
59bdeaa
Updated to use var
zack-rma Apr 20, 2026
8177d1a
Update cwms-data-api/src/main/java/cwms/cda/data/dao/LocationLevelsDa…
zack-rma Apr 21, 2026
5f8846c
Merge branch 'develop' into bugfix/level_query_fix
zack-rma Apr 21, 2026
25e0f9a
Query cleanup and refactoring
zack-rma Apr 22, 2026
72912ef
Fixed query where condition to filter results properly
zack-rma Apr 23, 2026
e510c97
Merge branch 'develop' into bugfix/level_query_fix
zack-rma Apr 24, 2026
2364a12
Merge branch 'develop' into bugfix/level_query_fix
zack-rma Apr 29, 2026
65acd9e
Merge branch 'develop' into bugfix/level_query_fix
zack-rma Apr 30, 2026
2879f33
Reverted TS Group controller changes
zack-rma May 5, 2026
2816b0e
Merge branch 'develop' into bugfix/level_query_fix
zack-rma May 5, 2026
036b060
Fixed total count for legacy query
zack-rma May 5, 2026
d5cf63c
Update cwms-data-api/src/main/java/cwms/cda/data/dao/LocationLevelsDa…
zack-rma May 5, 2026
027f17d
Removed duplicate where conditions
zack-rma May 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
123 changes: 60 additions & 63 deletions cwms-data-api/src/main/java/cwms/cda/data/dao/LocationLevelsDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
import org.jooq.Result;
import org.jooq.Select;
import org.jooq.SelectLimitPercentAfterOffsetStep;
import org.jooq.SelectSeekStep5;
import org.jooq.Table;
import org.jooq.conf.ParamType;
import org.jooq.exception.DataAccessException;
Expand Down Expand Up @@ -135,6 +136,12 @@ public class LocationLevelsDaoImpl extends JooqDao<LocationLevel> implements Loc
private static final AV_LOCATION_LEVEL_VALUES values = AV_LOCATION_LEVEL_VALUES;
private static final usace.cwms.db.jooq.codegen.tables.AV_LOC_ALIAS aliasView = AV_LOC_ALIAS;

private static final String LOCATION_LEVEL_CODE = "LOCATION_LEVEL_CODE";
private static final String LOCATION_LEVEL_ID = "LOCATION_LEVEL_ID";
private static final String LOCATION_LEVEL_DATE = "LOCATION_LEVEL_DATE";
private static final String OFFICE_ID = "OFFICE_ID";
private static final String TIME_OFFSET = "TIME_OFFSET";
private static final String CALENDAR_OFFSET = "CALENDAR_OFFSET";
private static final String TABLE_ALIAS1 = "T1";
private static final String TABLE_ALIAS2 = "T2";
private static final String ALIASED_ATTRIBUTE_ID = TABLE_ALIAS1 + ".ATTRIBUTE_ID";
Expand Down Expand Up @@ -188,69 +195,78 @@ public LocationLevels getLocationLevels(String cursor, int pageSize,
}

if (supportsNewView()) {
Condition whereCondition = ref.LOCATION_LEVEL_ID.isNotNull();
Condition whereCondition = field(LOCATION_LEVEL_ID, String.class).isNotNull();

if (office != null && !office.isEmpty()) {
whereCondition = whereCondition.and(ref.OFFICE_ID.eq(office.toUpperCase()));
whereCondition = whereCondition.and(field(OFFICE_ID, String.class).eq(office.toUpperCase()));
}

if (levelIdMask != null && !levelIdMask.isEmpty()) {
whereCondition = whereCondition.and(
JooqDao.caseInsensitiveLikeRegex(ref.LOCATION_LEVEL_ID, levelIdMask));
JooqDao.caseInsensitiveLikeRegex(field(LOCATION_LEVEL_ID, String.class), levelIdMask));
}

if (beginZdt != null) {
whereCondition =
whereCondition.and(ref.LOCATION_LEVEL_DATE.greaterOrEqual(Timestamp.from(beginZdt.toInstant())));
whereCondition.and(field(LOCATION_LEVEL_DATE, Timestamp.class).greaterOrEqual(Timestamp.from(beginZdt.toInstant())));
}
if (endZdt != null) {
whereCondition =
whereCondition.and(ref.LOCATION_LEVEL_DATE.lessThan(Timestamp.from(endZdt.toInstant())));
whereCondition.and(field(LOCATION_LEVEL_DATE, Timestamp.class).lessThan(Timestamp.from(endZdt.toInstant())));
}

Map<LevelLookup, LocationLevel.Builder> builderMap = new LinkedHashMap<>();

SelectLimitPercentAfterOffsetStep<Record> query;
SelectSeekStep5 query;

var pagedRef = dsl.select(ref.LOCATION_LEVEL_CODE, ref.LOCATION_ID,
ref.LOCATION_LEVEL_ID, ref.ATTRIBUTE_ID, ref.OFFICE_ID, ref.LOCATION_LEVEL_DATE, ref.LOCATION_CODE,
ref.PARAMETER_ID, ref.PARAMETER_TYPE_ID, ref.DURATION_ID, ref.SPECIFIED_LEVEL_ID, ref.EXPIRATION_DATE,
ref.LOCATION_LEVEL_COMMENT)
.from(ref)
.where(whereCondition)
.orderBy(ref.OFFICE_ID, ref.LOCATION_ID, ref.PARAMETER_ID, ref.PARAMETER_TYPE_ID, ref.DURATION_ID, ref.SPECIFIED_LEVEL_ID, ref.LOCATION_LEVEL_DATE)
.offset(offset)
.limit(pageSize);

if (includeAliases) {
query = dsl.select(asterisk()).from(dsl.selectDistinct(LOCATION_ALIAS_FIELDS_NEW_VIEW)
.from(ref)
.join(values)
.on(ref.LOCATION_LEVEL_CODE.eq(values.LOCATION_LEVEL_CODE.cast(Long.class)))
List<Field<?>> selectFields = new ArrayList<>();
selectFields.addAll(LOCATION_ALIAS_FIELDS_NEW_VIEW);
selectFields.addAll(List.of(pagedRef.fields()));
selectFields.remove(pagedRef.field("LOCATION_ID", String.class));
query = dsl.select(asterisk()).from(dsl.select(selectFields)
.from(pagedRef)
.leftJoin(values)
.on(pagedRef.field(LOCATION_LEVEL_CODE, Long.class).eq(values.LOCATION_LEVEL_CODE.cast(Long.class)))
.leftJoin(aliasView)
.on(ref.OFFICE_ID.eq(aliasView.DB_OFFICE_ID))
.and(ref.LOCATION_ID.eq(aliasView.LOCATION_ID))
.and(ref.LOCATION_CODE.eq(aliasView.LOCATION_CODE.cast(Long.class)))
.where(whereCondition))
.orderBy(field("OFFICE_ID"), field("LOCATION_LEVEL_ID"),
field("LOCATION_LEVEL_DATE"), field("CALENDAR_OFFSET"), field("TIME_OFFSET")
)
.offset(offset)
.limit(pageSize);
.on(aliasView.DB_OFFICE_ID.eq(pagedRef.field(OFFICE_ID, String.class)))
.and(aliasView.LOCATION_ID.eq(pagedRef.field("LOCATION_ID", String.class)))
.and(aliasView.LOCATION_CODE.eq(pagedRef.field("LOCATION_CODE", BigDecimal.class))))
.orderBy(field(OFFICE_ID), field(LOCATION_LEVEL_ID),
field(LOCATION_LEVEL_DATE), field(CALENDAR_OFFSET), field(TIME_OFFSET)
);
} else {
query = dsl.selectDistinct(LOCATION_LEVEL_FIELDS_NEW_VIEW)
.from(ref)
.join(values)
.on(ref.LOCATION_LEVEL_CODE.eq(values.LOCATION_LEVEL_CODE.cast(Long.class)))
.where(whereCondition)
.orderBy(DSL.upper(ref.OFFICE_ID), DSL.upper(ref.LOCATION_LEVEL_ID),
ref.LOCATION_LEVEL_DATE, values.CALENDAR_OFFSET, values.TIME_OFFSET
)
.offset(offset)
.limit(pageSize);
List<Field<?>> selectFields = new ArrayList<>();
selectFields.addAll(LOCATION_LEVEL_FIELDS_NEW_VIEW);
selectFields.addAll(List.of(pagedRef.fields()));
query = dsl.select(selectFields)
.from(pagedRef)
.leftJoin(values)
.on(pagedRef.field(LOCATION_LEVEL_CODE, Long.class).eq(values.LOCATION_LEVEL_CODE.cast(Long.class)))
.orderBy(DSL.upper(pagedRef.field(OFFICE_ID, String.class)),
DSL.upper(pagedRef.field(LOCATION_LEVEL_ID, String.class)),
pagedRef.field(LOCATION_LEVEL_DATE), values.CALENDAR_OFFSET, values.TIME_OFFSET
);
}

if (!totalSet) {
total = dsl.fetchCount(dsl.selectDistinct(ref.OFFICE_ID, ref.LOCATION_LEVEL_ID, ref.LOCATION_LEVEL_DATE,
values.CALENDAR_OFFSET, values.TIME_OFFSET)
total = dsl.fetchCount(dsl.select(ref.OFFICE_ID, ref.LOCATION_LEVEL_ID, ref.LOCATION_LEVEL_DATE)
.from(ref)
.fullOuterJoin(values)
.on(ref.LOCATION_LEVEL_CODE.eq(values.LOCATION_LEVEL_CODE.cast(Long.class)))
.where(whereCondition)
);
}

final SelectLimitPercentAfterOffsetStep<Record> queryFinal = query;
final var queryFinal = query;

logger.atFine().log("getLocationLevels query: %s", lazy(() -> queryFinal.getSQL(ParamType.INLINED)));

Expand Down Expand Up @@ -355,7 +371,7 @@ public LocationLevels getLocationLevels(String cursor, int pageSize,
.and(mapping.getLocationLevelId(TABLE_ALIAS1, null).eq(virtView.LOCATION_LEVEL_ID)))
.where(whereCondition).asTable(TABLE_ALIAS2))
.orderBy(mapping.getOfficeId(null, null), mapping.getLocationLevelId(null, null),
field("LEVEL_DATE"), field("CALENDAR_OFFSET"), field("TIME_OFFSET"),
field("LEVEL_DATE"), field(CALENDAR_OFFSET), field(TIME_OFFSET),
mapping.getLocationLevelId(TABLE_ALIAS2, null), field("EFFECTIVE_DATE_UTC")
)
.offset(offset)
Expand All @@ -377,8 +393,7 @@ public LocationLevels getLocationLevels(String cursor, int pageSize,

if (!totalSet) {
total = dsl.fetchCount(dsl.selectDistinct(view.OFFICE_ID, view.LOCATION_LEVEL_ID, view.LEVEL_DATE,
view.CALENDAR_OFFSET, view.TIME_OFFSET, virtView.OFFICE_ID, virtView.LOCATION_LEVEL_ID,
virtView.EFFECTIVE_DATE_UTC)
virtView.OFFICE_ID, virtView.LOCATION_LEVEL_ID, virtView.EFFECTIVE_DATE_UTC)
.from(view)
.fullOuterJoin(virtView)
.on(view.LOCATION_LEVEL_CODE.eq(virtView.LOCATION_LEVEL_CODE))
Expand Down Expand Up @@ -1104,7 +1119,7 @@ private void parseLevelsNewView(Record r, Map<LevelLookup, LocationLevel.Builder
constantBuilder.withAliases(aliases);
constantBuilder.withExpirationDate(expireDate);
builderMap.put(levelLookup, constantBuilder);
} else if (seasonalLevel != null) {
} else if (intervalOrigin != null) {

JDomSeasonalIntervalImpl newSeasonalOffset = buildSeasonalOffset(calOffset, timeOffset);
SeasonalValueBean seasonalValue = buildSeasonalValueBean(seasonalLevel, newSeasonalOffset);
Expand Down Expand Up @@ -1435,28 +1450,18 @@ public LocationLevelRefs retrieveLocationLevelRefs(String cursor, int pageSize,
}

private static void buildLocationLevelSelectFieldsNewView() {
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.OFFICE_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.LOCATION_LEVEL_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.ATTRIBUTE_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.LOCATION_LEVEL_DATE);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.CONNECTIONS);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.DURATION_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.ATTRIBUTE_UNIT_EN);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.ATTRIBUTE_VALUE_EN);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.ATTRIBUTE_UNIT_SI);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.ATTRIBUTE_VALUE_SI);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.OFFICE_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.LOCATION_LEVEL_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.EXPIRATION_DATE);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.TSID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.CONSTANT_LEVEL_EN);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.CONSTANT_LEVEL_SI);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.INTERVAL_ORIGIN);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.INTERPOLATE);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.ATTRIBUTE_ID);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.LEVEL_UNIT_EN);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.LEVEL_UNIT_SI);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(ref.LOCATION_LEVEL_COMMENT);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.SEASONAL_VALUE_EN);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.SEASONAL_VALUE_SI);
LOCATION_LEVEL_FIELDS_NEW_VIEW.add(values.CALENDAR_INTERVAL);
Expand All @@ -1466,25 +1471,18 @@ private static void buildLocationLevelSelectFieldsNewView() {
}

private static void buildAliasedLocationLevelSelectFieldsNewView() {
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.OFFICE_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.LOCATION_LEVEL_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.ATTRIBUTE_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.LOCATION_LEVEL_DATE.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.CONNECTIONS.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.DURATION_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.ATTRIBUTE_UNIT_EN.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.ATTRIBUTE_VALUE_EN.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.ATTRIBUTE_UNIT_SI.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.ATTRIBUTE_VALUE_SI.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.EXPIRATION_DATE));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.TSID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.CONSTANT_LEVEL_EN.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.CONSTANT_LEVEL_SI.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.INTERVAL_ORIGIN.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.INTERPOLATE.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.LEVEL_UNIT_EN.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.LEVEL_UNIT_SI.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(ref.LOCATION_LEVEL_COMMENT.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.SEASONAL_VALUE_EN.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.SEASONAL_VALUE_SI.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.CALENDAR_INTERVAL.getUnqualifiedName()));
Expand All @@ -1493,7 +1491,6 @@ private static void buildAliasedLocationLevelSelectFieldsNewView() {
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(values.TIME_OFFSET.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(aliasView.LOCATION_ID));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(aliasView.ALIAS_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(aliasView.LOCATION_CODE));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(aliasView.DB_OFFICE_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(aliasView.CATEGORY_ID.getUnqualifiedName()));
LOCATION_ALIAS_FIELDS_NEW_VIEW.add(field(aliasView.GROUP_ID.getUnqualifiedName()));
Expand All @@ -1512,12 +1509,12 @@ private interface LocationFieldMapping {
private static final class JooqLocationFieldMapping implements LocationFieldMapping {
@Override
public Field<String> getOfficeId(String prefix, Table<?> table) {
return table.field(DSL.name(prefix, "OFFICE_ID"), String.class);
return table.field(DSL.name(prefix, OFFICE_ID), String.class);
}

@Override
public Field<String> getLocationLevelId(String prefix, Table<?> table) {
return table.field(DSL.name(prefix, "LOCATION_LEVEL_ID"), String.class);
return table.field(DSL.name(prefix, LOCATION_LEVEL_ID), String.class);
}

@Override
Expand All @@ -1534,19 +1531,19 @@ public Field<String> getUnitSystem() {
private static final class AliasedLocationFieldMapping implements LocationFieldMapping {
@Override
public Field<String> getOfficeId(String prefix, Table<?> table) {
String field = prefix != null ? prefix + ".OFFICE_ID" : "OFFICE_ID";
String field = prefix != null ? prefix + ".OFFICE_ID" : OFFICE_ID;
return field(field, String.class);
}

@Override
public Field<String> getLocationLevelId(String prefix, Table<?> table) {
String field = prefix != null ? prefix + ".LOCATION_LEVEL_ID" : "LOCATION_LEVEL_ID";
String field = prefix != null ? prefix + ".LOCATION_LEVEL_ID" : LOCATION_LEVEL_ID;
return field(field, String.class);
}

@Override
public Field<Long> getLocationLevelCode() {
return field(String.format("%s.%s", TABLE_ALIAS1, "LOCATION_LEVEL_CODE"), Long.class);
return field(String.format("%s.%s", TABLE_ALIAS1, LOCATION_LEVEL_CODE), Long.class);
}

@Override
Expand Down Expand Up @@ -1863,12 +1860,12 @@ public Field<String> getInterpolate() {

@Override
public Field<String> getCalendarOffset() {
return DSL.field(DSL.name(TABLE_ALIAS2, "CALENDAR_OFFSET"), String.class);
return DSL.field(DSL.name(TABLE_ALIAS2, CALENDAR_OFFSET), String.class);
}

@Override
public Field<String> getTimeOffset() {
return DSL.field(DSL.name(TABLE_ALIAS2, "TIME_OFFSET"), String.class);
return DSL.field(DSL.name(TABLE_ALIAS2, TIME_OFFSET), String.class);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -1946,7 +1946,7 @@ void testRetrieveAllSeasonalLevel() throws Exception {
.body("levels.size()", is(1))
.body("levels[0].expiration-date", equalTo(levelDate.plusYears(50).toInstant().toString()))
.body("levels[0].seasonal-values.size()", is(numValues))
.body("total", is(numValues));
.body("total", is(1));
}

@Test
Expand Down
Loading