@openhi/constructs 0.0.34 → 0.0.35

package/lib/rest-api-lambda.handler.mjs

@@ -347,6 +347,11 @@ function requireJsonBody(req, res) {
   }
   return { body: raw };
 }
+function requireJsonBodyAs(req, res) {
+  const result = requireJsonBody(req, res);
+  if ("errorResponse" in result) return result;
+  return { body: result.body };
+}
 function buildSearchsetBundle(basePath, entries) {
   return {
     resourceType: "Bundle",
@@ -1644,6 +1649,32 @@ async function createDataEntityRecord(entity, tenantId, workspaceId, id, resourc
     resource: resourceWithAudit
   };
 }
+function buildUpdatedResourceWithAudit(body, id, date, actorId, actorName, existingResourceStr, resourceType) {
+  const existingMeta = JSON.parse(existingResourceStr).meta;
+  const bodyWithMeta = body;
+  const resourceWithVersion = {
+    ...body,
+    resourceType,
+    id,
+    meta: {
+      ...bodyWithMeta.meta ?? {},
+      lastUpdated: date,
+      versionId: "2"
+    }
+  };
+  const resourceWithAudit = {
+    ...resourceWithVersion,
+    meta: mergeAuditIntoMeta(resourceWithVersion.meta ?? existingMeta, {
+      modifiedDate: date,
+      modifiedById: actorId,
+      modifiedByName: actorName
+    })
+  };
+  return {
+    resource: resourceWithAudit,
+    lastUpdated: date
+  };
+}
 async function updateDataEntityById(entity, tenantId, workspaceId, id, resourceLabel, context, buildPatched) {
   const existing = await entity.get({
     tenantId,
@@ -1675,9 +1706,9 @@ async function updateDataEntityById(entity, tenantId, workspaceId, id, resourceL
 
 // src/data/operations/data/encounter/encounter-create-operation.ts
 async function createEncounterOperation(params) {
-  const { context, body, id: optionalId, tableName } = params;
+  const { context, body, tableName } = params;
   const { tenantId, workspaceId, date, actorId, actorName } = context;
-  const id = body.id ?? optionalId ?? ulid();
+  const id = body.id ?? ulid();
   const meta = {
     ...body.meta ?? {},
     lastUpdated: date,
@@ -1709,7 +1740,7 @@ async function createEncounterOperation(params) {
 
 // src/data/rest-api/routes/data/encounter/encounter-create-route.ts
 async function createEncounterRoute(req, res) {
-  const bodyResult = requireJsonBody(req, res);
+  const bodyResult = requireJsonBodyAs(req, res);
   if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
   const ctx = req.openhiContext;
   const body = bodyResult.body;
@@ -1724,13 +1755,7 @@ async function createEncounterRoute(req, res) {
     });
     return res.status(201).location(`${BASE_PATH.ENCOUNTER}/${result.id}`).json(result.resource);
   } catch (err) {
-    console.error("POST Encounter error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
+    return sendOperationOutcome500(res, err, "POST Encounter error:");
   }
 }
 
@@ -1826,38 +1851,21 @@ async function updateEncounterOperation(params) {
     id,
     "Encounter",
     context,
-    (existingResourceStr) => {
-      const bodyWithResource = body;
-      const existingMeta = JSON.parse(existingResourceStr).meta;
-      const encounter = {
-        ...body,
-        resourceType: "Encounter",
-        id,
-        meta: {
-          ...bodyWithResource.meta ?? {},
-          lastUpdated: date,
-          versionId: "2"
-        }
-      };
-      const encounterWithMeta = {
-        ...encounter,
-        meta: mergeAuditIntoMeta(encounter.meta ?? existingMeta, {
-          modifiedDate: date,
-          modifiedById: actorId,
-          modifiedByName: actorName
-        })
-      };
-      return {
-        resource: encounterWithMeta,
-        lastUpdated: date
-      };
-    }
+    (existingResourceStr) => buildUpdatedResourceWithAudit(
+      body,
+      id,
+      date,
+      actorId,
+      actorName,
+      existingResourceStr,
+      "Encounter"
+    )
   );
 }
 
 // src/data/rest-api/routes/data/encounter/encounter-update-route.ts
 async function updateEncounterRoute(req, res) {
-  const bodyResult = requireJsonBody(req, res);
+  const bodyResult = requireJsonBodyAs(req, res);
   if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
   const id = String(req.params.id);
   const ctx = req.openhiContext;
@@ -2024,9 +2032,9 @@ if (__require.main === module) {
 
 // src/data/operations/data/patient/patient-create-operation.ts
 async function createPatientOperation(params) {
-  const { context, body, id: optionalId } = params;
+  const { context, body } = params;
   const { tenantId, workspaceId, date, actorId, actorName } = context;
-  const id = body.id ?? optionalId ?? ulid2();
+  const id = body.id ?? ulid2();
   const meta = {
     ...body.meta ?? {},
     lastUpdated: date,
@@ -2059,7 +2067,7 @@ async function createPatientOperation(params) {
 
 // src/data/rest-api/routes/data/patient/patient-create-route.ts
 async function createPatientRoute(req, res) {
-  const bodyResult = requireJsonBody(req, res);
+  const bodyResult = requireJsonBodyAs(req, res);
   if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
   const ctx = req.openhiContext;
   const body = bodyResult.body;
@@ -2074,13 +2082,7 @@ async function createPatientRoute(req, res) {
     });
     return res.status(201).location(`${BASE_PATH.PATIENT}/${result.id}`).json(result.resource);
   } catch (err) {
-    console.error("POST Patient error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
+    return sendOperationOutcome500(res, err, "POST Patient error:");
   }
 }
 
@@ -2176,38 +2178,21 @@ async function updatePatientOperation(params) {
     id,
     "Patient",
     context,
-    (existingResourceStr) => {
-      const bodyWithResource = body;
-      const existingMeta = JSON.parse(existingResourceStr).meta;
-      const patient = {
-        ...body,
-        resourceType: "Patient",
-        id,
-        meta: {
-          ...bodyWithResource.meta ?? {},
-          lastUpdated: date,
-          versionId: "2"
-        }
-      };
-      const patientWithMeta = {
-        ...patient,
-        meta: mergeAuditIntoMeta(patient.meta ?? existingMeta, {
-          modifiedDate: date,
-          modifiedById: actorId,
-          modifiedByName: actorName
-        })
-      };
-      return {
-        resource: patientWithMeta,
-        lastUpdated: date
-      };
-    }
+    (existingResourceStr) => buildUpdatedResourceWithAudit(
+      body,
+      id,
+      date,
+      actorId,
+      actorName,
+      existingResourceStr,
+      "Patient"
+    )
   );
 }
 
 // src/data/rest-api/routes/data/patient/patient-update-route.ts
 async function updatePatientRoute(req, res) {
-  const bodyResult = requireJsonBody(req, res);
+  const bodyResult = requireJsonBodyAs(req, res);
   if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
   const id = String(req.params.id);
   const ctx = req.openhiContext;
@@ -2248,9 +2233,9 @@ import express4 from "express";
 // src/data/operations/data/practitioner/practitioner-create-operation.ts
 import { ulid as ulid3 } from "ulid";
 async function createPractitionerOperation(params) {
-  const { context, body, id: optionalId, tableName } = params;
+  const { context, body, tableName } = params;
   const { tenantId, workspaceId, date, actorId, actorName } = context;
-  const id = body.id ?? optionalId ?? ulid3();
+  const id = body.id ?? ulid3();
   const meta = {
     ...body.meta ?? {},
     lastUpdated: date,
@@ -2282,7 +2267,7 @@ async function createPractitionerOperation(params) {
 
 // src/data/rest-api/routes/data/practitioner/practitioner-create-route.ts
 async function createPractitionerRoute(req, res) {
-  const bodyResult = requireJsonBody(req, res);
+  const bodyResult = requireJsonBodyAs(req, res);
   if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
   const ctx = req.openhiContext;
   const body = bodyResult.body;
@@ -2297,13 +2282,7 @@ async function createPractitionerRoute(req, res) {
     });
     return res.status(201).location(`${BASE_PATH.PRACTITIONER}/${result.id}`).json(result.resource);
   } catch (err) {
-    console.error("POST Practitioner error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
+    return sendOperationOutcome500(res, err, "POST Practitioner error:");
   }
 }
 
@@ -2399,38 +2378,21 @@ async function updatePractitionerOperation(params) {
     id,
     "Practitioner",
     context,
-    (existingResourceStr) => {
-      const bodyWithResource = body;
-      const existingMeta = JSON.parse(existingResourceStr).meta;
-      const practitioner = {
-        ...body,
-        resourceType: "Practitioner",
-        id,
-        meta: {
-          ...bodyWithResource.meta ?? {},
-          lastUpdated: date,
-          versionId: "2"
-        }
-      };
-      const practitionerWithMeta = {
-        ...practitioner,
-        meta: mergeAuditIntoMeta(practitioner.meta ?? existingMeta, {
-          modifiedDate: date,
-          modifiedById: actorId,
-          modifiedByName: actorName
-        })
-      };
-      return {
-        resource: practitionerWithMeta,
-        lastUpdated: date
-      };
-    }
+    (existingResourceStr) => buildUpdatedResourceWithAudit(
+      body,
+      id,
+      date,
+      actorId,
+      actorName,
+      existingResourceStr,
+      "Practitioner"
+    )
   );
 }
 
 // src/data/rest-api/routes/data/practitioner/practitioner-update-route.ts
 async function updatePractitionerRoute(req, res) {
-  const bodyResult = requireJsonBody(req, res);
+  const bodyResult = requireJsonBodyAs(req, res);
   if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
   const id = String(req.params.id);
   const ctx = req.openhiContext;