call out to Octopus Imaging API from database-bridge-lambda in createItem mutation if the type is imaging-request

Author: twrichards

client/src/app.tsx

@@ -22,7 +22,7 @@ import {
   gqlSetWebPushSubscriptionForUser,
 } from "../gql";
 import { Item, MyUser, User } from "shared/graphql/graphql";
-import { ItemWithParsedPayload } from "./types/ItemWithParsedPayload";
+import { ItemWithParsedPayload } from "shared/types/ItemWithParsedPayload";
 import { HiddenIFrameForServiceWorker } from "./pushNotificationPreferences";
 import { GlobalStateProvider } from "./globalState";
 import { Floaty } from "./floaty";

client/src/grid/octopusImagingOrderDisplay.tsx

@@ -78,6 +78,12 @@ export const OctopusImagingOrderDisplay = ({
           payload.requestType
         )}
       </div>
+      {payload.octopusImagingOrderId && (
+        <div>
+          <strong>Order ID: </strong>
+          {payload.octopusImagingOrderId}
+        </div>
+      )}
     </div>
   );
 };

client/src/push-notifications/serviceWorker.ts

@@ -1,10 +1,10 @@
-import { ItemWithParsedPayload } from "../types/ItemWithParsedPayload";
+import { ItemWithParsedPayload } from "shared/types/ItemWithParsedPayload";
 import {
   EXPAND_PINBOARD_QUERY_PARAM,
   OPEN_PINBOARD_QUERY_PARAM,
   PINBOARD_ITEM_ID_QUERY_PARAM,
-} from "../../../shared/constants";
-import { extractNameFromEmail } from "../../../shared/util";
+} from "shared/constants";
+import { extractNameFromEmail } from "shared/util";
 
 const toolsDomain = self.location.hostname.replace("pinboard.", "");
 

client/src/types/ItemWithParsedPayload.ts

@@ -78,7 +78,9 @@ export type MamVideoPayload = {
 
 export type ImagingOrderPayload = {
   type: typeof IMAGING_REQUEST_ITEM_TYPE;
-  payload: PayloadWithRequestType;
+  payload: PayloadWithRequestType & {
+    octopusImagingOrderId?: string; // populated once ordered
+  };
 };
 
 export type PayloadAndType =

client/src/types/PayloadAndType.ts

@@ -5,6 +5,8 @@ import prompts from "prompts";
 import { DatabaseOperation } from "../shared/graphql/operations";
 import { getYourEmail } from "../shared/local/yourEmail";
 import { CreateItemInput, EditItemInput } from "../shared/graphql/graphql";
+import { performImagingRequest } from "./src/imagingRequestCallout";
+import { ItemWithParsedPayload } from "shared/types/ItemWithParsedPayload";
 
 (async () => {
   const baseInput = {
@@ -48,16 +50,29 @@ 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: [
+        { title: "SAMPLE IMAGING ORDER", value: "imaging-request" },
+        ...Object.entries(sampleInputs).map(([operation, sampleInput]) => ({
+          title: operation,
+          value: {
+            ...baseInput,
+            arguments: sampleInput,
+            info: { fieldName: operation },
+          } as AppSyncResolverEvent<unknown, unknown>,
+        })),
+      ],
     });
 
-    console.log(JSON.stringify(await handler(inputPayload), null, 2));
+    console.log(
+      JSON.stringify(
+        inputPayload === "imaging-request"
+          ? await performImagingRequest({
+              item: {} as ItemWithParsedPayload,
+            })
+          : await handler(inputPayload),
+        null,
+        2
+      )
+    );
   }
 })();

database-bridge-lambda/run.ts

@@ -0,0 +1,36 @@
+import fetch from "node-fetch";
+import { getEnvironmentVariableOrThrow } from "shared/environmentVariables";
+import { ItemWithParsedPayload } from "shared/types/ItemWithParsedPayload";
+
+export const performImagingRequest = async ({
+  item,
+}: {
+  item: ItemWithParsedPayload;
+}) => {
+  process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0"; // self-signed cert on imaging server, which fails SSL check, so ignore
+  const response = await fetch(
+    `https://${getEnvironmentVariableOrThrow(
+      "octopusImagingApiVpcEndpoint"
+    )}/v1/rgbimageorder`,
+    {
+      // note this travels via vpc endpoint, via VPN to specific machine(s) on office network, no need to auth at this point
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({
+        workflowId: item.pinboardId,
+        pinboardItemId: item.id,
+        lastUser: item.userEmail,
+        notes: item.message, //TODO check for 256 max (probably limit in UI too)
+        requestType: item.payload?.requestType, // TODO tighten this up
+        // gridId: TODO extract from url in payload probably
+        // composerId: TODO lookup somehow
+        // pubDate TODO scheduled launch vs some date field in workflow - what's worse wrong date or no date?
+        // section TODO lookup somehow
+        // story group name TODO (synced from InCopy most likely, if available)
+      }),
+    }
+  );
+  return (await response.json()).octopusImagingOrderId;
+};

database-bridge-lambda/src/imagingRequestCallout.ts

@@ -3,9 +3,12 @@ import {
   EditItemInput,
   Item,
   PinboardIdWithClaimCounts,
-} from "../../../shared/graphql/graphql";
-import { Sql } from "../../../shared/database/types";
-import { Range } from "../../../shared/types/grafanaType";
+} 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 "shared/types/ItemWithParsedPayload";
 
 const fragmentIndividualMentionsToMentionHandles = (
   sql: Sql,
@@ -59,10 +62,32 @@ 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 TODO test/confirm this
+      const octopusImagingOrderId = await performImagingRequest({
+        item: insertResult,
+      });
+      return sql`
+        UPDATE "Item" 
+        SET "payload" = ${{
+          ...insertResult.payload,
+          octopusImagingOrderId,
+        }}
+        WHERE "id" = ${insertResult.id} 
+        RETURNING ${fragmentItemFields(sql, userEmail)}`.then(
+        (rows) => rows[0]
+      );
+    }
+    return insertResult;
+  });
 
 export const editItem = async (
   sql: Sql,

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

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