@openhi/constructs 0.0.26 → 0.0.27

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

@@ -55,19 +55,31 @@ function openHiContextMiddleware(req, res, next) {
     });
     return;
   }
+  const invoke = getCurrentInvoke();
+  const event = invoke?.event ?? req.apiGateway?.event;
+  const requestId = typeof event?.requestContext?.requestId === "string" ? event.requestContext.requestId : void 0;
   req.openhiContext = {
     tenantId: claims.openhi_tenant_id,
     workspaceId: claims.openhi_workspace_id,
     date: (/* @__PURE__ */ new Date()).toISOString(),
-    userId: claims.openhi_user_id,
-    username: claims.openhi_user_name
+    actorId: claims.openhi_user_id,
+    actorName: claims.openhi_user_name,
+    actorType: "human",
+    roleId: typeof claims.openhi_role_id === "string" && claims.openhi_role_id !== "" ? claims.openhi_role_id : void 0,
+    requestId,
+    source: "rest",
+    clientId: typeof claims.openhi_client_id === "string" && claims.openhi_client_id !== "" ? claims.openhi_client_id : void 0
   };
   next();
 }
 
-// src/data/rest-api/ehr/r4/Patient.ts
+// src/data/rest-api/routes/configuration/configuration.ts
 import express from "express";
 
+// src/data/rest-api/routes/configuration/configuration-common.ts
+var BASE_PATH = "/Configuration";
+var SK = "CURRENT";
+
 // src/lib/compression.ts
 import { gzipSync, gunzipSync } from "zlib";
 var ENVELOPE_VERSION = 1;
@@ -124,16 +136,124 @@ function decompressResource(compressedOrRaw) {
   return compressedOrRaw;
 }
 
-// src/data/dynamo/ehr/r4/ehr-r4-data-service.ts
+// src/data/dynamo/dynamo-service.ts
 import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { Service } from "electrodb";
 
-// src/data/dynamo/ehr/r4/Patient.ts
+// src/data/dynamo/entities/configuration.ts
 import { Entity } from "electrodb";
-var Patient = new Entity({
+var Configuration = new Entity({
+  model: {
+    entity: "configuration",
+    service: "openhi",
+    version: "01"
+  },
+  attributes: {
+    /** Sort key. "CURRENT" for current version; version history in S3. */
+    sk: {
+      type: "string",
+      required: true,
+      default: "CURRENT"
+    },
+    /** Tenant scope. Use "BASELINE" when the config is baseline default (no tenant). */
+    tenantId: {
+      type: "string",
+      required: true,
+      default: "BASELINE"
+    },
+    /** Workspace scope. Use "-" when absent. */
+    workspaceId: {
+      type: "string",
+      required: true,
+      default: "-"
+    },
+    /** User scope. Use "-" when absent. */
+    userId: {
+      type: "string",
+      required: true,
+      default: "-"
+    },
+    /** Role scope. Use "-" when absent. */
+    roleId: {
+      type: "string",
+      required: true,
+      default: "-"
+    },
+    /** Config type (category), e.g. endpoints, branding, display. */
+    key: {
+      type: "string",
+      required: true
+    },
+    /** FHIR Resource.id; logical id in URL and for the Configuration resource. */
+    id: {
+      type: "string",
+      required: true
+    },
+    /** Payload as JSON string. JSON.stringify(resource) on write; JSON.parse(item.resource) on read. */
+    resource: {
+      type: "string",
+      required: true
+    },
+    /** Version id (e.g. ULID). Tracks current version; S3 history key. */
+    vid: {
+      type: "string",
+      required: true
+    },
+    lastUpdated: {
+      type: "string",
+      required: true
+    },
+    deleted: {
+      type: "boolean",
+      required: false
+    },
+    bundleId: {
+      type: "string",
+      required: false
+    },
+    msgId: {
+      type: "string",
+      required: false
+    }
+  },
+  indexes: {
+    /** Base table: PK, SK (data store key names). PK is built from tenantId, workspaceId, userId, roleId; SK is built from key and sk. Do not supply PK or SK from outside. */
+    record: {
+      pk: {
+        field: "PK",
+        composite: ["tenantId", "workspaceId", "userId", "roleId"],
+        template: "OHI#CONFIG#TID#${tenantId}#WID#${workspaceId}#UID#${userId}#RID#${roleId}"
+      },
+      sk: {
+        field: "SK",
+        composite: ["key", "sk"],
+        template: "KEY#${key}#SK#${sk}"
+      }
+    },
+    /** GSI4 — Resource Type Index: list all Configuration in a tenant or workspace (no scan). Use for "list configs scoped to this tenant" (workspaceId = "-") or "list configs scoped to this workspace". Does not support hierarchical resolution in one query; use base table GetItem in fallback order (user → workspace → tenant → baseline) for that. */
+    gsi4: {
+      index: "GSI4",
+      condition: () => true,
+      pk: {
+        field: "GSI4PK",
+        composite: ["tenantId", "workspaceId"],
+        template: "TID#${tenantId}#WID#${workspaceId}#RT#Configuration"
+      },
+      sk: {
+        field: "GSI4SK",
+        composite: ["key", "sk"],
+        template: "KEY#${key}#SK#${sk}"
+      }
+    }
+  }
+});
+
+// src/data/dynamo/entities/patient.ts
+import { Entity as Entity2 } from "electrodb";
+var Patient = new Entity2({
   model: {
     entity: "patient",
-    service: "fhir",
+    service: "openhi",
     version: "01"
   },
   attributes: {
@@ -309,7 +429,7 @@ var Patient = new Entity({
   }
 });
 
-// src/data/dynamo/ehr/r4/ehr-r4-data-service.ts
+// src/data/dynamo/dynamo-service.ts
 var table = process.env.DYNAMO_TABLE_NAME ?? "jesttesttable";
 var client = new DynamoDBClient({
   ...process.env.MOCK_DYNAMODB_ENDPOINT && {
@@ -318,171 +438,275 @@ var client = new DynamoDBClient({
     region: "local"
   }
 });
-var entities = { patient: Patient };
-var EhrR4DataService = new Service(entities, { table, client });
-function getEhrR4DataService(tableName) {
-  return new Service(entities, { table: tableName, client });
+var entities = { patient: Patient, configuration: Configuration };
+var DynamoDataService = new Service(entities, { table, client });
+function getDynamoDataService(tableName) {
+  const resolved = tableName ?? table;
+  return new Service(entities, { table: resolved, client });
 }
 
-// src/data/import-patient.ts
-import { readFileSync } from "fs";
-import { resolve } from "path";
-var OPENHI_EXT = "http://openhi.org/fhir/StructureDefinition";
-function mergeAuditIntoMeta(meta, audit) {
-  const existing = meta ?? {};
-  const ext = [
-    ...Array.isArray(existing.extension) ? existing.extension : []
-  ];
-  const byUrl = new Map(ext.map((e) => [e.url, e]));
-  function set(url, value, type) {
-    if (value == null) return;
-    byUrl.set(url, { url, [type]: value });
+// src/data/rest-api/routes/configuration/configuration-create.ts
+async function createConfiguration(req, res) {
+  const ctx = req.openhiContext;
+  const {
+    tenantId: ctxTenantId,
+    workspaceId: ctxWorkspaceId,
+    actorId: ctxActorId,
+    date
+  } = ctx;
+  const body = req.body;
+  const key = body?.key;
+  if (!key || typeof key !== "string") {
+    return res.status(400).json({
+      resourceType: "OperationOutcome",
+      issue: [
+        {
+          severity: "error",
+          code: "required",
+          diagnostics: "Configuration key is required"
+        }
+      ]
+    });
+  }
+  const id = body?.id ?? `config-${key}-${Date.now()}`;
+  const resourcePayload = body?.resource;
+  const resourceStr = typeof resourcePayload === "string" ? resourcePayload : JSON.stringify(resourcePayload ?? {});
+  const tenantId = body?.tenantId ?? ctxTenantId;
+  const workspaceId = body?.workspaceId ?? ctxWorkspaceId;
+  const userId = body?.userId ?? ctxActorId ?? "-";
+  const roleId = body?.roleId ?? "-";
+  const vid = body?.vid ?? (date.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36));
+  const lastUpdated = body?.lastUpdated ?? date;
+  const service = getDynamoDataService();
+  try {
+    await service.entities.configuration.put({
+      tenantId,
+      workspaceId,
+      userId,
+      roleId,
+      key,
+      id,
+      resource: compressResource(resourceStr),
+      vid,
+      lastUpdated,
+      sk: SK
+    }).go();
+    const config = {
+      resourceType: "Configuration",
+      id,
+      key,
+      resource: typeof resourcePayload === "object" ? resourcePayload : JSON.parse(resourceStr),
+      meta: { lastUpdated, versionId: vid }
+    };
+    return res.status(201).location(`${BASE_PATH}/${key}`).json(config);
+  } catch (err) {
+    console.error("POST Configuration error:", err);
+    return res.status(500).json({
+      resourceType: "OperationOutcome",
+      issue: [
+        { severity: "error", code: "exception", diagnostics: String(err) }
+      ]
+    });
   }
-  set(`${OPENHI_EXT}/created-date`, audit.createdDate, "valueDateTime");
-  set(`${OPENHI_EXT}/created-by-id`, audit.createdById, "valueString");
-  set(`${OPENHI_EXT}/created-by-name`, audit.createdByName, "valueString");
-  set(`${OPENHI_EXT}/modified-date`, audit.modifiedDate, "valueDateTime");
-  set(`${OPENHI_EXT}/modified-by-id`, audit.modifiedById, "valueString");
-  set(`${OPENHI_EXT}/modified-by-name`, audit.modifiedByName, "valueString");
-  set(`${OPENHI_EXT}/deleted-date`, audit.deletedDate, "valueDateTime");
-  set(`${OPENHI_EXT}/deleted-by-id`, audit.deletedById, "valueString");
-  set(`${OPENHI_EXT}/deleted-by-name`, audit.deletedByName, "valueString");
-  return { ...existing, extension: Array.from(byUrl.values()) };
 }
-function extractPatient(parsed) {
-  if (parsed && typeof parsed === "object" && "resourceType" in parsed) {
-    const root = parsed;
-    if (root.resourceType === "Patient" && root.id) {
-      return root;
+
+// src/data/rest-api/routes/configuration/configuration-delete.ts
+async function deleteConfiguration(req, res) {
+  const key = String(req.params.key);
+  const ctx = req.openhiContext;
+  const { tenantId, workspaceId, actorId, roleId: ctxRoleId } = ctx;
+  const roleId = ctxRoleId ?? "-";
+  const service = getDynamoDataService();
+  try {
+    await service.entities.configuration.delete({ tenantId, workspaceId, userId: actorId, roleId, key, sk: SK }).go();
+    return res.status(204).send();
+  } catch (err) {
+    console.error("DELETE Configuration error:", err);
+    return res.status(500).json({
+      resourceType: "OperationOutcome",
+      issue: [
+        { severity: "error", code: "exception", diagnostics: String(err) }
+      ]
+    });
+  }
+}
+
+// src/data/rest-api/routes/configuration/configuration-get-by-key.ts
+async function getConfigurationByKey(req, res) {
+  const key = String(req.params.key);
+  const ctx = req.openhiContext;
+  const { tenantId, workspaceId, actorId, roleId: ctxRoleId } = ctx;
+  const roleId = ctxRoleId ?? "-";
+  const service = getDynamoDataService();
+  try {
+    const result = await service.entities.configuration.get({ tenantId, workspaceId, userId: actorId, roleId, key, sk: SK }).go();
+    if (!result.data) {
+      return res.status(404).json({
+        resourceType: "OperationOutcome",
+        issue: [
+          {
+            severity: "error",
+            code: "not-found",
+            diagnostics: `Configuration ${key} not found`
+          }
+        ]
+      });
     }
-    if (root.resourceType === "Bundle" && "entry" in parsed) {
-      const entries = parsed.entry;
-      if (Array.isArray(entries)) {
-        const patientEntry = entries.find(
-          (e) => e?.resource?.resourceType === "Patient" && e.resource.id
-        );
-        if (patientEntry?.resource) {
-          return patientEntry.resource;
+    const resource = JSON.parse(
+      decompressResource(result.data.resource)
+    );
+    return res.json({
+      ...resource,
+      resourceType: "Configuration",
+      id: result.data.id,
+      key: result.data.key
+    });
+  } catch (err) {
+    console.error("GET Configuration error:", err);
+    return res.status(500).json({
+      resourceType: "OperationOutcome",
+      issue: [
+        {
+          severity: "error",
+          code: "exception",
+          diagnostics: String(err)
         }
-      }
-    }
+      ]
+    });
   }
-  throw new Error(
-    "File must be a FHIR Patient resource or a Bundle containing at least one Patient entry"
-  );
-}
-var SK = "CURRENT";
-var defaultAudit = {
-  createdDate: (/* @__PURE__ */ new Date()).toISOString(),
-  createdById: "import",
-  createdByName: "Bulk import",
-  modifiedDate: (/* @__PURE__ */ new Date()).toISOString(),
-  modifiedById: "import",
-  modifiedByName: "Bulk import"
-};
-function patientToPutAttrs(patient, options) {
-  const {
-    tenantId,
-    workspaceId,
-    createdDate,
-    createdById,
-    createdByName,
-    modifiedDate,
-    modifiedById,
-    modifiedByName
-  } = options;
-  const lastUpdated = patient.meta?.lastUpdated ?? modifiedDate ?? defaultAudit.modifiedDate ?? (/* @__PURE__ */ new Date()).toISOString();
-  const auditMerged = {
-    ...defaultAudit,
-    ...createdDate != null && { createdDate },
-    ...createdById != null && { createdById },
-    ...createdByName != null && { createdByName },
-    ...modifiedDate != null && { modifiedDate },
-    ...modifiedById != null && { modifiedById },
-    ...modifiedByName != null && { modifiedByName }
-  };
-  const patientWithMeta = {
-    ...patient,
-    meta: mergeAuditIntoMeta(patient.meta, auditMerged)
-  };
-  if (lastUpdated && !patientWithMeta.meta.lastUpdated) {
-    patientWithMeta.meta.lastUpdated = lastUpdated;
-  }
-  return {
-    sk: SK,
-    tenantId,
-    workspaceId,
-    id: patient.id,
-    resource: compressResource(JSON.stringify(patientWithMeta)),
-    vid: lastUpdated.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36),
-    lastUpdated,
-    identifierSystem: "",
-    identifierValue: "",
-    facilityId: "",
-    normalizedName: ""
-  };
 }
-async function importPatientFromFile(filePath, options) {
-  const resolved = resolve(filePath);
-  const raw = readFileSync(resolved, "utf-8");
-  const parsed = JSON.parse(raw);
-  const patient = extractPatient(parsed);
-  const tableName = options.tableName ?? process.env.DYNAMO_TABLE_NAME ?? "jesttesttable";
-  const service = getEhrR4DataService(tableName);
-  const attrs = patientToPutAttrs(patient, options);
-  const result = await service.entities.patient.put(attrs).go();
-  const data = result.data;
-  if (!data) {
-    throw new Error(`Put failed for Patient ${patient.id}`);
+
+// src/data/rest-api/dynamic-configuration.ts
+import {
+  DescribeParametersCommand,
+  GetParametersCommand,
+  SSMClient
+} from "@aws-sdk/client-ssm";
+var BASE_PATH2 = "/Configuration";
+var TAG_KEY_BRANCH = "openhi:branch-name";
+var TAG_KEY_HTTP_API_PARAM = "openhi:param-name";
+function getSsmDynamicConfigEnvFilter() {
+  const branchTagValue = process.env.BRANCH_TAG_VALUE;
+  const httpApiTagValue = process.env.HTTP_API_TAG_VALUE;
+  if (branchTagValue == null || branchTagValue === "" || httpApiTagValue == null || httpApiTagValue === "") {
+    return null;
   }
-  return {
-    id: data.id,
-    tenantId: data.tenantId,
-    workspaceId: data.workspaceId
-  };
+  return { branchTagValue, httpApiTagValue };
 }
-async function main() {
-  const [, , fileArg, tenantId = "tenant-1", workspaceId = "ws-1"] = process.argv;
-  if (!fileArg) {
-    console.error(
-      "Usage: import-patient.ts <path-to-patient.json> [tenantId] [workspaceId]"
-    );
-    process.exit(1);
+async function getDynamicConfigurationEntries(context) {
+  const envFilter = getSsmDynamicConfigEnvFilter();
+  if (envFilter == null) {
+    return getStaticDummyEntry(context);
   }
+  const region = process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION;
+  const client2 = new SSMClient({ region });
   try {
-    const result = await importPatientFromFile(fileArg, {
-      tenantId,
-      workspaceId
-    });
-    console.log(
-      `Imported Patient ${result.id} (tenant=${result.tenantId}, workspace=${result.workspaceId})`
+    const describeResult = await client2.send(
+      new DescribeParametersCommand({
+        ParameterFilters: [
+          {
+            Key: `tag:${TAG_KEY_BRANCH}`,
+            Option: "Equals",
+            Values: [envFilter.branchTagValue]
+          },
+          {
+            Key: `tag:${TAG_KEY_HTTP_API_PARAM}`,
+            Option: "Equals",
+            Values: [envFilter.httpApiTagValue]
+          }
+        ],
+        MaxResults: 50
+      })
     );
+    const names = (describeResult.Parameters ?? []).map((p) => p.Name).filter((n) => n != null);
+    if (names.length === 0) {
+      return getStaticDummyEntry(context);
+    }
+    const parameters = [];
+    for (let i = 0; i < names.length; i += 10) {
+      const batch = names.slice(i, i + 10);
+      const getResult = await client2.send(
+        new GetParametersCommand({
+          Names: batch,
+          WithDecryption: true
+        })
+      );
+      for (const p of getResult.Parameters ?? []) {
+        const name = p.Name;
+        const value = p.Value;
+        if (name != null && value != null) {
+          parameters.push({ name, value });
+        }
+      }
+    }
+    const parameterList = parameters.map((p) => {
+      const shortName = p.name.includes("/") ? p.name.split("/").slice(-1)[0] : p.name;
+      return { name: shortName, valueString: p.value };
+    });
+    const entry = {
+      fullUrl: `${BASE_PATH2}/ssm-dynamic`,
+      resource: {
+        resourceType: "Configuration",
+        id: "ssm-dynamic",
+        key: "ssm-dynamic",
+        resource: {
+          parameter: parameterList
+        },
+        meta: {
+          lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
+          versionId: "1"
+        }
+      }
+    };
+    return [entry];
   } catch (err) {
-    console.error(err);
-    process.exit(1);
+    console.error("getDynamicConfigurationEntries SSM error:", err);
+    return getStaticDummyEntry(context);
   }
 }
-if (__require.main === module) {
-  void main();
+function getStaticDummyEntry(_context) {
+  const dummy = {
+    fullUrl: `${BASE_PATH2}/dynamic-dummy`,
+    resource: {
+      resourceType: "Configuration",
+      id: "dynamic-dummy",
+      key: "dynamic-dummy",
+      resource: {
+        parameter: [
+          {
+            name: "description",
+            valueString: "Statically generated dummy configuration (not from DynamoDB)."
+          },
+          { name: "source", valueString: "dynamic-configuration" }
+        ]
+      },
+      meta: {
+        lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
+        versionId: "1"
+      }
+    }
+  };
+  return [dummy];
 }
 
-// src/data/rest-api/ehr/r4/Patient.ts
-var BASE_PATH = "/ehr/r4/Patient";
-var router = express.Router();
-var SK2 = "CURRENT";
-var TABLE_NAME = process.env.DYNAMO_TABLE_NAME ?? "jesttesttable";
-async function listPatients(req, res) {
+// src/data/rest-api/routes/configuration/configuration-list.ts
+async function listConfigurations(req, res) {
   const { tenantId, workspaceId } = req.openhiContext;
-  const service = getEhrR4DataService(TABLE_NAME);
+  const service = getDynamoDataService();
   try {
-    const result = await service.entities.patient.query.gsi4({ tenantId, workspaceId }).go();
-    const entries = (result.data ?? []).map((item) => {
+    const result = await service.entities.configuration.query.gsi4({ tenantId, workspaceId }).go();
+    const dynamoEntries = (result.data ?? []).map((item) => {
       const resource = JSON.parse(decompressResource(item.resource));
       return {
-        fullUrl: `${BASE_PATH}/${item.id}`,
-        resource: { ...resource, id: item.id }
+        fullUrl: `${BASE_PATH}/${item.key}`,
+        resource: { ...resource, id: item.id, key: item.key }
       };
     });
+    const dynamicEntries = await getDynamicConfigurationEntries({
+      tenantId,
+      workspaceId
+    });
+    const entries = [...dynamoEntries, ...dynamicEntries];
     const bundle = {
       resourceType: "Bundle",
       type: "searchset",
@@ -492,7 +716,7 @@ async function listPatients(req, res) {
     };
     return res.json(bundle);
   } catch (err) {
-    console.error("GET /Patient list error:", err);
+    console.error("GET /Configuration list error:", err);
     return res.status(500).json({
       resourceType: "OperationOutcome",
       issue: [
@@ -505,44 +729,71 @@ async function listPatients(req, res) {
     });
   }
 }
-router.get("/", listPatients);
-async function getPatientById(req, res) {
-  const id = String(req.params.id);
-  const { tenantId, workspaceId } = req.openhiContext;
-  const service = getEhrR4DataService(TABLE_NAME);
+
+// src/data/rest-api/routes/configuration/configuration-update.ts
+async function updateConfiguration(req, res) {
+  const key = String(req.params.key);
+  const ctx = req.openhiContext;
+  const { tenantId, workspaceId, actorId, date, roleId: ctxRoleId } = ctx;
+  const roleId = ctxRoleId ?? "-";
+  const body = req.body;
+  const resourcePayload = body?.resource;
+  const resourceStr = typeof resourcePayload === "string" ? resourcePayload : JSON.stringify(resourcePayload ?? {});
+  const lastUpdated = body?.lastUpdated ?? date;
+  const service = getDynamoDataService();
   try {
-    const result = await service.entities.patient.get({ tenantId, workspaceId, id, sk: "CURRENT" }).go();
-    if (!result.data) {
+    const existing = await service.entities.configuration.get({ tenantId, workspaceId, userId: actorId, roleId, key, sk: SK }).go();
+    if (!existing.data) {
       return res.status(404).json({
         resourceType: "OperationOutcome",
         issue: [
           {
             severity: "error",
             code: "not-found",
-            diagnostics: `Patient ${id} not found`
+            diagnostics: `Configuration ${key} not found`
           }
         ]
       });
     }
-    const resource = JSON.parse(
-      decompressResource(result.data.resource)
-    );
-    return res.json({ ...resource, id: result.data.id });
+    const nextVid = existing.data.vid != null ? String(Number(existing.data.vid) + 1) : date.replace(/[-:T.Z]/g, "").slice(0, 12) || "2";
+    await service.entities.configuration.patch({ tenantId, workspaceId, userId: actorId, roleId, key, sk: SK }).set({
+      resource: compressResource(resourceStr),
+      lastUpdated,
+      vid: nextVid
+    }).go();
+    const config = {
+      resourceType: "Configuration",
+      id: existing.data.id,
+      key: existing.data.key,
+      resource: typeof resourcePayload === "object" ? resourcePayload : JSON.parse(resourceStr),
+      meta: { lastUpdated, versionId: nextVid }
+    };
+    return res.json(config);
   } catch (err) {
-    console.error("GET Patient error:", err);
+    console.error("PUT Configuration error:", err);
     return res.status(500).json({
       resourceType: "OperationOutcome",
       issue: [
-        {
-          severity: "error",
-          code: "exception",
-          diagnostics: String(err)
-        }
+        { severity: "error", code: "exception", diagnostics: String(err) }
       ]
     });
   }
 }
-router.get("/:id", getPatientById);
+
+// src/data/rest-api/routes/configuration/configuration.ts
+var router = express.Router();
+router.get("/", listConfigurations);
+router.get("/:key", getConfigurationByKey);
+router.post("/", createConfiguration);
+router.put("/:key", updateConfiguration);
+router.delete("/:key", deleteConfiguration);
+
+// src/data/rest-api/routes/patient/patient.ts
+import express2 from "express";
+
+// src/data/rest-api/routes/patient/patient-common.ts
+var BASE_PATH3 = "/Patient";
+var SK2 = "CURRENT";
 function requireJsonBody(req, res) {
   const raw = req.body;
   if (raw == null || typeof raw !== "object" || Array.isArray(raw)) {
@@ -561,426 +812,220 @@ function requireJsonBody(req, res) {
   }
   return { body: raw };
 }
-async function createPatient(req, res) {
-  const bodyResult = requireJsonBody(req, res);
-  if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
-  const ctx = req.openhiContext;
-  const { tenantId, workspaceId, date, userId, username } = ctx;
-  const body = bodyResult.body;
-  const id = body?.id ?? `patient-${Date.now()}`;
-  const patient = {
-    ...body,
-    resourceType: "Patient",
-    id,
-    meta: {
-      ...body?.meta ?? {},
-      lastUpdated: date,
-      versionId: "1"
-    }
-  };
-  const options = {
-    tenantId,
-    workspaceId,
-    createdDate: date,
-    createdById: userId,
-    createdByName: username,
-    modifiedDate: date,
-    modifiedById: userId,
-    modifiedByName: username
-  };
-  const service = getEhrR4DataService(TABLE_NAME);
-  try {
-    const attrs = patientToPutAttrs(patient, options);
-    await service.entities.patient.put(
-      attrs
-    ).go();
-    return res.status(201).location(`${BASE_PATH}/${id}`).json(patient);
-  } catch (err) {
-    console.error("POST Patient error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
-  }
-}
-router.post("/", createPatient);
-async function updatePatient(req, res) {
-  const bodyResult = requireJsonBody(req, res);
-  if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
-  const id = String(req.params.id);
-  const ctx = req.openhiContext;
-  const { tenantId, workspaceId, date, userId, username } = ctx;
-  const body = bodyResult.body;
-  const patient = {
-    ...body,
-    resourceType: "Patient",
-    id,
-    meta: {
-      ...body?.meta ?? {},
-      lastUpdated: date,
-      versionId: "2"
-    }
-  };
-  const service = getEhrR4DataService(TABLE_NAME);
-  try {
-    const existing = await service.entities.patient.get({ tenantId, workspaceId, id, sk: SK2 }).go();
-    if (!existing.data) {
-      return res.status(404).json({
-        resourceType: "OperationOutcome",
-        issue: [
-          {
-            severity: "error",
-            code: "not-found",
-            diagnostics: `Patient ${id} not found`
-          }
-        ]
-      });
-    }
-    const existingMeta = existing.data.resource != null ? JSON.parse(decompressResource(existing.data.resource)).meta : void 0;
-    const patientWithMeta = {
-      ...patient,
-      meta: mergeAuditIntoMeta(
-        patient.meta ?? existingMeta,
-        {
-          modifiedDate: date,
-          modifiedById: userId,
-          modifiedByName: username
-        }
-      )
-    };
-    await service.entities.patient.patch({ tenantId, workspaceId, id, sk: SK2 }).set({
-      resource: compressResource(JSON.stringify(patientWithMeta)),
-      lastUpdated: date
-    }).go();
-    return res.json(patientWithMeta);
-  } catch (err) {
-    console.error("PUT Patient error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
-  }
-}
-router.put("/:id", updatePatient);
-async function deletePatient(req, res) {
-  const id = String(req.params.id);
-  const { tenantId, workspaceId } = req.openhiContext;
-  const service = getEhrR4DataService(TABLE_NAME);
-  try {
-    await service.entities.patient.delete({ tenantId, workspaceId, id, sk: SK2 }).go();
-    return res.status(204).send();
-  } catch (err) {
-    console.error("DELETE Patient error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
-  }
-}
-router.delete("/:id", deletePatient);
-
-// src/data/rest-api/ohi/Configuration.ts
-import express2 from "express";
 
-// src/data/rest-api/ohi/dynamic-configuration.ts
-import {
-  DescribeParametersCommand,
-  GetParametersCommand,
-  SSMClient
-} from "@aws-sdk/client-ssm";
-var BASE_PATH2 = "/ohi/Configuration";
-var TAG_KEY_BRANCH = "openhi:branch-name";
-var TAG_KEY_HTTP_API_PARAM = "openhi:param-name";
-function getSsmDynamicConfigEnvFilter() {
-  const branchTagValue = process.env.BRANCH_TAG_VALUE;
-  const httpApiTagValue = process.env.HTTP_API_TAG_VALUE;
-  if (branchTagValue == null || branchTagValue === "" || httpApiTagValue == null || httpApiTagValue === "") {
-    return null;
+// src/data/import-patient.ts
+import { readFileSync } from "fs";
+import { resolve } from "path";
+var OPENHI_EXT = "http://openhi.org/fhir/StructureDefinition";
+function mergeAuditIntoMeta(meta, audit) {
+  const existing = meta ?? {};
+  const ext = [
+    ...Array.isArray(existing.extension) ? existing.extension : []
+  ];
+  const byUrl = new Map(ext.map((e) => [e.url, e]));
+  function set(url, value, type) {
+    if (value == null) return;
+    byUrl.set(url, { url, [type]: value });
   }
-  return { branchTagValue, httpApiTagValue };
+  set(`${OPENHI_EXT}/created-date`, audit.createdDate, "valueDateTime");
+  set(`${OPENHI_EXT}/created-by-id`, audit.createdById, "valueString");
+  set(`${OPENHI_EXT}/created-by-name`, audit.createdByName, "valueString");
+  set(`${OPENHI_EXT}/modified-date`, audit.modifiedDate, "valueDateTime");
+  set(`${OPENHI_EXT}/modified-by-id`, audit.modifiedById, "valueString");
+  set(`${OPENHI_EXT}/modified-by-name`, audit.modifiedByName, "valueString");
+  set(`${OPENHI_EXT}/deleted-date`, audit.deletedDate, "valueDateTime");
+  set(`${OPENHI_EXT}/deleted-by-id`, audit.deletedById, "valueString");
+  set(`${OPENHI_EXT}/deleted-by-name`, audit.deletedByName, "valueString");
+  return { ...existing, extension: Array.from(byUrl.values()) };
 }
-async function getDynamicConfigurationEntries(context) {
-  const envFilter = getSsmDynamicConfigEnvFilter();
-  if (envFilter == null) {
-    return getStaticDummyEntry(context);
-  }
-  const region = process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION;
-  const client3 = new SSMClient({ region });
-  try {
-    const describeResult = await client3.send(
-      new DescribeParametersCommand({
-        ParameterFilters: [
-          {
-            Key: `tag:${TAG_KEY_BRANCH}`,
-            Option: "Equals",
-            Values: [envFilter.branchTagValue]
-          },
-          {
-            Key: `tag:${TAG_KEY_HTTP_API_PARAM}`,
-            Option: "Equals",
-            Values: [envFilter.httpApiTagValue]
-          }
-        ],
-        MaxResults: 50
-      })
-    );
-    const names = (describeResult.Parameters ?? []).map((p) => p.Name).filter((n) => n != null);
-    if (names.length === 0) {
-      return getStaticDummyEntry(context);
+function extractPatient(parsed) {
+  if (parsed && typeof parsed === "object" && "resourceType" in parsed) {
+    const root = parsed;
+    if (root.resourceType === "Patient" && root.id) {
+      return root;
     }
-    const parameters = [];
-    for (let i = 0; i < names.length; i += 10) {
-      const batch = names.slice(i, i + 10);
-      const getResult = await client3.send(
-        new GetParametersCommand({
-          Names: batch,
-          WithDecryption: true
-        })
-      );
-      for (const p of getResult.Parameters ?? []) {
-        const name = p.Name;
-        const value = p.Value;
-        if (name != null && value != null) {
-          parameters.push({ name, value });
+    if (root.resourceType === "Bundle" && "entry" in parsed) {
+      const entries = parsed.entry;
+      if (Array.isArray(entries)) {
+        const patientEntry = entries.find(
+          (e) => e?.resource?.resourceType === "Patient" && e.resource.id
+        );
+        if (patientEntry?.resource) {
+          return patientEntry.resource;
         }
       }
     }
-    const parameterList = parameters.map((p) => {
-      const shortName = p.name.includes("/") ? p.name.split("/").slice(-1)[0] : p.name;
-      return { name: shortName, valueString: p.value };
-    });
-    const entry = {
-      fullUrl: `${BASE_PATH2}/ssm-dynamic`,
-      resource: {
-        resourceType: "Configuration",
-        id: "ssm-dynamic",
-        key: "ssm-dynamic",
-        resource: {
-          parameter: parameterList
-        },
-        meta: {
-          lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
-          versionId: "1"
-        }
-      }
-    };
-    return [entry];
-  } catch (err) {
-    console.error("getDynamicConfigurationEntries SSM error:", err);
-    return getStaticDummyEntry(context);
   }
+  throw new Error(
+    "File must be a FHIR Patient resource or a Bundle containing at least one Patient entry"
+  );
 }
-function getStaticDummyEntry(_context) {
-  const dummy = {
-    fullUrl: `${BASE_PATH2}/dynamic-dummy`,
-    resource: {
-      resourceType: "Configuration",
-      id: "dynamic-dummy",
-      key: "dynamic-dummy",
-      resource: {
-        parameter: [
-          {
-            name: "description",
-            valueString: "Statically generated dummy configuration (not from DynamoDB)."
-          },
-          { name: "source", valueString: "dynamic-configuration" }
-        ]
-      },
-      meta: {
-        lastUpdated: (/* @__PURE__ */ new Date()).toISOString(),
-        versionId: "1"
-      }
-    }
+var SK3 = "CURRENT";
+var defaultAudit = {
+  createdDate: (/* @__PURE__ */ new Date()).toISOString(),
+  createdById: "import",
+  createdByName: "Bulk import",
+  modifiedDate: (/* @__PURE__ */ new Date()).toISOString(),
+  modifiedById: "import",
+  modifiedByName: "Bulk import"
+};
+function patientToPutAttrs(patient, options) {
+  const {
+    tenantId,
+    workspaceId,
+    createdDate,
+    createdById,
+    createdByName,
+    modifiedDate,
+    modifiedById,
+    modifiedByName
+  } = options;
+  const lastUpdated = patient.meta?.lastUpdated ?? modifiedDate ?? defaultAudit.modifiedDate ?? (/* @__PURE__ */ new Date()).toISOString();
+  const auditMerged = {
+    ...defaultAudit,
+    ...createdDate != null && { createdDate },
+    ...createdById != null && { createdById },
+    ...createdByName != null && { createdByName },
+    ...modifiedDate != null && { modifiedDate },
+    ...modifiedById != null && { modifiedById },
+    ...modifiedByName != null && { modifiedByName }
+  };
+  const patientWithMeta = {
+    ...patient,
+    meta: mergeAuditIntoMeta(patient.meta, auditMerged)
+  };
+  if (lastUpdated && !patientWithMeta.meta.lastUpdated) {
+    patientWithMeta.meta.lastUpdated = lastUpdated;
+  }
+  return {
+    sk: SK3,
+    tenantId,
+    workspaceId,
+    id: patient.id,
+    resource: compressResource(JSON.stringify(patientWithMeta)),
+    vid: lastUpdated.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36),
+    lastUpdated,
+    identifierSystem: "",
+    identifierValue: "",
+    facilityId: "",
+    normalizedName: ""
   };
-  return [dummy];
 }
-
-// src/data/dynamo/ohi/ohi-data-service.ts
-import { DynamoDBClient as DynamoDBClient2 } from "@aws-sdk/client-dynamodb";
-import { Service as Service2 } from "electrodb";
-
-// src/data/dynamo/ohi/Configuration.ts
-import { Entity as Entity2 } from "electrodb";
-var Configuration = new Entity2({
-  model: {
-    entity: "configuration",
-    service: "ohi",
-    version: "01"
-  },
-  attributes: {
-    /** Sort key. "CURRENT" for current version; version history in S3. */
-    sk: {
-      type: "string",
-      required: true,
-      default: "CURRENT"
-    },
-    /** Tenant scope. Use "BASELINE" when the config is baseline default (no tenant). */
-    tenantId: {
-      type: "string",
-      required: true,
-      default: "BASELINE"
-    },
-    /** Workspace scope. Use "-" when absent. */
-    workspaceId: {
-      type: "string",
-      required: true,
-      default: "-"
-    },
-    /** User scope. Use "-" when absent. */
-    userId: {
-      type: "string",
-      required: true,
-      default: "-"
-    },
-    /** Role scope. Use "-" when absent. */
-    roleId: {
-      type: "string",
-      required: true,
-      default: "-"
-    },
-    /** Config type (category), e.g. endpoints, branding, display. */
-    key: {
-      type: "string",
-      required: true
-    },
-    /** FHIR Resource.id; logical id in URL and for the Configuration resource. */
-    id: {
-      type: "string",
-      required: true
-    },
-    /** Payload as JSON string. JSON.stringify(resource) on write; JSON.parse(item.resource) on read. */
-    resource: {
-      type: "string",
-      required: true
-    },
-    /** Version id (e.g. ULID). Tracks current version; S3 history key. */
-    vid: {
-      type: "string",
-      required: true
-    },
-    lastUpdated: {
-      type: "string",
-      required: true
-    },
-    deleted: {
-      type: "boolean",
-      required: false
-    },
-    bundleId: {
-      type: "string",
-      required: false
-    },
-    msgId: {
-      type: "string",
-      required: false
-    }
-  },
-  indexes: {
-    /** Base table: PK, SK (data store key names). PK is built from tenantId, workspaceId, userId, roleId; SK is built from key and sk. Do not supply PK or SK from outside. */
-    record: {
-      pk: {
-        field: "PK",
-        composite: ["tenantId", "workspaceId", "userId", "roleId"],
-        template: "OHI#CONFIG#TID#${tenantId}#WID#${workspaceId}#UID#${userId}#RID#${roleId}"
-      },
-      sk: {
-        field: "SK",
-        composite: ["key", "sk"],
-        template: "KEY#${key}#SK#${sk}"
-      }
-    },
-    /** GSI4 — Resource Type Index: list all Configuration in a tenant or workspace (no scan). Use for "list configs scoped to this tenant" (workspaceId = "-") or "list configs scoped to this workspace". Does not support hierarchical resolution in one query; use base table GetItem in fallback order (user → workspace → tenant → baseline) for that. */
-    gsi4: {
-      index: "GSI4",
-      condition: () => true,
-      pk: {
-        field: "GSI4PK",
-        composite: ["tenantId", "workspaceId"],
-        template: "TID#${tenantId}#WID#${workspaceId}#RT#Configuration"
-      },
-      sk: {
-        field: "GSI4SK",
-        composite: ["key", "sk"],
-        template: "KEY#${key}#SK#${sk}"
-      }
-    }
+async function importPatientFromFile(filePath, options) {
+  const resolved = resolve(filePath);
+  const raw = readFileSync(resolved, "utf-8");
+  const parsed = JSON.parse(raw);
+  const patient = extractPatient(parsed);
+  const service = getDynamoDataService(options.tableName);
+  const attrs = patientToPutAttrs(patient, options);
+  const result = await service.entities.patient.put(attrs).go();
+  const data = result.data;
+  if (!data) {
+    throw new Error(`Put failed for Patient ${patient.id}`);
+  }
+  return {
+    id: data.id,
+    tenantId: data.tenantId,
+    workspaceId: data.workspaceId
+  };
+}
+async function main() {
+  const [, , fileArg, tenantId = "tenant-1", workspaceId = "ws-1"] = process.argv;
+  if (!fileArg) {
+    console.error(
+      "Usage: import-patient.ts <path-to-patient.json> [tenantId] [workspaceId]"
+    );
+    process.exit(1);
   }
-});
+  try {
+    const result = await importPatientFromFile(fileArg, {
+      tenantId,
+      workspaceId
+    });
+    console.log(
+      `Imported Patient ${result.id} (tenant=${result.tenantId}, workspace=${result.workspaceId})`
+    );
+  } catch (err) {
+    console.error(err);
+    process.exit(1);
+  }
+}
+if (__require.main === module) {
+  void main();
+}
 
-// src/data/dynamo/ohi/ohi-data-service.ts
-var table2 = process.env.DYNAMO_TABLE_NAME ?? "jesttesttable";
-var client2 = new DynamoDBClient2({
-  ...process.env.MOCK_DYNAMODB_ENDPOINT && {
-    endpoint: process.env.MOCK_DYNAMODB_ENDPOINT,
-    sslEnabled: false,
-    region: "local"
+// src/data/rest-api/routes/patient/patient-create.ts
+async function createPatient(req, res) {
+  const bodyResult = requireJsonBody(req, res);
+  if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
+  const ctx = req.openhiContext;
+  const { tenantId, workspaceId, date, actorId, actorName } = ctx;
+  const body = bodyResult.body;
+  const id = body?.id ?? `patient-${Date.now()}`;
+  const patient = {
+    ...body,
+    resourceType: "Patient",
+    id,
+    meta: {
+      ...body?.meta ?? {},
+      lastUpdated: date,
+      versionId: "1"
+    }
+  };
+  const options = {
+    tenantId,
+    workspaceId,
+    createdDate: date,
+    createdById: actorId,
+    createdByName: actorName,
+    modifiedDate: date,
+    modifiedById: actorId,
+    modifiedByName: actorName
+  };
+  const service = getDynamoDataService();
+  try {
+    const attrs = patientToPutAttrs(patient, options);
+    await service.entities.patient.put(
+      attrs
+    ).go();
+    return res.status(201).location(`${BASE_PATH3}/${id}`).json(patient);
+  } catch (err) {
+    console.error("POST Patient error:", err);
+    return res.status(500).json({
+      resourceType: "OperationOutcome",
+      issue: [
+        { severity: "error", code: "exception", diagnostics: String(err) }
+      ]
+    });
   }
-});
-var entities2 = { configuration: Configuration };
-var OhiDataService = new Service2(entities2, { table: table2, client: client2 });
-function getOhiDataService(tableName) {
-  return new Service2(entities2, { table: tableName, client: client2 });
 }
 
-// src/data/rest-api/ohi/Configuration.ts
-var BASE_PATH3 = "/ohi/Configuration";
-var router2 = express2.Router();
-var SK3 = "CURRENT";
-var TABLE_NAME2 = process.env.DYNAMO_TABLE_NAME ?? "jesttesttable";
-async function listConfigurations(req, res) {
+// src/data/rest-api/routes/patient/patient-delete.ts
+async function deletePatient(req, res) {
+  const id = String(req.params.id);
   const { tenantId, workspaceId } = req.openhiContext;
-  const service = getOhiDataService(TABLE_NAME2);
+  const service = getDynamoDataService();
   try {
-    const result = await service.entities.configuration.query.gsi4({ tenantId, workspaceId }).go();
-    const dynamoEntries = (result.data ?? []).map((item) => {
-      const resource = JSON.parse(decompressResource(item.resource));
-      return {
-        fullUrl: `${BASE_PATH3}/${item.key}`,
-        resource: { ...resource, id: item.id, key: item.key }
-      };
-    });
-    const dynamicEntries = await getDynamicConfigurationEntries({
-      tenantId,
-      workspaceId
-    });
-    const entries = [...dynamoEntries, ...dynamicEntries];
-    const bundle = {
-      resourceType: "Bundle",
-      type: "searchset",
-      total: entries.length,
-      link: [{ relation: "self", url: BASE_PATH3 }],
-      entry: entries
-    };
-    return res.json(bundle);
+    await service.entities.patient.delete({ tenantId, workspaceId, id, sk: SK2 }).go();
+    return res.status(204).send();
   } catch (err) {
-    console.error("GET /Configuration list error:", err);
+    console.error("DELETE Patient error:", err);
     return res.status(500).json({
       resourceType: "OperationOutcome",
       issue: [
-        {
-          severity: "error",
-          code: "exception",
-          diagnostics: String(err)
-        }
+        { severity: "error", code: "exception", diagnostics: String(err) }
       ]
     });
   }
 }
-router2.get("/", listConfigurations);
-async function getConfigurationByKey(req, res) {
-  const key = String(req.params.key);
-  const ctx = req.openhiContext;
-  const { tenantId, workspaceId, userId } = ctx;
-  const roleId = "roleId" in ctx && typeof ctx.roleId === "string" ? ctx.roleId : "-";
-  const service = getOhiDataService(TABLE_NAME2);
+
+// src/data/rest-api/routes/patient/patient-get-by-id.ts
+async function getPatientById(req, res) {
+  const id = String(req.params.id);
+  const { tenantId, workspaceId } = req.openhiContext;
+  const service = getDynamoDataService();
   try {
-    const result = await service.entities.configuration.get({ tenantId, workspaceId, userId, roleId, key, sk: SK3 }).go();
+    const result = await service.entities.patient.get({ tenantId, workspaceId, id, sk: SK2 }).go();
     if (!result.data) {
       return res.status(404).json({
         resourceType: "OperationOutcome",
@@ -988,7 +1033,7 @@ async function getConfigurationByKey(req, res) {
           {
             severity: "error",
             code: "not-found",
-            diagnostics: `Configuration ${key} not found`
+            diagnostics: `Patient ${id} not found`
           }
         ]
       });
@@ -996,14 +1041,9 @@ async function getConfigurationByKey(req, res) {
     const resource = JSON.parse(
       decompressResource(result.data.resource)
     );
-    return res.json({
-      ...resource,
-      resourceType: "Configuration",
-      id: result.data.id,
-      key: result.data.key
-    });
+    return res.json({ ...resource, id: result.data.id });
   } catch (err) {
-    console.error("GET Configuration error:", err);
+    console.error("GET Patient error:", err);
     return res.status(500).json({
       resourceType: "OperationOutcome",
       issue: [
@@ -1016,83 +1056,64 @@ async function getConfigurationByKey(req, res) {
     });
   }
 }
-router2.get("/:key", getConfigurationByKey);
-async function createConfiguration(req, res) {
-  const ctx = req.openhiContext;
-  const {
-    tenantId: ctxTenantId,
-    workspaceId: ctxWorkspaceId,
-    userId: ctxUserId,
-    date
-  } = ctx;
-  const body = req.body;
-  const key = body?.key;
-  if (!key || typeof key !== "string") {
-    return res.status(400).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        {
-          severity: "error",
-          code: "required",
-          diagnostics: "Configuration key is required"
-        }
-      ]
-    });
-  }
-  const id = body?.id ?? `config-${key}-${Date.now()}`;
-  const resourcePayload = body?.resource;
-  const resourceStr = typeof resourcePayload === "string" ? resourcePayload : JSON.stringify(resourcePayload ?? {});
-  const tenantId = body?.tenantId ?? ctxTenantId;
-  const workspaceId = body?.workspaceId ?? ctxWorkspaceId;
-  const userId = body?.userId ?? ctxUserId ?? "-";
-  const roleId = body?.roleId ?? "-";
-  const vid = body?.vid ?? (date.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36));
-  const lastUpdated = body?.lastUpdated ?? date;
-  const service = getOhiDataService(TABLE_NAME2);
+
+// src/data/rest-api/routes/patient/patient-list.ts
+async function listPatients(req, res) {
+  const { tenantId, workspaceId } = req.openhiContext;
+  const service = getDynamoDataService();
   try {
-    await service.entities.configuration.put({
-      tenantId,
-      workspaceId,
-      userId,
-      roleId,
-      key,
-      id,
-      resource: compressResource(resourceStr),
-      vid,
-      lastUpdated,
-      sk: SK3
-    }).go();
-    const config = {
-      resourceType: "Configuration",
-      id,
-      key,
-      resource: typeof resourcePayload === "object" ? resourcePayload : JSON.parse(resourceStr),
-      meta: { lastUpdated, versionId: vid }
+    const result = await service.entities.patient.query.gsi4({ tenantId, workspaceId }).go();
+    const entries = (result.data ?? []).map((item) => {
+      const resource = JSON.parse(decompressResource(item.resource));
+      return {
+        fullUrl: `${BASE_PATH3}/${item.id}`,
+        resource: { ...resource, id: item.id }
+      };
+    });
+    const bundle = {
+      resourceType: "Bundle",
+      type: "searchset",
+      total: entries.length,
+      link: [{ relation: "self", url: BASE_PATH3 }],
+      entry: entries
     };
-    return res.status(201).location(`${BASE_PATH3}/${key}`).json(config);
+    return res.json(bundle);
   } catch (err) {
-    console.error("POST Configuration error:", err);
+    console.error("GET /Patient list error:", err);
     return res.status(500).json({
       resourceType: "OperationOutcome",
       issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
+        {
+          severity: "error",
+          code: "exception",
+          diagnostics: String(err)
+        }
       ]
     });
   }
 }
-router2.post("/", createConfiguration);
-async function updateConfiguration(req, res) {
-  const key = String(req.params.key);
+
+// src/data/rest-api/routes/patient/patient-update.ts
+async function updatePatient(req, res) {
+  const bodyResult = requireJsonBody(req, res);
+  if ("errorResponse" in bodyResult) return bodyResult.errorResponse;
+  const id = String(req.params.id);
   const ctx = req.openhiContext;
-  const { tenantId, workspaceId, userId, date } = ctx;
-  const roleId = "roleId" in ctx && typeof ctx.roleId === "string" ? ctx.roleId : "-";
-  const body = req.body;
-  const resourcePayload = body?.resource;
-  const resourceStr = typeof resourcePayload === "string" ? resourcePayload : JSON.stringify(resourcePayload ?? {});
-  const lastUpdated = body?.lastUpdated ?? date;
-  const service = getOhiDataService(TABLE_NAME2);
+  const { tenantId, workspaceId, date, actorId, actorName } = ctx;
+  const body = bodyResult.body;
+  const patient = {
+    ...body,
+    resourceType: "Patient",
+    id,
+    meta: {
+      ...body?.meta ?? {},
+      lastUpdated: date,
+      versionId: "2"
+    }
+  };
+  const service = getDynamoDataService();
   try {
-    const existing = await service.entities.configuration.get({ tenantId, workspaceId, userId, roleId, key, sk: SK3 }).go();
+    const existing = await service.entities.patient.get({ tenantId, workspaceId, id, sk: SK2 }).go();
     if (!existing.data) {
       return res.status(404).json({
         resourceType: "OperationOutcome",
@@ -1100,47 +1121,30 @@ async function updateConfiguration(req, res) {
           {
             severity: "error",
             code: "not-found",
-            diagnostics: `Configuration ${key} not found`
+            diagnostics: `Patient ${id} not found`
           }
         ]
       });
     }
-    const nextVid = existing.data.vid != null ? String(Number(existing.data.vid) + 1) : date.replace(/[-:T.Z]/g, "").slice(0, 12) || "2";
-    await service.entities.configuration.patch({ tenantId, workspaceId, userId, roleId, key, sk: SK3 }).set({
-      resource: compressResource(resourceStr),
-      lastUpdated,
-      vid: nextVid
-    }).go();
-    const config = {
-      resourceType: "Configuration",
-      id: existing.data.id,
-      key: existing.data.key,
-      resource: typeof resourcePayload === "object" ? resourcePayload : JSON.parse(resourceStr),
-      meta: { lastUpdated, versionId: nextVid }
+    const existingMeta = existing.data.resource != null ? JSON.parse(decompressResource(existing.data.resource)).meta : void 0;
+    const patientWithMeta = {
+      ...patient,
+      meta: mergeAuditIntoMeta(
+        patient.meta ?? existingMeta,
+        {
+          modifiedDate: date,
+          modifiedById: actorId,
+          modifiedByName: actorName
+        }
+      )
     };
-    return res.json(config);
-  } catch (err) {
-    console.error("PUT Configuration error:", err);
-    return res.status(500).json({
-      resourceType: "OperationOutcome",
-      issue: [
-        { severity: "error", code: "exception", diagnostics: String(err) }
-      ]
-    });
-  }
-}
-router2.put("/:key", updateConfiguration);
-async function deleteConfiguration(req, res) {
-  const key = String(req.params.key);
-  const ctx = req.openhiContext;
-  const { tenantId, workspaceId, userId } = ctx;
-  const roleId = "roleId" in ctx && typeof ctx.roleId === "string" ? ctx.roleId : "-";
-  const service = getOhiDataService(TABLE_NAME2);
-  try {
-    await service.entities.configuration.delete({ tenantId, workspaceId, userId, roleId, key, sk: SK3 }).go();
-    return res.status(204).send();
+    await service.entities.patient.patch({ tenantId, workspaceId, id, sk: SK2 }).set({
+      resource: compressResource(JSON.stringify(patientWithMeta)),
+      lastUpdated: date
+    }).go();
+    return res.json(patientWithMeta);
   } catch (err) {
-    console.error("DELETE Configuration error:", err);
+    console.error("PUT Patient error:", err);
     return res.status(500).json({
       resourceType: "OperationOutcome",
       issue: [
@@ -1149,7 +1153,14 @@ async function deleteConfiguration(req, res) {
     });
   }
 }
-router2.delete("/:key", deleteConfiguration);
+
+// src/data/rest-api/routes/patient/patient.ts
+var router2 = express2.Router();
+router2.get("/", listPatients);
+router2.get("/:id", getPatientById);
+router2.post("/", createPatient);
+router2.put("/:id", updatePatient);
+router2.delete("/:id", deletePatient);
 
 // src/data/rest-api/rest-api.ts
 var app = express3();
@@ -1162,10 +1173,9 @@ app.use(normalizeJsonBodyMiddleware);
 app.get("/", (_req, res) => {
   return res.status(200).json({ message: "POC App is running" });
 });
-app.use("/ehr", openHiContextMiddleware);
-app.use("/ohi", openHiContextMiddleware);
-app.use("/ehr/r4/Patient", router);
-app.use("/ohi/Configuration", router2);
+app.use(["/Patient", "/Configuration"], openHiContextMiddleware);
+app.use("/Patient", router2);
+app.use("/Configuration", router);
 
 // src/data/lambda/rest-api-lambda.handler.ts
 var handler = serverlessExpress({ app });