Merge pull request #2216 from metriport/master

BACKMERGE

packages/core/src/external/carequality/ihe-gateway-v2/outbound/xca/process/dq-response.ts

@@ -135,7 +135,7 @@ function parseDocumentReference(
  const documentReference: DocumentReference = {
  homeCommunityId: getHomeCommunityIdForDr(outboundRequest, extrinsicObject),
  repositoryUniqueId,
- docUniqueId,
+ docUniqueId: stripUrnPrefix(docUniqueId),
  contentType: extrinsicObject?._mimeType,
  language: findSlotValue("languageCode"),
  size: sizeValue ? parseInt(sizeValue) : undefined,

packages/core/src/util/__tests__/urn.test.ts

@@ -0,0 +1,36 @@
+import { stripUrnPrefix } from "../urn";
+
+beforeEach(() => {
+ jest.restoreAllMocks();
+});
+
+describe("stripUrnPrefix", () => {
+ it("returns empty string when gets undefined", async () => {
+ const res = stripUrnPrefix(undefined);
+ expect(res).toEqual("");
+ });
+
+ it("returns string when gets number", async () => {
+ const original = 123;
+ const res = stripUrnPrefix(original);
+ expect(res).toEqual("123");
+ });
+
+ it("returns stripped string when gets urn:oid", async () => {
+ const original = "urn:oid:2.16.840.1.113883.3.9621";
+ const res = stripUrnPrefix(original);
+ expect(res).toEqual("2.16.840.1.113883.3.9621");
+ });
+
+ it("returns stripped string when gets urn:uuid", async () => {
+ const original = "urn:uuid:2.16.840.1.113883.3.9621";
+ const res = stripUrnPrefix(original);
+ expect(res).toEqual("2.16.840.1.113883.3.9621");
+ });
+
+ it("returns string when its a normal oid", async () => {
+ const original = "2.16.840.1.113883.3.9621";
+ const res = stripUrnPrefix(original);
+ expect(res).toEqual("2.16.840.1.113883.3.9621");
+ });
+});

packages/core/src/util/urn.ts

@@ -1,4 +1,4 @@
-const urnRegex = /^urn:oid:/;
+const urnRegex = /^urn:(oid|uuid):/;
 
 export function wrapIdInUrnUuid(id: string): string {
  return `urn:uuid:${id}`;