call out to new octopus digital imaging ordering API during createItem mutation, if the item type is imaging-request

Author: twrichards

client/src/grid/octopusImagingOrderDisplay.tsx

@@ -68,6 +68,15 @@ export const OctopusImagingOrderDisplay = ({
         draggable={false}
         // TODO: hover for larger thumbnail
       />
+      {payload.octopusOrderId && (
+        <div
+          css={css`
+            ${agateSans.xxsmall()}
+          `}
+        >
+          <strong>Order Ref:</strong> {payload.octopusOrderId}
+        </div>
+      )}
     </div>
   );
 };

client/src/types/ItemWithParsedPayload.ts

@@ -1,5 +1,5 @@
-import { Item } from "../../../shared/graphql/graphql";
+import { Item } from "shared/graphql/graphql";
 
-export type ItemWithParsedPayload = Item & {
+export type ItemWithParsedPayload = Omit<Item, "payload"> & {
   payload: Record<string, unknown> | null | undefined;
 };

client/src/types/PayloadAndType.ts

@@ -47,6 +47,7 @@ export interface PayloadWithApiUrl extends PayloadCommon {
 
 export interface PayloadWithRequestType extends PayloadWithThumbnail {
   requestType: ImagingRequestType;
+  octopusOrderId?: string;
 }
 
 export type Payload =

database-bridge-lambda/run.ts

@@ -1,17 +1,18 @@
 import { handler } from "./src";
-import { AppSyncResolverEvent } from "aws-lambda/trigger/appsync-resolver";
-import { createDatabaseTunnel } from "../shared/database/local/databaseTunnel";
+import { createDatabaseTunnel } from "shared/database/local/databaseTunnel";
 import prompts from "prompts";
-import { DatabaseOperation } from "../shared/graphql/operations";
-import { getYourEmail } from "../shared/local/yourEmail";
-import { CreateItemInput, EditItemInput } from "../shared/graphql/graphql";
+import { DatabaseOperation } from "shared/graphql/operations";
+import { getYourEmail } from "shared/local/yourEmail";
+import { CreateItemInput, EditItemInput } from "shared/graphql/graphql";
+import { IMAGING_REQUEST_ITEM_TYPE } from "shared/octopusImaging";
 
 (async () => {
   const baseInput = {
     identity: { resolverContext: { userEmail: await getYourEmail() } },
+    request: { headers: { referrer: "LOCAL-TESTING" }, domainName: null },
   };
 
-  const sampleInputs: Partial<Record<DatabaseOperation, unknown>> = {
+  const sampleInputs = {
     listItems: { pinboardId: "63206" },
     searchMentionableUsers: { prefix: "a" },
     claimItem: { itemId: "1667" },
@@ -35,7 +36,7 @@ import { CreateItemInput, EditItemInput } from "../shared/graphql/graphql";
     deleteItem: { itemId: "2352" },
     getMyUser: {},
     visitTourStep: { tourStepId: "testing" },
-  };
+  } satisfies Partial<Record<DatabaseOperation, unknown>>;
 
   await createDatabaseTunnel();
 
@@ -48,14 +49,34 @@ import { CreateItemInput, EditItemInput } from "../shared/graphql/graphql";
       type: "select",
       name: "inputPayload",
       message: "Operation?",
-      choices: Object.entries(sampleInputs).map(([operation, sampleInput]) => ({
-        title: operation,
-        value: {
-          ...baseInput,
-          arguments: sampleInput,
-          info: { fieldName: operation },
-        } as AppSyncResolverEvent<unknown, unknown>,
-      })),
+      choices: [
+        ...Object.entries(sampleInputs).map(([operation, sampleInput]) => ({
+          title: operation,
+          value: {
+            ...baseInput,
+            arguments: sampleInput,
+            info: { fieldName: operation },
+          },
+        })),
+        {
+          title: "Digital Imaging Order (via octopus)",
+          value: {
+            ...baseInput,
+            info: { fieldName: "createItem" },
+            arguments: {
+              input: {
+                ...sampleInputs.createItem.input,
+                type: IMAGING_REQUEST_ITEM_TYPE,
+                payload: {
+                  requestType: "Cut out",
+                  embeddableUrl:
+                    "https://media.test.dev-gutools.co.uk/images/24733ea386c7fcb37496c55cc86e8f1468b9dfcf",
+                },
+              },
+            },
+          },
+        },
+      ],
     });
 
     console.log(JSON.stringify(await handler(inputPayload), null, 2));

database-bridge-lambda/src/imagingRequestCallout.ts

@@ -0,0 +1,60 @@
+import {
+  pinboardConfigPromiseGetter,
+  pinboardSecretPromiseGetter,
+  STAGE,
+} from "shared/awsIntegration";
+import fetch from "node-fetch";
+import { ItemWithParsedPayload } from "client/src/types/ItemWithParsedPayload";
+
+const paramStorePrefix = `octopus-imaging/${STAGE}`;
+const octopusImagingBaseUrl = pinboardConfigPromiseGetter(
+  `${paramStorePrefix}/base-url`
+);
+const octopusImagingApiKey = pinboardSecretPromiseGetter(
+  `${paramStorePrefix}/api-key`
+);
+const octopusImagingApiSecret = pinboardSecretPromiseGetter(
+  `${paramStorePrefix}/api-secret`
+);
+
+export const performImagingRequest = async (
+  item: ItemWithParsedPayload,
+  { embeddableUrl, requestType }: Record<string, unknown>
+): Promise<string> => {
+  const gridId = (embeddableUrl as string).split("/").pop();
+  if (!gridId) {
+    throw new Error(`Couldn't extract grid ID from payload: ${item.payload}`);
+  }
+  const imagingRequestBody = {
+    workflowId: item.pinboardId,
+    pinboardItemId: item.id,
+    gridId,
+    lastUser: item.userEmail,
+    notes: item.message, //TODO check for 256 max (probably limit in UI too)
+    requestType,
+    sectionId: 0, // FIXME this shouldn't be a requirement of the API surely
+  };
+  console.log("Performing imaging request", imagingRequestBody);
+
+  const response = await fetch(await octopusImagingBaseUrl, {
+    method: "PUT",
+    headers: {
+      "Content-Type": "application/json",
+      "x-api-key": await octopusImagingApiKey,
+      "x-api-secret": await octopusImagingApiSecret,
+    },
+    body: JSON.stringify(imagingRequestBody),
+  });
+
+  if (!response.ok) {
+    const errorMessage = `Octopus Imaging request failed: ${response.status} ${response.statusText}`;
+    console.error(errorMessage, await response.text());
+    throw Error(errorMessage);
+  }
+
+  const body = await response.json();
+
+  console.log("Imaging request successful", body);
+
+  return body.id;
+};

database-bridge-lambda/src/sql/Item.ts

@@ -8,6 +8,9 @@ import {
 } from "shared/graphql/graphql";
 import { Sql } from "shared/database/types";
 import { Range } from "shared/types/grafanaType";
+import { performImagingRequest } from "../imagingRequestCallout";
+import { IMAGING_REQUEST_ITEM_TYPE } from "shared/octopusImaging";
+import { ItemWithParsedPayload } from "client/src/types/ItemWithParsedPayload";
 
 const fragmentIndividualMentionsToMentionHandles = (
   sql: Sql,
@@ -61,10 +64,37 @@ export const createItem = async (
   args: { input: CreateItemInput },
   userEmail: string
 ) =>
-  sql`
+  sql.begin(async (sql) => {
+    const insertResult = (await sql`
         INSERT INTO "Item" ${sql({ userEmail, ...args.input })}
             RETURNING ${fragmentItemFields(sql, userEmail)}
-    `.then((rows) => rows[0]);
+    `.then((rows) => rows[0])) as ItemWithParsedPayload;
+    if (
+      insertResult.type === IMAGING_REQUEST_ITEM_TYPE &&
+      insertResult.payload
+    ) {
+      // if this throws, the SQL transaction should be rolled back
+      const octopusOrderId = await performImagingRequest(
+        insertResult,
+        insertResult.payload
+      );
+
+      const augmentedPayload = {
+        ...insertResult.payload,
+        octopusOrderId,
+      };
+
+      await sql`UPDATE "Item" SET payload = ${JSON.stringify(
+        augmentedPayload
+      )}`;
+
+      return {
+        ...insertResult,
+        payload: augmentedPayload,
+      };
+    }
+    return insertResult;
+  });
 
 export const editItem = async (
   sql: Sql,