Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
bbc0e22
Add office-id param to FindMostRecentsInRange, use as another filter
rohaan-rma Jul 8, 2025
eca1f9a
Make whereCondition field separate since office may be null
rohaan-rma Jul 8, 2025
5b24dc6
Merge branch 'develop' of https://github.com/USACE/cwms-data-api into…
rohaan-rma Jul 9, 2025
ddad365
Work in Progress on JOOQ for new query, added in lots of boilerplate,…
rohaan-rma Jul 9, 2025
e7cf33f
Added most of the new query logic using JOOQ
rohaan-rma Jul 10, 2025
ad996c7
Add JOOQ query except final query fetch
rohaan-rma Jul 10, 2025
20cd7e2
Merge branch 'develop' into timeseries-endpoint-speed
rohaan-rma Jul 10, 2025
885368a
Fix date imports
rohaan-rma Jul 10, 2025
c650cba
Fix field accessing issue
rohaan-rma Jul 11, 2025
bb42ff2
Merge branch 'develop' into timeseries-endpoint-speed
rohaan-rma Jul 18, 2025
7fa0e91
Add new query, fix year tables, formatting
rohaan-rma Jul 21, 2025
0fe1695
Merge branch 'develop' into timeseries-endpoint-speed
rohaan-rma Jul 21, 2025
c1050ee
Fix imports
rohaan-rma Jul 21, 2025
7a231d8
Fix unit conversion in new query
rohaan-rma Jul 22, 2025
7c12054
Clean up unnecessary helper methods with only one usage
rohaan-rma Jul 22, 2025
857a1d7
Add office-id to where condition
rohaan-rma Jul 22, 2025
d799c99
Add missing whereCondition assignment for office-id
rohaan-rma Jul 22, 2025
9fc4e34
Fix category and group recent endpoint
rohaan-rma Jul 22, 2025
7eaefbb
Merge branch 'develop' into timeseries-endpoint-speed
rohaan-rma Jul 23, 2025
e7dc2cc
Add conditional for tsv_limited tables union, and Update category/gro…
rohaan-rma Jul 23, 2025
e78cff8
Add select distinct to avoid duplicate rows being returned
rohaan-rma Jul 23, 2025
3260771
Clean code
rohaan-rma Jul 23, 2025
f001fdc
Merge branch 'develop' into timeseries-endpoint-speed
rohaan-rma Jul 24, 2025
43b9b35
Add assertion for timing in IT
rohaan-rma Jul 24, 2025
00e6c51
Merge branch 'develop' into timeseries-endpoint-speed
rohaan-rma Jul 28, 2025
6da79da
Continue using String constants
rohaan-rma Jul 28, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public void handle(@NotNull Context ctx) {
// just group provided
latestValues = dao.findRecentsInRange(office, categoryId, groupId, pastLimit, futureLimit, unitSystem);
} else {
latestValues = dao.findMostRecentsInRange(tsIds, pastLimit, futureLimit, unitSystem);
latestValues = dao.findMostRecentsInRange(office, tsIds, pastLimit, futureLimit, unitSystem);
}

String formatHeader = ctx.header(Header.ACCEPT);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ String getTimeseries(String format, String names, String office, String unit, St
List<RecentValue> findRecentsInRange(String office, String categoryId, String groupId,
Timestamp pastLimit, Timestamp futureLimit, UnitSystem unitSystem);

List<RecentValue> findMostRecentsInRange(List<String> tsIds, Timestamp pastLimit,
List<RecentValue> findMostRecentsInRange(String office, List<String> tsIds, Timestamp pastLimit,
Timestamp futureLimit, UnitSystem unitSystem);

}
Loading
Loading