medplum / medplum / 23618919248

92%

push

github

Scheduling service type matching fixes (#8768)

* Tighten $find serviceType type annotation

In https://github.com/medplum/medplum/pull/8672 we made service-type a
required parameter, but I missed some cleanup opportunities that
introduces.

Signed-off-by: Noah Silas <noah@medplum.com>

* Rename serviceType => serviceTypeToken in some places

In https://github.com/medplum/medplum/pull/8683 we introduced some code
referring to "${system}|${code}" style strings as "token search
strings". Renaming some of these variables makes it a little more clear
which values are these tokens versus which values are the related
CodeableConcepts.

Signed-off-by: Noah Silas <noah@medplum.com>

* Fix Coding/CodeableConcept mixup

In https://github.com/medplum/medplum/pull/8333 I had started trying to
correct an early misunderstanding about CodeableConcepts and Coding
types, but I missed this detail.

One interesting challenge here: I had expected TypeScript to catch this,
but it did not. The `Coding` and `CodeableConcept` types both are
objects with exclusively optional properties, and some of those
properties overlap (`id?: string`). This means that TypeScript considers
these as "weak types"[0], and as non-disjoint types they are assignable
to each other[1].

I'm going to do a bit of exploration on how I can make these more
distinct at the type checker level, but in the meantime I've added a
test case that exercises that this matching works as anticipated from
the $find handler.

[0]: https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-4.html#weak-type-detection
[1]: https://github.com/microsoft/TypeScript/pull/3842

Signed-off-by: Noah Silas <noah@medplum.com>

---------

Signed-off-by: Noah Silas <noah@medplum.com>

17936 of 20366 branches covered (88.07%)

Branch coverage included in aggregate %.

7 of 7 new or added lines in 2 files covered. (100.0%)

32609 of 34444 relevant lines covered (94.67%)

14560.33 hits per line