@openhi/constructs 0.0.88 → 0.0.89

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

@@ -945,7 +945,13 @@ async function createConfigurationOperation(params) {
   const roleId = body.roleId ?? context.roleId ?? "-";
   const lastUpdated = body.lastUpdated ?? date;
   const vid = body.vid ?? (date.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36));
-  const summary = JSON.stringify({ resourceType: "Configuration", id, key });
+  const summary = JSON.stringify({
+    resourceType: "Configuration",
+    id,
+    key,
+    userId,
+    roleId
+  });
   const service = getDynamoControlService(tableName);
   await service.entities.configuration.put({
     tenantId,
@@ -1357,7 +1363,208 @@ async function getConfigurationByIdRoute(req, res) {
   }
 }
 
+// src/data/operations/data-operations-common.ts
+import { extractSortKey, extractSummary } from "@openhi/types";
+
+// src/data/audit-meta.ts
+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 });
+  }
+  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()) };
+}
+
+// src/data/operations/data-operations-common.ts
+var DATA_ENTITY_SK = "CURRENT";
+async function getDataEntityById(entity, tenantId, workspaceId, id, resourceLabel) {
+  const result = await entity.get({
+    tenantId,
+    workspaceId,
+    id,
+    sk: DATA_ENTITY_SK
+  }).go();
+  if (!result.data) {
+    throw new NotFoundError(`${resourceLabel} ${id} not found`, {
+      details: { id }
+    });
+  }
+  const parsed = JSON.parse(decompressResource(result.data.resource));
+  return {
+    id: result.data.id,
+    resource: { ...parsed, id: result.data.id }
+  };
+}
+async function deleteDataEntityById(entity, tenantId, workspaceId, id) {
+  await entity.delete({
+    tenantId,
+    workspaceId,
+    id,
+    sk: DATA_ENTITY_SK
+  }).go();
+}
+var BATCH_GET_MAX_ATTEMPTS = 3;
+var BATCH_GET_BASE_BACKOFF_MS = 50;
+async function batchGetWithRetry(entity, keys) {
+  if (keys.length === 0) return [];
+  const collected = [];
+  let pending = keys;
+  let attempt = 0;
+  while (pending.length > 0) {
+    if (attempt > 0) {
+      await new Promise(
+        (resolve2) => setTimeout(resolve2, BATCH_GET_BASE_BACKOFF_MS * 2 ** (attempt - 1))
+      );
+    }
+    attempt++;
+    const result = await entity.get(pending).go();
+    collected.push(...result.data);
+    const unprocessed = result.unprocessed ?? [];
+    if (unprocessed.length === 0) break;
+    if (attempt >= BATCH_GET_MAX_ATTEMPTS) {
+      throw new Error(
+        `BatchGet exhausted retries: ${unprocessed.length} key(s) still unprocessed after ${BATCH_GET_MAX_ATTEMPTS} attempt(s)`
+      );
+    }
+    pending = unprocessed;
+  }
+  return collected;
+}
+async function listDataEntitiesByWorkspace(entity, tenantId, workspaceId) {
+  const shardResults = await Promise.all(
+    Array.from(
+      { length: SHARD_COUNT },
+      (_, shard) => entity.query.gsi1({ tenantId, workspaceId, gsi1Shard: String(shard) }).go()
+    )
+  );
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    entity,
+    orderedIds.map((id) => ({
+      tenantId,
+      workspaceId,
+      id,
+      sk: DATA_ENTITY_SK
+    }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
+    const parsed = JSON.parse(decompressResource(item.resource));
+    entries.push({
+      id,
+      resource: { ...parsed, id }
+    });
+  }
+  return { entries };
+}
+async function createDataEntityRecord(entity, tenantId, workspaceId, id, resourceWithAudit, fallbackDate) {
+  const lastUpdated = resourceWithAudit.meta?.lastUpdated ?? fallbackDate ?? (/* @__PURE__ */ new Date()).toISOString();
+  const vid = lastUpdated.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36);
+  const resourceLike = resourceWithAudit;
+  const summary = JSON.stringify(extractSummary(resourceLike));
+  const gsi1sk = extractSortKey(resourceLike);
+  await entity.put({
+    sk: DATA_ENTITY_SK,
+    tenantId,
+    workspaceId,
+    id,
+    resource: compressResource(JSON.stringify(resourceWithAudit)),
+    summary,
+    vid,
+    lastUpdated,
+    gsi1sk
+  }).go();
+  return {
+    id,
+    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,
+    workspaceId,
+    id,
+    sk: DATA_ENTITY_SK
+  }).go();
+  if (!existing.data) {
+    throw new NotFoundError(`${resourceLabel} ${id} not found`, {
+      details: { id }
+    });
+  }
+  const existingStr = decompressResource(existing.data.resource);
+  const { resource, lastUpdated } = buildPatched(existingStr);
+  const resourceLike = resource;
+  const summary = JSON.stringify(extractSummary(resourceLike));
+  const gsi1sk = extractSortKey(resourceLike);
+  await entity.patch({
+    tenantId,
+    workspaceId,
+    id,
+    sk: DATA_ENTITY_SK
+  }).set({
+    resource: compressResource(JSON.stringify(resource)),
+    summary,
+    lastUpdated,
+    gsi1sk
+  }).go();
+  return {
+    id,
+    resource
+  };
+}
+
 // src/data/operations/control/configuration/configuration-list-operation.ts
+var SK4 = "CURRENT";
 async function listConfigurationsOperation(params) {
   const { context, tableName } = params;
   const { tenantId, workspaceId } = context;
@@ -1368,9 +1575,41 @@ async function listConfigurationsOperation(params) {
       (_, shard) => service.entities.configuration.query.gsi1({ tenantId, workspaceId, gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const ordered = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      if (typeof item.summary !== "string") continue;
+      const parsed = JSON.parse(item.summary);
+      if (typeof parsed.id !== "string" || typeof parsed.key !== "string" || typeof parsed.userId !== "string" || typeof parsed.roleId !== "string") {
+        continue;
+      }
+      ordered.push({
+        id: parsed.id,
+        key: parsed.key,
+        userId: parsed.userId,
+        roleId: parsed.roleId
+      });
+    }
+  }
+  if (ordered.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.configuration,
+    ordered.map(({ key, userId, roleId }) => ({
+      tenantId,
+      workspaceId,
+      userId,
+      roleId,
+      key,
+      sk: SK4
+    }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const summary of ordered) {
+    const item = byId.get(summary.id);
+    if (!item) continue;
     const resource = JSON.parse(decompressResource(item.resource));
-    return {
+    entries.push({
       id: item.id,
       key: item.key,
       resource: {
@@ -1379,8 +1618,8 @@ async function listConfigurationsOperation(params) {
         key: item.key,
         resource
       }
-    };
-  });
+    });
+  }
   return { entries };
 }
 
@@ -1538,13 +1777,13 @@ async function listConfigurationsRoute(req, res) {
 }
 
 // src/data/operations/control/configuration/configuration-update-operation.ts
-var SK4 = "CURRENT";
+var SK5 = "CURRENT";
 async function updateConfigurationOperation(params) {
   const { context, id, body, tableName } = params;
   const { tenantId, workspaceId, actorId, date, roleId: ctxRoleId } = context;
   const roleId = ctxRoleId ?? "-";
   const service = getDynamoControlService(tableName);
-  const existing = await service.entities.configuration.get({ tenantId, workspaceId, userId: actorId, roleId, key: id, sk: SK4 }).go();
+  const existing = await service.entities.configuration.get({ tenantId, workspaceId, userId: actorId, roleId, key: id, sk: SK5 }).go();
   if (!existing.data) {
     throw new NotFoundError(`Configuration ${id} not found`, {
       details: { id }
@@ -1557,9 +1796,11 @@ async function updateConfigurationOperation(params) {
   const summary = JSON.stringify({
     resourceType: "Configuration",
     id: existing.data.id,
-    key: existing.data.key
+    key: existing.data.key,
+    userId: actorId,
+    roleId
   });
-  await service.entities.configuration.patch({ tenantId, workspaceId, userId: actorId, roleId, key: id, sk: SK4 }).set({
+  await service.entities.configuration.patch({ tenantId, workspaceId, userId: actorId, roleId, key: id, sk: SK5 }).set({
     resource: compressResource(resourceStr),
     summary,
     lastUpdated,
@@ -1639,7 +1880,7 @@ router.delete("/:id", deleteConfigurationRoute);
 import express2 from "express";
 
 // src/data/operations/control/membership/membership-create-operation.ts
-import { extractSummary } from "@openhi/types";
+import { extractSummary as extractSummary2 } from "@openhi/types";
 async function createMembershipOperation(params) {
   const { context, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -1648,7 +1889,7 @@ async function createMembershipOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `1`;
   const resource = { resourceType: "Membership", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary(resource));
+  const summary = JSON.stringify(extractSummary2(resource));
   await service.entities.membership.put({
     tenantId: context.tenantId,
     id,
@@ -1764,26 +2005,39 @@ async function getMembershipByIdRoute(req, res) {
 }
 
 // src/data/operations/control/membership/membership-list-operation.ts
+var SK6 = "CURRENT";
 async function listMembershipsOperation(params) {
   const { context, tableName } = params;
+  const tenantId = context.tenantId;
   const service = getDynamoControlService(tableName);
   const shardResults = await Promise.all(
     Array.from(
       { length: SHARD_COUNT },
-      (_, shard) => service.entities.membership.query.gsi1({ tenantId: context.tenantId, gsi1Shard: String(shard) }).go()
+      (_, shard) => service.entities.membership.query.gsi1({ tenantId, gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.membership,
+    orderedIds.map((id) => ({ tenantId, id, sk: SK6 }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
     const parsedResource = JSON.parse(item.resource);
-    return {
-      id: item.id,
-      resource: {
-        resourceType: "Membership",
-        id: item.id,
-        ...parsedResource
-      }
-    };
-  });
+    entries.push({
+      id,
+      resource: { resourceType: "Membership", id, ...parsedResource }
+    });
+  }
   return { entries };
 }
 
@@ -1810,7 +2064,7 @@ async function listMembershipsRoute(req, res) {
 }
 
 // src/data/operations/control/membership/membership-update-operation.ts
-import { extractSummary as extractSummary2 } from "@openhi/types";
+import { extractSummary as extractSummary3 } from "@openhi/types";
 async function updateMembershipOperation(params) {
   const { context, id, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -1822,7 +2076,7 @@ async function updateMembershipOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `${Date.now()}`;
   const resource = { resourceType: "Membership", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary2(resource));
+  const summary = JSON.stringify(extractSummary3(resource));
   await service.entities.membership.put({
     tenantId: context.tenantId,
     id,
@@ -1890,7 +2144,7 @@ router2.delete("/:id", deleteMembershipRoute);
 import express3 from "express";
 
 // src/data/operations/control/role/role-create-operation.ts
-import { extractSummary as extractSummary3 } from "@openhi/types";
+import { extractSummary as extractSummary4 } from "@openhi/types";
 async function createRoleOperation(params) {
   const { context, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -1899,7 +2153,7 @@ async function createRoleOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `1`;
   const resource = { resourceType: "Role", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary3(resource));
+  const summary = JSON.stringify(extractSummary4(resource));
   await service.entities.role.put({
     id,
     resource: JSON.stringify(resource),
@@ -2014,6 +2268,7 @@ async function getRoleByIdRoute(req, res) {
 }
 
 // src/data/operations/control/role/role-list-operation.ts
+var SK7 = "CURRENT";
 async function listRolesOperation(params) {
   const { tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2023,13 +2278,28 @@ async function listRolesOperation(params) {
       (_, shard) => service.entities.role.query.gsi1({ gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.role,
+    orderedIds.map((id) => ({ id, sk: SK7 }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
     const parsedResource = JSON.parse(item.resource);
-    return {
-      id: item.id,
-      resource: { resourceType: "Role", id: item.id, ...parsedResource }
-    };
-  });
+    entries.push({
+      id,
+      resource: { resourceType: "Role", id, ...parsedResource }
+    });
+  }
   return { entries };
 }
 
@@ -2056,7 +2326,7 @@ async function listRolesRoute(req, res) {
 }
 
 // src/data/operations/control/role/role-update-operation.ts
-import { extractSummary as extractSummary4 } from "@openhi/types";
+import { extractSummary as extractSummary5 } from "@openhi/types";
 async function updateRoleOperation(params) {
   const { context, id, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2068,7 +2338,7 @@ async function updateRoleOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `${Date.now()}`;
   const resource = { resourceType: "Role", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary4(resource));
+  const summary = JSON.stringify(extractSummary5(resource));
   await service.entities.role.put({
     id,
     resource: JSON.stringify(resource),
@@ -2135,7 +2405,7 @@ router3.delete("/:id", deleteRoleRoute);
 import express4 from "express";
 
 // src/data/operations/control/roleassignment/roleassignment-create-operation.ts
-import { extractSummary as extractSummary5 } from "@openhi/types";
+import { extractSummary as extractSummary6 } from "@openhi/types";
 async function createRoleAssignmentOperation(params) {
   const { context, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2144,7 +2414,7 @@ async function createRoleAssignmentOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `1`;
   const resource = { resourceType: "RoleAssignment", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary5(resource));
+  const summary = JSON.stringify(extractSummary6(resource));
   await service.entities.roleAssignment.put({
     tenantId: context.tenantId,
     id,
@@ -2260,26 +2530,39 @@ async function getRoleAssignmentByIdRoute(req, res) {
 }
 
 // src/data/operations/control/roleassignment/roleassignment-list-operation.ts
+var SK8 = "CURRENT";
 async function listRoleAssignmentsOperation(params) {
   const { context, tableName } = params;
+  const tenantId = context.tenantId;
   const service = getDynamoControlService(tableName);
   const shardResults = await Promise.all(
     Array.from(
       { length: SHARD_COUNT },
-      (_, shard) => service.entities.roleAssignment.query.gsi1({ tenantId: context.tenantId, gsi1Shard: String(shard) }).go()
+      (_, shard) => service.entities.roleAssignment.query.gsi1({ tenantId, gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.roleAssignment,
+    orderedIds.map((id) => ({ tenantId, id, sk: SK8 }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
     const parsedResource = JSON.parse(item.resource);
-    return {
-      id: item.id,
-      resource: {
-        resourceType: "RoleAssignment",
-        id: item.id,
-        ...parsedResource
-      }
-    };
-  });
+    entries.push({
+      id,
+      resource: { resourceType: "RoleAssignment", id, ...parsedResource }
+    });
+  }
   return { entries };
 }
 
@@ -2306,7 +2589,7 @@ async function listRoleAssignmentsRoute(req, res) {
 }
 
 // src/data/operations/control/roleassignment/roleassignment-update-operation.ts
-import { extractSummary as extractSummary6 } from "@openhi/types";
+import { extractSummary as extractSummary7 } from "@openhi/types";
 async function updateRoleAssignmentOperation(params) {
   const { context, id, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2318,7 +2601,7 @@ async function updateRoleAssignmentOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `${Date.now()}`;
   const resource = { resourceType: "RoleAssignment", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary6(resource));
+  const summary = JSON.stringify(extractSummary7(resource));
   await service.entities.roleAssignment.put({
     tenantId: context.tenantId,
     id,
@@ -2386,7 +2669,7 @@ router4.delete("/:id", deleteRoleAssignmentRoute);
 import express5 from "express";
 
 // src/data/operations/control/tenant/tenant-create-operation.ts
-import { extractSummary as extractSummary7 } from "@openhi/types";
+import { extractSummary as extractSummary8 } from "@openhi/types";
 async function createTenantOperation(params) {
   const { context, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2395,7 +2678,7 @@ async function createTenantOperation(params) {
   const vid = lastUpdated.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36);
   const parsedResource = typeof body.resource === "string" ? JSON.parse(body.resource) : body.resource ?? {};
   const resource = { resourceType: "Tenant", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary7(resource));
+  const summary = JSON.stringify(extractSummary8(resource));
   await service.entities.tenant.put({
     tenantId: id,
     id,
@@ -2506,6 +2789,7 @@ async function getTenantByIdRoute(req, res) {
 }
 
 // src/data/operations/control/tenant/tenant-list-operation.ts
+var SK9 = "CURRENT";
 async function listTenantsOperation(params) {
   const { tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2515,13 +2799,28 @@ async function listTenantsOperation(params) {
       (_, shard) => service.entities.tenant.query.gsi1({ gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.tenant,
+    orderedIds.map((id) => ({ tenantId: id, sk: SK9 }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
     const parsed = JSON.parse(item.resource);
-    return {
-      id: item.id,
-      resource: { resourceType: "Tenant", id: item.id, ...parsed }
-    };
-  });
+    entries.push({
+      id,
+      resource: { resourceType: "Tenant", id, ...parsed }
+    });
+  }
   return { entries };
 }
 
@@ -2548,7 +2847,7 @@ async function listTenantsRoute(req, res) {
 }
 
 // src/data/operations/control/tenant/tenant-update-operation.ts
-import { extractSummary as extractSummary8 } from "@openhi/types";
+import { extractSummary as extractSummary9 } from "@openhi/types";
 async function updateTenantOperation(params) {
   const { context, id, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2566,7 +2865,7 @@ async function updateTenantOperation(params) {
     resourceType: "Tenant",
     id
   };
-  const summary = JSON.stringify(extractSummary8(updated));
+  const summary = JSON.stringify(extractSummary9(updated));
   await service.entities.tenant.patch({ tenantId: id, sk: "CURRENT" }).set({ resource: JSON.stringify(updated), summary, vid, lastUpdated }).go();
   return { id, resource: updated, meta: { lastUpdated, versionId: vid } };
 }
@@ -2623,7 +2922,7 @@ router5.delete("/:id", deleteTenantRoute);
 import express6 from "express";
 
 // src/data/operations/control/user/user-create-operation.ts
-import { extractSummary as extractSummary9 } from "@openhi/types";
+import { extractSummary as extractSummary10 } from "@openhi/types";
 async function createUserOperation(params) {
   const { context, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2632,7 +2931,7 @@ async function createUserOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `1`;
   const resource = { resourceType: "User", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary9(resource));
+  const summary = JSON.stringify(extractSummary10(resource));
   await service.entities.user.put({
     id,
     resource: JSON.stringify(resource),
@@ -2747,6 +3046,7 @@ async function getUserByIdRoute(req, res) {
 }
 
 // src/data/operations/control/user/user-list-operation.ts
+var SK10 = "CURRENT";
 async function listUsersOperation(params) {
   const { tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2756,13 +3056,28 @@ async function listUsersOperation(params) {
       (_, shard) => service.entities.user.query.gsi1({ gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.user,
+    orderedIds.map((id) => ({ id, sk: SK10 }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
     const parsedResource = JSON.parse(item.resource);
-    return {
-      id: item.id,
-      resource: { resourceType: "User", id: item.id, ...parsedResource }
-    };
-  });
+    entries.push({
+      id,
+      resource: { resourceType: "User", id, ...parsedResource }
+    });
+  }
   return { entries };
 }
 
@@ -2789,7 +3104,7 @@ async function listUsersRoute(req, res) {
 }
 
 // src/data/operations/control/user/user-update-operation.ts
-import { extractSummary as extractSummary10 } from "@openhi/types";
+import { extractSummary as extractSummary11 } from "@openhi/types";
 async function updateUserOperation(params) {
   const { context, id, body, tableName } = params;
   const service = getDynamoControlService(tableName);
@@ -2801,7 +3116,7 @@ async function updateUserOperation(params) {
   const lastUpdated = context.date ?? (/* @__PURE__ */ new Date()).toISOString();
   const vid = `${Date.now()}`;
   const resource = { resourceType: "User", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary10(resource));
+  const summary = JSON.stringify(extractSummary11(resource));
   await service.entities.user.put({
     id,
     resource: JSON.stringify(resource),
@@ -2868,7 +3183,7 @@ router6.delete("/:id", deleteUserRoute);
 import express7 from "express";
 
 // src/data/operations/control/workspace/workspace-create-operation.ts
-import { extractSummary as extractSummary11 } from "@openhi/types";
+import { extractSummary as extractSummary12 } from "@openhi/types";
 async function createWorkspaceOperation(params) {
   const { context, body, tableName } = params;
   const { tenantId } = context;
@@ -2878,7 +3193,7 @@ async function createWorkspaceOperation(params) {
   const vid = lastUpdated.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36);
   const parsedResource = typeof body.resource === "string" ? JSON.parse(body.resource) : body.resource ?? {};
   const resource = { resourceType: "Workspace", id, ...parsedResource };
-  const summary = JSON.stringify(extractSummary11(resource));
+  const summary = JSON.stringify(extractSummary12(resource));
   await service.entities.workspace.put({
     tenantId,
     id,
@@ -2991,6 +3306,7 @@ async function getWorkspaceByIdRoute(req, res) {
 }
 
 // src/data/operations/control/workspace/workspace-list-operation.ts
+var SK11 = "CURRENT";
 async function listWorkspacesOperation(params) {
   const { context, tableName } = params;
   const { tenantId } = context;
@@ -3001,13 +3317,28 @@ async function listWorkspacesOperation(params) {
       (_, shard) => service.entities.workspace.query.gsi1({ tenantId, gsi1Shard: String(shard) }).go()
     )
   );
-  const entries = shardResults.flatMap((shardResult) => shardResult.data ?? []).map((item) => {
+  const orderedIds = [];
+  for (const shardResult of shardResults) {
+    for (const item of shardResult.data ?? []) {
+      orderedIds.push(item.id);
+    }
+  }
+  if (orderedIds.length === 0) return { entries: [] };
+  const items = await batchGetWithRetry(
+    service.entities.workspace,
+    orderedIds.map((id) => ({ tenantId, id, sk: SK11 }))
+  );
+  const byId = new Map(items.map((item) => [item.id, item]));
+  const entries = [];
+  for (const id of orderedIds) {
+    const item = byId.get(id);
+    if (!item) continue;
     const parsed = JSON.parse(item.resource);
-    return {
-      id: item.id,
-      resource: { resourceType: "Workspace", id: item.id, ...parsed }
-    };
-  });
+    entries.push({
+      id,
+      resource: { resourceType: "Workspace", id, ...parsed }
+    });
+  }
   return { entries };
 }
 
@@ -3034,7 +3365,7 @@ async function listWorkspacesRoute(req, res) {
 }
 
 // src/data/operations/control/workspace/workspace-update-operation.ts
-import { extractSummary as extractSummary12 } from "@openhi/types";
+import { extractSummary as extractSummary13 } from "@openhi/types";
 async function updateWorkspaceOperation(params) {
   const { context, id, body, tableName } = params;
   const { tenantId } = context;
@@ -3053,7 +3384,7 @@ async function updateWorkspaceOperation(params) {
     resourceType: "Workspace",
     id
   };
-  const summary = JSON.stringify(extractSummary12(updated));
+  const summary = JSON.stringify(extractSummary13(updated));
   await service.entities.workspace.patch({ tenantId, id, sk: "CURRENT" }).set({ resource: JSON.stringify(updated), summary, vid, lastUpdated }).go();
   return { id, resource: updated, meta: { lastUpdated, versionId: vid } };
 }
@@ -3112,30 +3443,6 @@ import express8 from "express";
 // src/data/operations/data/account/account-create-operation.ts
 import { ulid } from "ulid";
 
-// src/data/audit-meta.ts
-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 });
-  }
-  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()) };
-}
-
 // src/data/dynamo/dynamo-data-service.ts
 import { Service as Service2 } from "electrodb";
 
@@ -4168,136 +4475,6 @@ function getDynamoDataService(tableName) {
   };
 }
 
-// src/data/operations/data-operations-common.ts
-import { extractSortKey, extractSummary as extractSummary13 } from "@openhi/types";
-var DATA_ENTITY_SK = "CURRENT";
-async function getDataEntityById(entity, tenantId, workspaceId, id, resourceLabel) {
-  const result = await entity.get({
-    tenantId,
-    workspaceId,
-    id,
-    sk: DATA_ENTITY_SK
-  }).go();
-  if (!result.data) {
-    throw new NotFoundError(`${resourceLabel} ${id} not found`, {
-      details: { id }
-    });
-  }
-  const parsed = JSON.parse(decompressResource(result.data.resource));
-  return {
-    id: result.data.id,
-    resource: { ...parsed, id: result.data.id }
-  };
-}
-async function deleteDataEntityById(entity, tenantId, workspaceId, id) {
-  await entity.delete({
-    tenantId,
-    workspaceId,
-    id,
-    sk: DATA_ENTITY_SK
-  }).go();
-}
-async function listDataEntitiesByWorkspace(entity, tenantId, workspaceId) {
-  const shardResults = await Promise.all(
-    Array.from(
-      { length: SHARD_COUNT },
-      (_, shard) => entity.query.gsi1({ tenantId, workspaceId, gsi1Shard: String(shard) }).go()
-    )
-  );
-  const entries = [];
-  for (const shardResult of shardResults) {
-    for (const item of shardResult.data ?? []) {
-      const parsed = JSON.parse(decompressResource(item.resource));
-      entries.push({
-        id: item.id,
-        resource: { ...parsed, id: item.id }
-      });
-    }
-  }
-  return { entries };
-}
-async function createDataEntityRecord(entity, tenantId, workspaceId, id, resourceWithAudit, fallbackDate) {
-  const lastUpdated = resourceWithAudit.meta?.lastUpdated ?? fallbackDate ?? (/* @__PURE__ */ new Date()).toISOString();
-  const vid = lastUpdated.replace(/[-:T.Z]/g, "").slice(0, 12) || Date.now().toString(36);
-  const resourceLike = resourceWithAudit;
-  const summary = JSON.stringify(extractSummary13(resourceLike));
-  const gsi1sk = extractSortKey(resourceLike);
-  await entity.put({
-    sk: DATA_ENTITY_SK,
-    tenantId,
-    workspaceId,
-    id,
-    resource: compressResource(JSON.stringify(resourceWithAudit)),
-    summary,
-    vid,
-    lastUpdated,
-    gsi1sk
-  }).go();
-  return {
-    id,
-    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,
-    workspaceId,
-    id,
-    sk: DATA_ENTITY_SK
-  }).go();
-  if (!existing.data) {
-    throw new NotFoundError(`${resourceLabel} ${id} not found`, {
-      details: { id }
-    });
-  }
-  const existingStr = decompressResource(existing.data.resource);
-  const { resource, lastUpdated } = buildPatched(existingStr);
-  const resourceLike = resource;
-  const summary = JSON.stringify(extractSummary13(resourceLike));
-  const gsi1sk = extractSortKey(resourceLike);
-  await entity.patch({
-    tenantId,
-    workspaceId,
-    id,
-    sk: DATA_ENTITY_SK
-  }).set({
-    resource: compressResource(JSON.stringify(resource)),
-    summary,
-    lastUpdated,
-    gsi1sk
-  }).go();
-  return {
-    id,
-    resource
-  };
-}
-
 // src/data/operations/data/account/account-create-operation.ts
 async function createAccountOperation(params) {
   const { context, body, tableName } = params;
@@ -25035,7 +25212,7 @@ function extractPatient(parsed) {
     "File must be a FHIR Patient resource or a Bundle containing at least one Patient entry"
   );
 }
-var SK5 = "CURRENT";
+var SK12 = "CURRENT";
 var defaultAudit = {
   createdDate: (/* @__PURE__ */ new Date()).toISOString(),
   createdById: "import",
@@ -25073,7 +25250,7 @@ function patientToPutAttrs(patient, options) {
     patientWithMeta.meta.lastUpdated = lastUpdated;
   }
   return {
-    sk: SK5,
+    sk: SK12,
     tenantId,
     workspaceId,
     id: patient.id,