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

Jump to bottom

fix(search): Log message when missing search parameter in MockClient, add tests #4604

Draft
wants to merge 10 commits into
base: main
Choose a base branch
from
Draft

fix(search): Log message when missing search parameter in MockClient, add tests #4604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3014c05
Log unknown search parameter
thejwuscript Apr 17, 2024
73eb0b0
Log unknown resource type
thejwuscript Apr 17, 2024
e52515a
Fix eslint errors
thejwuscript Apr 18, 2024
fcbb917
Fix query syntax in test
thejwuscript Apr 18, 2024
913668c
Use predefined function to validate resource type
thejwuscript Apr 27, 2024
943f20a
Fix logic for finding no match
thejwuscript Apr 27, 2024
6f015ce
Edit arrange section for tests
thejwuscript Apr 27, 2024
f50daa0
Change test expectation to throw
thejwuscript Apr 27, 2024
7a59d7e
[autofix.ci] apply automated fixes
autofix-ci[bot] May 7, 2024
29287a9
wip(search): make sure throwing doesn't break access policy eval
ThatOneBro May 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
Prev Previous commit
Next Next commit
Use predefined function to validate resource type
  • Loading branch information
@thejwuscript @ThatOneBro
thejwuscript authored and ThatOneBro committed May 28, 2024
commit 913668ccfea9100ca1d995d86cf3153ccb617637
2 changes: 2 additions & 0 deletions packages/fhir-router/src/fhirrouter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
normalizeOperationOutcome,
notFound,
parseSearchRequest,
validateResourceType
} from '@medplum/core';
import { OperationOutcome, Resource, ResourceType } from '@medplum/fhirtypes';
import type { IncomingHttpHeaders } from 'node:http';
Expand Down Expand Up @@ -45,6 +46,7 @@ async function batch(req: FhirRequest, repo: FhirRepository, router: FhirRouter)
// Search
async function search(req: FhirRequest, repo: FhirRepository): Promise<FhirResponse> {
const { resourceType } = req.params;
validateResourceType(resourceType);
const query = req.query as Record<string, string[] | string | undefined>;
const bundle = await repo.search(parseSearchRequest(resourceType as ResourceType, query));
return [allOk, bundle];
Expand Down
3 changes: 0 additions & 3 deletions packages/fhir-router/src/repo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,6 @@ export class MemoryRepository extends BaseRepository implements FhirRepository {

async search<T extends Resource>(searchRequest: SearchRequest<T>): Promise<Bundle<T>> {
const { resourceType } = searchRequest;
if (!this.resources.has(resourceType)) {
throw new Error(`Unknown resource type: ${resourceType}`);
}
const resources = this.resources.get(resourceType) ?? new Map();
const result = [];
for (const resource of resources.values()) {
Expand Down