feat(4276): add cancel operations for private/public clouds

bcgov · Jan 11, 2025 · 46b3baa · 46b3baa
1 parent be8a4e8
commit 46b3baa
Show file tree

Hide file tree

Showing 37 changed files with 401 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ localmac:
 
 .PHONY: dev
 dev:
-	@DATABASE_URL=$$(grep -m 1 '^DATABASE_URL=' app/.env.local | cut -d '=' -f 2-) \
+	@DATABASE_URL=$$(grep -m 1 '^DATABASE_URL=' app/.env.apple.local | cut -d '=' -f 2-) \
 	npm run prisma-push --prefix app && \
 	npm run dev --prefix app
 

diff --git a/app/app/api/billing/[idOrAccountCoding]/download/route.tsx b/app/app/api/billing/[idOrAccountCoding]/download/route.tsx
@@ -67,13 +67,13 @@ export const GET = apiHandler(async ({ pathParams, queryParams, session }) => {
 
   const canDownloadMou =
     session.permissions.downloadBillingMou ||
-    product.members.some(
+    product?.members.some(
       (member) =>
         member.userId === session.user.id &&
         arraysIntersect(member.roles, [PublicCloudProductMemberRole.BILLING_VIEWER]),
     );
 
-  if (!canDownloadMou) {
+  if (!canDownloadMou || !product) {
     return UnauthorizedResponse();
   }
 

diff --git a/app/app/api/private-cloud/requests/[id]/route.ts b/app/app/api/private-cloud/requests/[id]/route.ts
@@ -1,8 +1,9 @@
+import { DecisionStatus, EventType } from '@prisma/client';
 import { z } from 'zod';
 import { GlobalRole } from '@/constants';
 import createApiHandler from '@/core/api-handler';
 import { OkResponse, UnauthorizedResponse } from '@/core/responses';
-import { models } from '@/services/db';
+import { createEvent, models } from '@/services/db';
 
 const pathParamSchema = z.object({
   id: z.string(),
@@ -12,6 +13,7 @@ const apiHandler = createApiHandler({
   roles: [GlobalRole.User],
   validations: { pathParams: pathParamSchema },
 });
+
 export const GET = apiHandler(async ({ pathParams, queryParams, session }) => {
   const { id } = pathParams;
 
@@ -23,3 +25,37 @@ export const GET = apiHandler(async ({ pathParams, queryParams, session }) => {
 
   return OkResponse(request);
 });
+
+export const PUT = apiHandler(async ({ pathParams, session }) => {
+  const { id } = pathParams;
+
+  const { data: request } = await models.privateCloudRequest.get({ where: { id } }, session);
+
+  if (!request?._permissions.cancel) {
+    return UnauthorizedResponse();
+  }
+
+  const updatedRequest = await models.privateCloudRequest.update(
+    {
+      where: {
+        id,
+        decisionStatus: DecisionStatus.PENDING,
+        active: true,
+      },
+      data: {
+        decisionStatus: DecisionStatus.CANCELLED,
+      },
+      select: {
+        decisionStatus: true,
+        createdByEmail: true,
+      },
+    },
+    session,
+  );
+
+  if (updatedRequest) {
+    await createEvent(EventType.CANCEL_PRIVATE_CLOUD_REQUEST, session.user.id, { requestId: id });
+  }
+
+  return OkResponse(updatedRequest);
+});
diff --git a/app/app/api/public-cloud/products/[licencePlate]/review-mou/route.ts b/app/app/api/public-cloud/products/[licencePlate]/review-mou/route.ts
@@ -33,7 +33,7 @@ export const POST = apiHandler(async ({ pathParams, body, session }) => {
       include: publicCloudRequestDetailInclude,
     });
 
-    if (request) {
+    if (request && request.decisionData.billingId) {
       const billing = await prisma.billing.update({
         where: {
           id: request?.decisionData.billingId,

diff --git a/app/app/api/public-cloud/products/_operations/create.ts b/app/app/api/public-cloud/products/_operations/create.ts
@@ -92,7 +92,7 @@ export default async function createOp({ session, body }: { session: Session; bo
   const proms = [];
 
   // Assign a task to the expense authority for new billing
-  if (newRequest.decisionData.expenseAuthorityId && !newRequest.decisionData.billing.signed) {
+  if (newRequest.decisionData.expenseAuthorityId && !newRequest.decisionData.billing?.signed) {
     const taskProm = tasks.create(TaskType.SIGN_PUBLIC_CLOUD_MOU, { request: newRequest });
     proms.push(taskProm);
   } else {

diff --git a/app/app/api/public-cloud/products/_operations/update.ts b/app/app/api/public-cloud/products/_operations/update.ts
@@ -1,6 +1,7 @@
 import { DecisionStatus, Prisma, RequestType, EventType, TaskType } from '@prisma/client';
 import { Session } from 'next-auth';
 import { TypeOf } from 'zod';
+import prisma from '@/core/prisma';
 import { OkResponse, UnauthorizedResponse } from '@/core/responses';
 import { comparePublicProductData } from '@/helpers/product-change';
 import { sendEditRequestEmails } from '@/services/ches/public-cloud';
@@ -40,13 +41,28 @@ export default async function updateOp({
     body.expenseAuthority?.email,
   ]);
 
+  const billingInfo = product.billingId
+    ? await prisma.billing.findFirst({
+        where: {
+          id: product.billingId,
+        },
+      })
+    : null;
+
   const decisionData = {
     ...rest,
     licencePlate: product.licencePlate,
     status: product.status,
     provider: product.provider,
     createdAt: product.createdAt,
-    billing: { connect: { id: product.billingId } },
+    billing: product.billingId
+      ? {
+          connect: {
+            id: product.billingId,
+            code: billingInfo?.code,
+          },
+        }
+      : undefined, // Handle the case where `billingId` is null
     projectOwner: { connect: { email: body.projectOwner.email } },
     primaryTechnicalLead: { connect: { email: body.primaryTechnicalLead.email } },
     secondaryTechnicalLead: body.secondaryTechnicalLead
@@ -72,7 +88,9 @@ export default async function updateOp({
           requestComment,
           changes: otherChangeMeta,
           originalData: { connect: { id: previousRequest?.decisionDataId } },
-          decisionData: { create: decisionData },
+          decisionData: {
+            create: decisionData,
+          },
           requestData: { create: decisionData },
           project: { connect: { licencePlate: product.licencePlate } },
         },

diff --git a/app/app/api/public-cloud/requests/[id]/route.ts b/app/app/api/public-cloud/requests/[id]/route.ts
@@ -1,8 +1,10 @@
+import { DecisionStatus, EventType, PublicCloudRequest } from '@prisma/client';
 import { z } from 'zod';
 import { GlobalRole } from '@/constants';
 import createApiHandler from '@/core/api-handler';
+import prisma from '@/core/prisma';
 import { OkResponse, UnauthorizedResponse } from '@/core/responses';
-import { models } from '@/services/db';
+import { createEvent, models } from '@/services/db';
 
 const pathParamSchema = z.object({
   id: z.string(),
@@ -23,3 +25,90 @@ export const GET = apiHandler(async ({ pathParams, queryParams, session }) => {
 
   return OkResponse(request);
 });
+
+export const PUT = apiHandler(async ({ pathParams, session }) => {
+  const { id } = pathParams;
+
+  const { data: request } = await models.publicCloudRequest.get({ where: { id } }, session);
+
+  if (!request?._permissions.cancel) {
+    return UnauthorizedResponse();
+  }
+
+  const { data: updatedRequest } = await models.publicCloudRequest.update(
+    {
+      where: {
+        id,
+        decisionStatus: DecisionStatus.PENDING,
+        active: true,
+      },
+      data: {
+        decisionStatus: DecisionStatus.CANCELLED,
+      },
+      select: {
+        decisionStatus: true,
+        createdByEmail: true,
+        licencePlate: true,
+        decisionData: true,
+        decisionDataId: true,
+        requestDataId: true,
+        createdBy: {
+          select: {
+            id: true,
+          },
+        },
+      },
+    },
+    session,
+  );
+
+  const { decisionDataId, requestDataId, licencePlate } = updatedRequest as unknown as PublicCloudRequest;
+
+  const billingData = await prisma.billing.findFirst({
+    where: {
+      licencePlate,
+    },
+    select: {
+      expenseAuthorityId: true,
+    },
+  });
+
+  await prisma.publicCloudRequestedProject.updateMany({
+    where: {
+      expenseAuthorityId: billingData?.expenseAuthorityId,
+    },
+    data: {
+      expenseAuthorityId: null,
+      billingId: null,
+    },
+  });
+
+  await prisma.billing.deleteMany({
+    where: {
+      licencePlate,
+      signed: false,
+    },
+  });
+
+  await prisma.task.deleteMany({
+    where: {
+      data: {
+        equals: {
+          licencePlate,
+        },
+      },
+    },
+  });
+
+  await prisma.publicCloudRequest.update({
+    where: { id },
+    data: {
+      decisionDataId,
+      requestDataId,
+    },
+  });
+
+  await createEvent(EventType.CANCEL_PUBLIC_CLOUD_REQUEST, session.user.id, { requestId: id });
+
+  return OkResponse(true);
+});
diff --git a/app/app/private-cloud/requests/(request)/[id]/request/page.tsx b/app/app/private-cloud/requests/(request)/[id]/request/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { PrivateCloudProject } from '@prisma/client';
+import { DecisionStatus, PrivateCloudProject } from '@prisma/client';
 import {
   IconInfoCircle,
   IconUsersGroup,
@@ -9,9 +9,11 @@ import {
   IconMessage,
   IconWebhook,
 } from '@tabler/icons-react';
+import { useSession } from 'next-auth/react';
 import { useEffect, useState } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { z } from 'zod';
+import CancelRequest from '@/components/buttons/CancelButton';
 import PreviousButton from '@/components/buttons/Previous';
 import ProjectDescription from '@/components/form/ProjectDescriptionPrivate';
 import TeamContacts from '@/components/form/TeamContacts';
@@ -133,6 +135,9 @@ export default privateCloudRequestRequest(({}) => {
     });
   }
 
+  const { data: session } = useSession();
+  const canCancel = session?.user.email === snap.currentRequest.createdByEmail;
+
   return (
     <div>
       <FormProvider {...methods}>
@@ -141,6 +146,9 @@ export default privateCloudRequestRequest(({}) => {
 
           <div className="mt-5 flex items-center justify-start gap-x-2">
             <PreviousButton />
+            {snap.currentRequest.decisionStatus === DecisionStatus.PENDING && canCancel && (
+              <CancelRequest id={snap.currentRequest.id} context={'PRIVATE'} />
+            )}
           </div>
         </form>
       </FormProvider>

diff --git a/app/app/public-cloud/products/(product)/[licencePlate]/edit/page.tsx b/app/app/public-cloud/products/(product)/[licencePlate]/edit/page.tsx
@@ -49,7 +49,7 @@ export default publicCloudProductEdit(({}) => {
     defaultValues: {
       ...snap.currentProduct,
       isAgMinistryChecked: true,
-      accountCoding: snap.currentProduct?.billing.accountCoding,
+      accountCoding: snap.currentProduct?.billing?.accountCoding,
     },
   });
 
@@ -131,7 +131,7 @@ export default publicCloudProductEdit(({}) => {
       label: 'Billing (Account coding)',
       description: '',
       Component: AccountCoding,
-      componentArgs: { accountCodingInitial: snap.currentProduct?.billing.accountCoding, disabled: true },
+      componentArgs: { accountCodingInitial: snap.currentProduct?.billing?.accountCoding, disabled: true },
     },
   ];
 

diff --git a/app/app/public-cloud/requests/(request)/[id]/original/page.tsx b/app/app/public-cloud/requests/(request)/[id]/original/page.tsx
@@ -118,7 +118,7 @@ export default publicCloudRequestOriginal(({ router }) => {
       description: '',
       Component: AccountCoding,
       componentArgs: {
-        accountCodingInitial: snap.currentRequest.originalData?.billing.accountCoding,
+        accountCodingInitial: snap.currentRequest.originalData?.billing?.accountCoding,
         disabled: true,
       },
     },

diff --git a/app/app/public-cloud/requests/(request)/[id]/page.tsx b/app/app/public-cloud/requests/(request)/[id]/page.tsx
@@ -98,7 +98,7 @@ export default publicCloudRequest(({ getPathParams }) => {
       label: 'Billing (account coding)',
       description: '',
       Component: AccountCoding,
-      componentArgs: { accountCodingInitial: request.decisionData.billing.accountCoding, disabled: true },
+      componentArgs: { accountCodingInitial: request.decisionData.billing?.accountCoding, disabled: true },
     },
   ];