Merge pull request #101 from nulib/3456-collection-rep-image

Refactor getThumbnail endpoint to support new indexed collection representative_image data shape
nulib · Feb 3, 2023 · 555450c · 555450c
2 parents 376e7d4 + d1610db
commit 555450c
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 77 deletions.
diff --git a/src/handlers/get-thumbnail.js b/src/handlers/get-thumbnail.js
@@ -30,22 +30,33 @@ function validateRequest(event) {
   return { id, aspect, size };
 }
 
-const getWorkThumbnail = async (id, aspect, size, event) => {
+const getThumbnail = async (id, aspect, size, event) => {
   const allowUnpublished = event.userToken.hasEntitlement(id);
   const allowPrivate = allowUnpublished || event.userToken.isReadingRoom();
 
-  const esResponse = await getWork(id, {
-    allowPrivate,
-    allowUnpublished,
-  });
-
-  if (esResponse.statusCode != 200) {
-    return opensearchResponse.transform(esResponse);
+  let esResponse;
+  let body;
+  let iiif_base;
+  if (event.rawPath.match(/\/collections\//)) {
+    esResponse = await getCollection(id, {
+      allowPrivate,
+      allowUnpublished,
+    });
+    if (esResponse.statusCode != 200)
+      return { error: await opensearchResponse.transform(esResponse) };
+    body = JSON.parse(esResponse.body);
+    iiif_base = body?._source?.representative_image?.url;
+  } else {
+    esResponse = await getWork(id, {
+      allowPrivate,
+      allowUnpublished,
+    });
+    if (esResponse.statusCode != 200)
+      return { error: await opensearchResponse.transform(esResponse) };
+    body = JSON.parse(esResponse.body);
+    iiif_base = body?._source?.representative_file_set?.url;
   }
 
-  const body = JSON.parse(esResponse.body);
-  const iiif_base = body?._source?.representative_file_set?.url;
-
   if (!iiif_base) {
     return {
       statusCode: 404,
@@ -89,39 +100,13 @@ const getWorkThumbnail = async (id, aspect, size, event) => {
   };
 };
 
-const getParameters = async (event) => {
-  const { id, aspect, size } = validateRequest(event);
-  if (event.rawPath.match(/\/collections\//)) {
-    const esResponse = await getCollection(id);
-    if (esResponse.statusCode != 200) {
-      return { error: await opensearchResponse.transform(esResponse) };
-    }
-
-    const body = JSON.parse(esResponse.body);
-    const workId = body?._source?.representative_image?.work_id;
-    return { id: workId, aspect, size };
-  } else {
-    return { id, aspect, size };
-  }
-};
-
 /**
  * A simple function to proxy a Collection or Work thumbnail from the IIIF server
  */
 exports.handler = wrap(async (event) => {
   try {
-    const { id, aspect, size, error } = await getParameters(event);
-    if (error) {
-      return error;
-    } else if (!id) {
-      return {
-        statusCode: 404,
-        headers: { "content-type": "text/plain" },
-        body: "Not Found",
-      };
-    } else {
-      return await getWorkThumbnail(id, aspect, size, event);
-    }
+    const { id, aspect, size } = validateRequest(event);
+    return await getThumbnail(id, aspect, size, event);
   } catch (err) {
     return {
       statusCode: 400,

diff --git a/test/fixtures/mocks/collection-1234-private-published.json b/test/fixtures/mocks/collection-1234-private-published.json
@@ -11,7 +11,8 @@
     "published": true,
     "visibility": "Private",
     "representative_image": {
-      "work_id": "1234"
+      "work_id": "1234",
+      "url": "https://index.test.library.northwestern.edu/iiif/2/mbk-dev/5678"
     }
   }
 }
diff --git a/test/fixtures/mocks/collection-1234.json b/test/fixtures/mocks/collection-1234.json
@@ -10,7 +10,8 @@
     "api_model": "Collection",
     "published": true,
     "representative_image": {
-      "work_id": "1234"
+      "work_id": "1234",
+      "url": "https://index.test.library.northwestern.edu/iiif/2/mbk-dev/5678"
     }
   }
 }
diff --git a/test/integration/get-thumbnail.test.js b/test/integration/get-thumbnail.test.js
@@ -31,9 +31,6 @@ describe("Thumbnail routes", () => {
       mock
         .get("/dc-v2-collection/_doc/1234")
         .reply(200, helpers.testFixture("mocks/collection-1234.json"));
-      mock
-        .get("/dc-v2-work/_doc/1234")
-        .reply(200, helpers.testFixture("mocks/work-1234.json"));
       mock
         .get("/iiif/2/mbk-dev/5678/full/!300,300/0/default.jpg")
         .reply(200, helpers.testFixture("mocks/thumbnail_full.jpg"), {
@@ -50,9 +47,6 @@ describe("Thumbnail routes", () => {
       mock
         .get("/dc-v2-collection/_doc/1234")
         .reply(200, helpers.testFixture("mocks/collection-1234.json"));
-      mock
-        .get("/dc-v2-work/_doc/1234")
-        .reply(200, helpers.testFixture("mocks/work-1234.json"));
       mock
         .get("/iiif/2/mbk-dev/5678/full/!300,300/0/default.jpg")
         .reply(403, "Forbidden", { "Content-Type": "text/plain" });
@@ -69,20 +63,7 @@ describe("Thumbnail routes", () => {
         .reply(200, helpers.testFixture("mocks/missing-collection-1234.json"));
 
       const result = await handler(event.render());
-      expect(result.statusCode).to.eq(404);
-      expectCorsHeaders(result);
-    });
-
-    it("returns 404 if the work doc can't be found", async () => {
-      mock
-        .get("/dc-v2-collection/_doc/1234")
-        .reply(200, helpers.testFixture("mocks/collection-1234.json"));
-      mock
-        .get("/dc-v2-work/_doc/1234")
-        .reply(200, helpers.testFixture("mocks/missing-work-1234.json"));
-
-      const result = await handler(event.render());
-      expect(result.statusCode).to.eq(404);
+      expect(result.error.statusCode).to.eq(404);
       expectCorsHeaders(result);
     });
 
@@ -98,19 +79,6 @@ describe("Thumbnail routes", () => {
       expect(result.statusCode).to.eq(404);
       expectCorsHeaders(result);
     });
-
-    it("returns 404 if the work doc has no thumbnail", async () => {
-      mock
-        .get("/dc-v2-collection/_doc/1234")
-        .reply(200, helpers.testFixture("mocks/collection-1234.json"));
-      mock
-        .get("/dc-v2-work/_doc/1234")
-        .reply(200, helpers.testFixture("mocks/work-1234-no-thumbnail.json"));
-
-      const result = await handler(event.render());
-      expect(result.statusCode).to.eq(404);
-      expectCorsHeaders(result);
-    });
   });
 
   describe("Work", () => {
@@ -155,7 +123,7 @@ describe("Thumbnail routes", () => {
         .reply(200, helpers.testFixture("mocks/missing-work-1234.json"));
 
       const result = await handler(event.render());
-      expect(result.statusCode).to.eq(404);
+      expect(result.error.statusCode).to.eq(404);
       expectCorsHeaders(result);
     });
 
@@ -175,7 +143,7 @@ describe("Thumbnail routes", () => {
         .reply(200, helpers.testFixture("mocks/private-work-1234.json"));
 
       const result = await handler(event.render());
-      expect(result.statusCode).to.eq(404);
+      expect(result.error.statusCode).to.eq(404);
     });
 
     it("returns 200 if the work is private and the user is in the reading room", async () => {
@@ -200,7 +168,7 @@ describe("Thumbnail routes", () => {
         .reply(200, helpers.testFixture("mocks/unpublished-work-1234.json"));
 
       const result = await handler(event.render());
-      expect(result.statusCode).to.eq(404);
+      expect(result.error.statusCode).to.eq(404);
     });
 
     it("returns 200 if there is an entitlement for an unpublished, private work", async () => {