feat(package-actions): remove withdraw rai writes from seatool

.gitignore

@@ -11,6 +11,7 @@ cdk.context.json
 build_run
 .build_run
 DS_Store
+.DS_Store
 
 # legacy ignores
 .serverless

lib/lambda/package-actions/toggle-rai-response-withdraw/toggle-rai-response-withdraw.test.ts

@@ -1,6 +1,6 @@
 import { toggleRaiResponseWithdraw } from "./toggle-rai-response-withdraw";
 import { vi, describe, it, expect } from "vitest";
-import { Action, toggleWithdrawRaiEnabledSchema } from "shared-types";
+import { Action, events } from "shared-types";
 import { generateMock } from "@anatine/zod-mock";
 import * as packageActionWriteService from "../services/package-action-write-service";
 
@@ -25,7 +25,7 @@ describe("toggleRaiResponseWithdraw", async () => {
       "toggleRaiResponseWithdrawAction",
     );
 
-    const mockData = generateMock(toggleWithdrawRaiEnabledSchema);
+    const mockData = generateMock(events["toggle-withdraw-rai"].baseSchema);
     const toggleRaiWithdraw = await toggleRaiResponseWithdraw(mockData);
 
     expect(packageWriteSpy).toHaveBeenCalledOnce();
@@ -38,7 +38,7 @@ describe("toggleRaiResponseWithdraw", async () => {
       "toggleRaiResponseWithdrawAction",
     );
 
-    const mockData = generateMock(toggleWithdrawRaiEnabledSchema);
+    const mockData = generateMock(events["toggle-withdraw-rai"].baseSchema);
     await toggleRaiResponseWithdraw({ ...mockData, toggle: true });
 
     expect(packageWriteSpy).toHaveBeenCalledWith(
@@ -49,7 +49,7 @@ describe("toggleRaiResponseWithdraw", async () => {
   });
 
   it("calls package write service with action set to Disable RAI when toggle set to false", async () => {
-    const mockData = generateMock(toggleWithdrawRaiEnabledSchema);
+    const mockData = generateMock(events["toggle-withdraw-rai"].baseSchema);
     await toggleRaiResponseWithdraw(mockData);
   });
 });

lib/lambda/package-actions/toggle-rai-response-withdraw/toggle-rai-response-withdraw.ts

@@ -1,4 +1,4 @@
-import { toggleWithdrawRaiEnabledSchema, Action } from "shared-types";
+import { Action, events } from "shared-types";
 import { response } from "../../../libs/handler-lib";
 import { TOPIC_NAME } from "../consts";
 import { toggleRaiResponseWithdrawAction } from "../services/package-action-write-service";
@@ -8,7 +8,7 @@ export async function toggleRaiResponseWithdraw({
   ...body
 }: Record<string, unknown> & { toggle?: boolean }) {
   const now = new Date().getTime();
-  const result = toggleWithdrawRaiEnabledSchema.safeParse({
+  const result = events["toggle-withdraw-rai"].baseSchema.safeParse({
     ...body,
     raiWithdrawEnabled: toggle,
   });

lib/lambda/package-actions/withdraw-rai/withdraw-rai.ts

@@ -1,4 +1,4 @@
-import { raiWithdrawSchema, SEATOOL_STATUS, Action } from "shared-types";
+import { events, SEATOOL_STATUS, Action } from "shared-types";
 import { seaToolFriendlyTimestamp } from "shared-utils";
 import { response } from "../../../libs/handler-lib";
 import { TOPIC_NAME } from "../consts";
@@ -28,7 +28,7 @@ export async function withdrawRai(
   const now = new Date().getTime();
   const today = seaToolFriendlyTimestamp();
 
-  const result = raiWithdrawSchema.safeParse({
+  const result = events["withdraw-rai"].baseSchema.safeParse({
     ...body,
     requestedDate: raiToWithdraw,
     withdrawnDate: today,

lib/lambda/sinkMain.ts

@@ -86,9 +86,6 @@ const processAndIndex = async ({
       }
 
       // If the event is a supported event, transform and push to docs array for indexing
-      console.log("event below");
-      console.log(record.event);
-
       if (record.event in transforms) {
         const transformForEvent =
           transforms[record.event as keyof typeof transforms];

lib/lambda/submit/submissionPayloads/index.ts

@@ -7,6 +7,8 @@ import { contractingAmendment } from "./contracting-amendment";
 import { contractingInitial } from "./contracting-initial";
 import { contractingRenewal } from "./contracting-renewal";
 import { temporaryExtension } from "./temporary-extension";
+import { withdrawRai } from "./withdraw-rai";
+import { toggleWithdrawRai } from "./toggle-withdraw-rai";
 
 export const submissionPayloads = {
   "capitated-amendment": capitatedAmendment,
@@ -18,4 +20,6 @@ export const submissionPayloads = {
   "new-chip-submission": newChipSubmission,
   "new-medicaid-submission": newMedicaidSubmission,
   "temporary-extension": temporaryExtension,
+  "withdraw-rai": withdrawRai,
+  "toggle-withdraw-rai": toggleWithdrawRai,
 };

lib/lambda/submit/submissionPayloads/toggle-withdraw-rai.ts

@@ -0,0 +1,46 @@
+import { events } from "shared-types/events";
+import {
+  isAuthorized,
+  getAuthDetails,
+  lookupUserAttributes,
+} from "../../../libs/api/auth/user";
+import { type APIGatewayEvent } from "aws-lambda";
+import { itemExists } from "libs/api/package";
+
+export const toggleWithdrawRai = async (event: APIGatewayEvent) => {
+  if (!event.body) return;
+
+  const parsedResult = events["toggle-withdraw-rai"].baseSchema.safeParse(
+    JSON.parse(event.body),
+  );
+
+  if (!parsedResult.success) {
+    throw parsedResult.error;
+  }
+
+  // This is the backend check for auth
+  if (!(await isAuthorized(event, parsedResult.data.id.slice(0, 2)))) {
+    throw "Unauthorized";
+  }
+
+  if (!(await itemExists({ id: parsedResult.data.id }))) {
+    throw "Item Does Not Exist";
+  }
+
+  const authDetails = getAuthDetails(event);
+  const userAttr = await lookupUserAttributes(
+    authDetails.userId,
+    authDetails.poolId,
+  );
+  const submitterEmail = userAttr.email;
+  const submitterName = `${userAttr.given_name} ${userAttr.family_name}`;
+
+  const transformedData = events["toggle-withdraw-rai"].schema.parse({
+    ...parsedResult.data,
+    submitterName,
+    submitterEmail,
+    timestamp: Date.now(),
+  });
+
+  return transformedData;
+};

lib/lambda/submit/submissionPayloads/withdraw-rai.ts

@@ -0,0 +1,46 @@
+import { events } from "shared-types/events";
+import {
+  isAuthorized,
+  getAuthDetails,
+  lookupUserAttributes,
+} from "../../../libs/api/auth/user";
+import { type APIGatewayEvent } from "aws-lambda";
+import { itemExists } from "libs/api/package";
+
+export const withdrawRai = async (event: APIGatewayEvent) => {
+  if (!event.body) return;
+
+  const parsedResult = events["withdraw-rai"].baseSchema.safeParse(
+    JSON.parse(event.body),
+  );
+
+  if (!parsedResult.success) {
+    throw parsedResult.error;
+  }
+
+  // This is the backend check for auth
+  if (!(await isAuthorized(event, parsedResult.data.id.slice(0, 2)))) {
+    throw "Unauthorized";
+  }
+
+  if (!(await itemExists({ id: parsedResult.data.id }))) {
+    throw "Item Does Not Exist";
+  }
+
+  const authDetails = getAuthDetails(event);
+  const userAttr = await lookupUserAttributes(
+    authDetails.userId,
+    authDetails.poolId,
+  );
+  const submitterEmail = userAttr.email;
+  const submitterName = `${userAttr.given_name} ${userAttr.family_name}`;
+
+  const transformedData = events["withdraw-rai"].schema.parse({
+    ...parsedResult.data,
+    submitterName,
+    submitterEmail,
+    timestamp: Date.now(),
+  });
+
+  return transformedData;
+};

lib/lambda/submit/submit.ts

@@ -15,8 +15,6 @@ export const submit = async (event: APIGatewayEvent) => {
 
   const body: BaseSchemas = JSON.parse(event.body);
 
-  console.log(body);
-
   // If there's no event, we reject
   if (!body.event) {
     return response({
@@ -35,7 +33,6 @@ export const submit = async (event: APIGatewayEvent) => {
 
   try {
     const eventBody = await submissionPayloads[body.event](event);
-
     await produceMessage(
       process.env.topicName as string,
       body.id,

lib/packages/shared-types/events/index.ts

@@ -8,8 +8,9 @@ import * as contractingAmendment from "./contracting-amendment";
 import * as contractingInitial from "./contracting-initial";
 import * as contractingRenewal from "./contracting-renewal";
 import * as temporaryExtension from "./temporary-extension";
+import * as withdrawRai from "./withdraw-rai";
+import * as toggleWithdrawRai from "./toggle-withdraw-rai";
 
-export * from "./toggle-withdraw-rai-enabled";
 export * from "./issue-rai";
 export * from "./respond-to-rai";
 export * from "./withdraw-rai";
@@ -32,6 +33,8 @@ export const events = {
   "new-chip-submission": newChipSubmission,
   "new-medicaid-submission": newMedicaidSubmission,
   "temporary-extension": temporaryExtension,
+  "withdraw-rai": withdrawRai,
+  "toggle-withdraw-rai": toggleWithdrawRai,
 };
 
 export type BaseSchemas = z.infer<typeof newMedicaidSubmission.baseSchema>;

lib/packages/shared-types/events/toggle-withdraw-rai.ts

@@ -0,0 +1,28 @@
+import { z } from "zod";
+
+// export const toggleWithdrawRaiEnabledSchema = z.object({
+//   id: z.string(),
+//   authority: z.string(),
+//   origin: z.string(),
+//   raiWithdrawEnabled: z.boolean(),
+//   submitterName: z.string(),
+//   submitterEmail: z.string(),
+//   timestamp: z.number().optional(),
+// });
+// export type ToggleWithdrawRaiEnabled = z.infer<
+//   typeof toggleWithdrawRaiEnabledSchema
+// >;
+
+export const baseSchema = z.object({
+  event: z.literal("toggle-withdraw-rai").default("toggle-withdraw-rai"),
+  id: z.string(),
+  authority: z.string(),
+  raiWithdrawEnabled: z.boolean(),
+});
+
+export const schema = baseSchema.extend({
+  origin: z.literal("mako").default("mako"),
+  submitterName: z.string(),
+  submitterEmail: z.string().email(),
+  timestamp: z.number().optional(),
+});