mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-19 08:12:52 +00:00
fix(labs): let an import's first number set a text-only marker's unit
Both the Health Records import and the CSV import checked the unit before writing and refused a numeric reading against a marker whose unit was still empty, although the write itself lets the first number choose it. An empty marker unit now fits any unit in unitFitsMarker; the write's conversion stays the authority.
This commit is contained in:
1 parent
8f1af43891
commit
0fedabde13
3 files changed
+203
No files matched your search
@@ -12,6 +12,7 @@ import {
|
||||
suggestInIndex,
|
||||
type IndexedMarker,
|
||||
type MarkerIndex,
|
||||
unitFitsMarker,
|
||||
} from "../biomarker-resolve";
|
||||
|
||||
let seq = 0;
|
||||
@@ -314,3 +315,40 @@ describe("a catalog hint from the source (#1400)", () => {
|
||||
).toMatchObject({ marker: { id: own.id }, matchKind: "name" });
|
||||
});
|
||||
});
|
||||
|
||||
describe("unitFitsMarker", () => {
|
||||
it("lets the first number give a text-only marker its unit", () => {
|
||||
// A marker minted from a text result has no unit yet; the first numeric
|
||||
// reading sets it, whatever unit it states.
|
||||
expect(unitFitsMarker({ unit: "", analyteKey: null }, "mg/dL", null)).toBe(
|
||||
true,
|
||||
);
|
||||
expect(
|
||||
unitFitsMarker(
|
||||
{ unit: " ", analyteKey: "glucose" },
|
||||
"mmol/L",
|
||||
"glucose",
|
||||
),
|
||||
).toBe(true);
|
||||
expect(unitFitsMarker({ unit: "", analyteKey: null }, "1", null)).toBe(
|
||||
true,
|
||||
);
|
||||
});
|
||||
|
||||
it("still refuses a unit that does not convert into a chosen one", () => {
|
||||
expect(unitFitsMarker({ unit: "1", analyteKey: null }, "mg/dL", null)).toBe(
|
||||
false,
|
||||
);
|
||||
expect(
|
||||
unitFitsMarker({ unit: "mg/dL", analyteKey: null }, "U/L", null),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it("finds a text-only marker of the catalog analyte for a numeric reading", () => {
|
||||
const text = marker("Glucose", "");
|
||||
expect(resolveInIndex(index([text]), "Blood glucose", "mg/dL")).toEqual({
|
||||
marker: text,
|
||||
matchKind: "catalog",
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -153,6 +153,12 @@ function markerCatalogKeys(
|
||||
* Whether a reading stated in `unit` can be stored under the marker: the same
|
||||
* unit, or one the conversion moves into it. No unit (a qualitative reading,
|
||||
* or none stated) always fits.
|
||||
*
|
||||
* A marker with an empty unit takes any unit: it was minted from a text
|
||||
* result and no number has chosen its unit yet, so the first numeric reading
|
||||
* gives it one when it is written (`adoptFirstNumericUnit` in
|
||||
* `./reading-conversion.ts`). The write stays the authority: should the marker
|
||||
* hold a number after all, the conversion there refuses the reading.
|
||||
*/
|
||||
export function unitFitsMarker(
|
||||
marker: Pick<IndexedMarker, "unit" | "analyteKey">,
|
||||
@@ -160,6 +166,7 @@ export function unitFitsMarker(
|
||||
analyteKey: string | null,
|
||||
): boolean {
|
||||
if (unit === null || unit === undefined || unit.trim() === "") return true;
|
||||
if (marker.unit.trim() === "") return true;
|
||||
if (sameLabUnit(unit, marker.unit)) return true;
|
||||
return convertLabValue({
|
||||
analyteKey: marker.analyteKey ?? analyteKey,
|
||||
|
||||
@@ -0,0 +1,158 @@
|
||||
/**
|
||||
* An import's first number gives a text-only marker its unit.
|
||||
*
|
||||
* A marker minted from a text result ("SEE NOTE", or a qualitative result in
|
||||
* an earlier import or an earlier chunk of the same one) has an empty unit.
|
||||
* The write itself already let the first number set it, but both imports
|
||||
* checked the unit before writing and refused the reading as a unit mismatch
|
||||
* against a unit nothing had chosen. The Health Records import and the CSV
|
||||
* import, against Postgres.
|
||||
*/
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
import { getPrismaClient, truncateAllTables } from "./setup";
|
||||
import { textToStream } from "@/lib/import/csv-stream";
|
||||
import { importLabsCsv } from "@/lib/import/labs-csv";
|
||||
import { writeFhirLabReadings } from "@/lib/labs/fhir-import/write";
|
||||
import type { MappedFhirLab } from "@/lib/labs/fhir-import/types";
|
||||
import { labsCsvQuerySchema } from "@/lib/validations/record-import";
|
||||
|
||||
vi.mock("@/lib/jobs/boss-instance", () => ({
|
||||
getGlobalBoss: vi.fn(() => null),
|
||||
}));
|
||||
|
||||
const prisma = getPrismaClient();
|
||||
const USER = "text-marker-import-number-user";
|
||||
|
||||
beforeEach(async () => {
|
||||
await truncateAllTables(prisma);
|
||||
await prisma.user.create({
|
||||
data: {
|
||||
id: USER,
|
||||
username: USER,
|
||||
timezone: "UTC",
|
||||
modulePreferencesJson: { labs: true },
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
async function textOnlyMarker(name: string) {
|
||||
const marker = await prisma.biomarker.create({
|
||||
data: { userId: USER, name, unit: "" },
|
||||
});
|
||||
await prisma.labResult.create({
|
||||
data: {
|
||||
userId: USER,
|
||||
biomarkerId: marker.id,
|
||||
analyte: name,
|
||||
unit: "",
|
||||
valueText: "SEE NOTE",
|
||||
takenAt: new Date("2026-08-01T12:00:00.000Z"),
|
||||
},
|
||||
});
|
||||
return marker;
|
||||
}
|
||||
|
||||
function reading(over: Partial<MappedFhirLab>): MappedFhirLab {
|
||||
return {
|
||||
externalId: "fhir:clinic:obs-1",
|
||||
analyte: "Ferritin",
|
||||
loinc: null,
|
||||
catalogKey: null,
|
||||
value: 85,
|
||||
valueText: null,
|
||||
unit: "ng/mL",
|
||||
takenAt: new Date("2026-09-01T07:00:00.000Z"),
|
||||
sourceReferenceLow: 30,
|
||||
sourceReferenceHigh: 400,
|
||||
sourceReferenceText: null,
|
||||
panel: null,
|
||||
note: null,
|
||||
...over,
|
||||
};
|
||||
}
|
||||
|
||||
describe("Health Records import", () => {
|
||||
it("writes the first number under a text-only marker and sets its unit", async () => {
|
||||
const marker = await textOnlyMarker("Ferritin");
|
||||
const out = await writeFhirLabReadings({
|
||||
userId: USER,
|
||||
tz: "UTC",
|
||||
readings: [reading({})],
|
||||
prisma,
|
||||
});
|
||||
expect(out.statuses).toEqual([{ status: "inserted" }]);
|
||||
const after = await prisma.biomarker.findUniqueOrThrow({
|
||||
where: { id: marker.id },
|
||||
});
|
||||
expect(after.unit).toBe("ng/mL");
|
||||
expect(
|
||||
await prisma.labResult.count({
|
||||
where: { biomarkerId: marker.id, value: 85 },
|
||||
}),
|
||||
).toBe(1);
|
||||
});
|
||||
|
||||
it("still refuses a unit that does not fit a marker holding numbers", async () => {
|
||||
const marker = await prisma.biomarker.create({
|
||||
data: { userId: USER, name: "Ferritin", unit: "ng/mL" },
|
||||
});
|
||||
await prisma.labResult.create({
|
||||
data: {
|
||||
userId: USER,
|
||||
biomarkerId: marker.id,
|
||||
analyte: "Ferritin",
|
||||
unit: "ng/mL",
|
||||
value: 50,
|
||||
takenAt: new Date("2026-08-01T12:00:00.000Z"),
|
||||
},
|
||||
});
|
||||
const out = await writeFhirLabReadings({
|
||||
userId: USER,
|
||||
tz: "UTC",
|
||||
readings: [reading({ unit: "U/L" })],
|
||||
prisma,
|
||||
});
|
||||
expect(out.statuses).toEqual([
|
||||
{ status: "failed", reason: "unit_mismatch" },
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("CSV import", () => {
|
||||
const query = (dryRun = false) =>
|
||||
labsCsvQuerySchema.parse({
|
||||
analyte: "0",
|
||||
value: "1",
|
||||
unit: "2",
|
||||
date: "3",
|
||||
dryRun: dryRun ? "1" : "0",
|
||||
});
|
||||
const csv = "Analyte;Value;Unit;Date\nFerritin;85;ng/mL;2026-09-01\n";
|
||||
|
||||
it("previews and writes the first number under a text-only marker", async () => {
|
||||
const marker = await textOnlyMarker("Ferritin");
|
||||
const preview = await importLabsCsv({
|
||||
userId: USER,
|
||||
tz: "UTC",
|
||||
stream: textToStream(csv),
|
||||
maxBytes: 1_000_000,
|
||||
query: query(true),
|
||||
});
|
||||
expect(preview.failed).toBe(0);
|
||||
|
||||
const result = await importLabsCsv({
|
||||
userId: USER,
|
||||
tz: "UTC",
|
||||
stream: textToStream(csv),
|
||||
maxBytes: 1_000_000,
|
||||
query: query(),
|
||||
});
|
||||
expect(result.failed).toBe(0);
|
||||
expect(result.inserted).toBe(1);
|
||||
const after = await prisma.biomarker.findUniqueOrThrow({
|
||||
where: { id: marker.id },
|
||||
});
|
||||
expect(after.unit).toBe("ng/mL");
|
||||
});
|
||||
});
|
||||
Reference in new issue
Block a user