Skip to content
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

Patient Search - Support Event IDs #1969

Merged
merged 15 commits into from
Oct 29, 2024
Merged

Patient Search - Support Event IDs #1969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a2f733e
Lab and Morbidity report query
Oct 23, 2024
e5d0f32
generated types
Oct 23, 2024
fb16eff
Document Id
Oct 23, 2024
03fd017
State case and ABC case ID
Oct 24, 2024
98a7a58
City ID
Oct 25, 2024
6222b1d
Notification Id, Treatment Id
Oct 25, 2024
edb10b2
Fix for treatment id
Oct 25, 2024
2318d0f
Vaccine ID
Oct 25, 2024
ae916c8
Investigation Ids
Oct 25, 2024
663f83a
Accession number
Oct 25, 2024
dfb1a52
Prevent ABC case IDs from spilling into State Case Id list in Elastic…
Oct 25, 2024
38d90b0
Run code generation
Oct 25, 2024
06fbea6
Fix capitalization
Oct 25, 2024
bcf0f76
Remove Id from field names
Oct 28, 2024
7a01338
Merge branch 'main' into CNFT1-3343-patient-search-event-id
Oct 29, 2024
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
15 changes: 5 additions & 10 deletions ...ernization-api/src/main/java/gov/cdc/nbs/patient/search/ElasticsearchPatientSearcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ class ElasticsearchPatientSearcher implements SearchResolver<PatientFilter, Pati
final PatientSearchCriteriaFilterResolver filterResolver,
final PatientSearchCriteriaQueryResolver queryResolver,
final PatientSearchCriteriaSortResolver sortResolver,
final SearchResultResolver resultResolver
) {
final SearchResultResolver resultResolver) {
this.client = client;
this.finder = finder;
this.filterResolver = filterResolver;
Expand All @@ -44,8 +43,7 @@ class ElasticsearchPatientSearcher implements SearchResolver<PatientFilter, Pati
@Override
public SearchResult<PatientSearchResult> search(
final PatientFilter criteria,
final Pageable pageable
) {
final Pageable pageable) {

Query filter = filterResolver.resolve(criteria);
Query query = queryResolver.resolve(criteria);
Expand All @@ -60,8 +58,7 @@ public SearchResult<PatientSearchResult> search(
.sort(sorting)
.from((int) pageable.getOffset())
.size(pageable.getPageSize()),
SearchablePatient.class
);
SearchablePatient.class);

HitsMetadata<SearchablePatient> hits = response.hits();

Expand All @@ -78,8 +75,7 @@ public SearchResult<PatientSearchResult> search(

private SearchResult<PatientSearchResult> paged(
final HitsMetadata<SearchablePatient> hits,
final Pageable pageable
) {
final Pageable pageable) {
List<Long> ids = hits.hits()
.stream()
.map(hit -> Long.parseLong(hit.id()))
Expand All @@ -93,7 +89,6 @@ private SearchResult<PatientSearchResult> paged(
return resultResolver.resolve(
results,
pageable,
hits.total().value()
);
hits.total().value());
}
}
Loading
Loading