Merge pull request #3700 from bcgov/feat/3697

junminahn · web-flow · commit 8e1ffeebb345 · 2024-09-06T17:04:29.000-07:00
feat(3697): add separate billing code by providers
diff --git a/Makefile b/Makefile
@@ -3,12 +3,12 @@ SHELL := /usr/bin/env bash
 .PHONY: localdev
 localdev:
 	export MACHINE_HOST_IP=$$(hostname -I | awk '{print $$1}'); \
-	docker-compose -f ./localdev/docker-compose.yml up --build
+	docker-compose -f ./localdev/docker-compose.yml up --build --remove-orphans
 
 .PHONY: localmac
 localmac:
 	export MACHINE_HOST_IP=$$(ipconfig getifaddr en0); \
-	docker-compose -f ./localdev/docker-compose.yml -f ./localdev/docker-compose-arm64.yml up --build
+	docker-compose -f ./localdev/docker-compose.yml -f ./localdev/docker-compose-arm64.yml up --build --remove-orphans
 
 .PHONY: dev
 dev:
diff --git a/app/app/api/billing/[idOrAccountCoding]/download/route.tsx b/app/app/api/billing/[idOrAccountCoding]/download/route.tsx
@@ -1,10 +1,11 @@
-import { Prisma, RequestType } from '@prisma/client';
+import { Provider, Cluster, RequestType } from '@prisma/client';
 import { z } from 'zod';
 import createApiHandler from '@/core/api-handler';
 import prisma from '@/core/prisma';
 import { PdfResponse, BadRequestResponse } from '@/core/responses';
 import { generateEmouPdf, Product } from '@/helpers/pdfs/emou';
 import { PermissionsEnum } from '@/types/permissions';
+import { processNumber, processUpperEnumString, processBoolean } from '@/utils/zod';
 import { getBillingIdWhere } from '../helpers';
 
 const pathParamSchema = z.object({
@@ -13,6 +14,7 @@ const pathParamSchema = z.object({
 
 const queryParamSchema = z.object({
   licencePlate: z.string().optional(),
+  context: z.preprocess(processUpperEnumString, z.union([z.nativeEnum(Provider), z.nativeEnum(Cluster)]).optional()),
 });
 
 const apiHandler = createApiHandler({
@@ -22,9 +24,9 @@ const apiHandler = createApiHandler({
 
 export const GET = apiHandler(async ({ pathParams, queryParams, session }) => {
   const { idOrAccountCoding } = pathParams;
-  const { licencePlate } = queryParams;
+  const { licencePlate, context } = queryParams;
 
-  const billingWhereId = getBillingIdWhere(idOrAccountCoding);
+  const billingWhereId = getBillingIdWhere(idOrAccountCoding, context);
   const billing = await prisma.billing.findFirst({
     where: { signed: true, approved: true, ...billingWhereId },
     include: {
diff --git a/app/app/api/billing/[idOrAccountCoding]/exist/route.ts b/app/app/api/billing/[idOrAccountCoding]/exist/route.ts
@@ -1,22 +1,29 @@
-import { Prisma } from '@prisma/client';
+import { Provider, Cluster } from '@prisma/client';
 import { z } from 'zod';
 import createApiHandler from '@/core/api-handler';
 import prisma from '@/core/prisma';
 import { NoContent, OkResponse } from '@/core/responses';
+import { processNumber, processUpperEnumString, processBoolean } from '@/utils/zod';
 import { getBillingIdWhere } from '../helpers';
 
 const pathParamSchema = z.object({
   idOrAccountCoding: z.string(),
 });
 
+const queryParamSchema = z.object({
+  context: z.preprocess(processUpperEnumString, z.union([z.nativeEnum(Provider), z.nativeEnum(Cluster)]).optional()),
+});
+
 const apiHandler = createApiHandler({
   roles: ['user'],
-  validations: { pathParams: pathParamSchema },
+  validations: { pathParams: pathParamSchema, queryParams: queryParamSchema },
 });
 
-export const GET = apiHandler(async ({ pathParams, session }) => {
+export const GET = apiHandler(async ({ pathParams, queryParams, session }) => {
   const { idOrAccountCoding } = pathParams;
-  const billingWhereId = getBillingIdWhere(idOrAccountCoding);
+  const { context } = queryParams;
+
+  const billingWhereId = getBillingIdWhere(idOrAccountCoding, context);
 
   const count = await prisma.billing.count({
     where: billingWhereId,
diff --git a/app/app/api/billing/[idOrAccountCoding]/helpers.ts b/app/app/api/billing/[idOrAccountCoding]/helpers.ts
@@ -1,9 +1,8 @@
-import ObjectID from 'bson-objectid';
+export function getBillingIdWhere(idOrAccountCoding: string, context?: string) {
+  if (!context) {
+    return { id: idOrAccountCoding };
+  }
 
-export function getBillingIdWhere(idOrAccountCoding: string) {
-  const isPotentialObjectId = ObjectID.isValid(idOrAccountCoding);
-  const billingWhereId = isPotentialObjectId
-    ? { OR: [{ id: idOrAccountCoding }, { accountCoding: idOrAccountCoding }] }
-    : { accountCoding: idOrAccountCoding };
-  return billingWhereId;
+  const code = `${idOrAccountCoding}_${context}`;
+  return { code };
 }
diff --git a/app/app/api/billing/[idOrAccountCoding]/route.ts b/app/app/api/billing/[idOrAccountCoding]/route.ts
@@ -1,21 +1,28 @@
+import { Provider, Cluster } from '@prisma/client';
 import { z } from 'zod';
 import createApiHandler from '@/core/api-handler';
 import prisma from '@/core/prisma';
 import { OkResponse } from '@/core/responses';
 import { BillingGetPayload } from '@/types/billing';
+import { processNumber, processUpperEnumString, processBoolean } from '@/utils/zod';
 import { getBillingIdWhere } from './helpers';
 
 const pathParamSchema = z.object({
   idOrAccountCoding: z.string(),
 });
 
+const queryParamSchema = z.object({
+  context: z.preprocess(processUpperEnumString, z.union([z.nativeEnum(Provider), z.nativeEnum(Cluster)]).optional()),
+});
+
 export const GET = createApiHandler({
   roles: ['user'],
-  validations: { pathParams: pathParamSchema },
-})(async ({ pathParams, session }) => {
+  validations: { pathParams: pathParamSchema, queryParams: queryParamSchema },
+})(async ({ pathParams, queryParams, session }) => {
   const { idOrAccountCoding } = pathParams;
+  const { context } = queryParams;
 
-  const billingWhereId = getBillingIdWhere(idOrAccountCoding);
+  const billingWhereId = getBillingIdWhere(idOrAccountCoding, context);
 
   const billing: BillingGetPayload | null = await prisma.billing.findFirst({
     where: billingWhereId,
diff --git a/app/app/public-cloud/products/(product)/create/page.tsx b/app/app/public-cloud/products/(product)/create/page.tsx
@@ -93,7 +93,7 @@ export default publicCloudProductNew(({ pathParams, queryParams, session }) => {
         )
         .refine(
           async (formData) => {
-            const hasBilling = await existBilling(formData.accountCoding);
+            const hasBilling = await existBilling(formData.accountCoding, formData.provider);
             if (!hasBilling) return true;
             return formData.isEaApproval;
           },
diff --git a/app/components/billing/PublicCloudBillingDownloadButton.tsx b/app/components/billing/PublicCloudBillingDownloadButton.tsx
@@ -16,7 +16,7 @@ export default function BillingDownloadButton({ product }: { product: Product })
       className="mt-2"
       onClick={async () => {
         setLoading(true);
-        await downloadBilling(product.billing.accountCoding, product.licencePlate);
+        await downloadBilling(product.billing.accountCoding, product.provider, product.licencePlate);
         setLoading(false);
       }}
     >
diff --git a/app/components/form/AccountCoding.tsx b/app/components/form/AccountCoding.tsx
@@ -49,7 +49,7 @@ export default function AccountCoding({
     queryFn: () => {
       const code = values.accountCoding;
       if (code.length < 24) return null;
-      return getBilling(code);
+      return getBilling(code, values.provider);
     },
     enabled: !disabled,
   });
diff --git a/app/components/modal/reviewPublicCloudProductModal.tsx b/app/components/modal/reviewPublicCloudProductModal.tsx
@@ -53,7 +53,7 @@ function ReviewPublicCloudProductModal({
     error: billingError,
   } = useQuery({
     queryKey: ['billing', billingId],
-    queryFn: () => getBilling(billingId),
+    queryFn: () => getBilling(billingId, ''),
     enabled: !!billingId,
   });
 
diff --git a/app/emails/_components/Params.ts b/app/emails/_components/Params.ts
@@ -15,6 +15,7 @@ const publicRequestData = {
   billingId: 'billing-id',
   billing: {
     id: 'mou-id',
+    code: '',
     accountCoding: '12345',
     licencePlate: 'XYZ789',
     signed: true,
@@ -186,6 +187,7 @@ export const samplePublicRequest = {
     billingId: 'billing-id',
     billing: {
       id: 'mou-id',
+      code: '',
       accountCoding: '12345',
       licencePlate: 'XYZ789',
       signed: true,
@@ -287,6 +289,7 @@ export const samplePublicProduct: PublicCloudRequestedProjectWithContacts = {
   billingId: 'billing-id',
   billing: {
     id: 'mou-id',
+    code: '',
     accountCoding: '12345',
     licencePlate: 'XYZ789',
     signed: true,
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -61,7 +61,6 @@
     "@types/react-dom": "18.3.0",
     "autoprefixer": "10.4.20",
     "axios": "^1.5.1",
-    "bson-objectid": "^2.0.4",
     "classnames": "^2.5.1",
     "csv-parse": "^5.5.3",
     "csv-stringify": "^6.4.4",
diff --git a/app/prisma/schema.prisma b/app/prisma/schema.prisma
@@ -200,7 +200,8 @@ model PublicCloudRequest {
 
 model Billing {
   id                           String                        @id @default(auto()) @map("_id") @db.ObjectId
-  accountCoding                String                        @unique
+  code                         String                        @unique
+  accountCoding                String
   licencePlate                 String
   signed                       Boolean                       @default(false)
   signedAt                     DateTime?
diff --git a/app/request-actions/public-cloud/create-request.ts b/app/request-actions/public-cloud/create-request.ts
@@ -18,6 +18,8 @@ export default async function createRequest(formData: PublicCloudCreateRequestBo
     formData.expenseAuthority?.email,
   ]);
 
+  const billingCode = `${formData.accountCoding}_${formData.provider}`;
+
   const createRequestedProject = {
     name: formData.name,
     budget: formData.budget,
@@ -30,9 +32,10 @@ export default async function createRequest(formData: PublicCloudCreateRequestBo
     billing: {
       connectOrCreate: {
         where: {
-          accountCoding: formData.accountCoding,
+          code: billingCode,
         },
         create: {
+          code: billingCode,
           accountCoding: formData.accountCoding,
           expenseAuthority: {
             connectOrCreate: {
diff --git a/app/services/backend/billing.ts b/app/services/backend/billing.ts
@@ -8,19 +8,24 @@ export const instance = axios.create({
   baseURL: `${baseInstance.defaults.baseURL}/billing`,
 });
 
-export async function getBilling(accountCoding: string) {
-  const result = await instance.get(`/${accountCoding}`).then((res) => res.data);
+export async function getBilling(accountCoding: string, context: string) {
+  const result = await instance.get(`/${accountCoding}?context=${context}`).then((res) => res.data);
   return result as BillingGetPayload;
 }
 
-export async function existBilling(accountCoding: string) {
-  const result = await instance.get(`/${accountCoding}/exist`).then((res) => res.data);
+export async function existBilling(accountCoding: string, context: string) {
+  const result = await instance.get(`/${accountCoding}/exist?context=${context}`).then((res) => res.data);
   return result as boolean;
 }
 
-export async function downloadBilling(accountCoding: string, licencePlate = '', filename = 'download.pdf') {
-  let url = `/${accountCoding}/download`;
-  if (licencePlate) url += `?licencePlate=${licencePlate}`;
+export async function downloadBilling(
+  accountCoding: string,
+  context: string,
+  licencePlate = '',
+  filename = 'download.pdf',
+) {
+  let url = `/${accountCoding}/download?context=${context}`;
+  if (licencePlate) url += `&licencePlate=${licencePlate}`;
 
   const result = await instance.get(url, { responseType: 'blob' }).then((res) => {
     if (res.status === 200) {
diff --git a/data-migrations/migrations/20240906172566-populate_account_coding_to_billing2.js b/data-migrations/migrations/20240906172566-populate_account_coding_to_billing2.js
@@ -1,10 +1,19 @@
 export const up = async (db, client) => {
+  await db.collection('Billing').deleteMany({});
+
   const products = await db
     .collection('PublicCloudProject')
     .find(
-      { billingId: { $exists: false } },
+      {},
       {
-        projection: { accountCoding: 1, expenseAuthorityId: 1, licencePlate: 1, createdAt: 1, updatedAt: 1 },
+        projection: {
+          provider: 1,
+          accountCoding: 1,
+          expenseAuthorityId: 1,
+          licencePlate: 1,
+          createdAt: 1,
+          updatedAt: 1,
+        },
         sort: { createdAt: 1 },
       },
     )
@@ -14,11 +23,14 @@ export const up = async (db, client) => {
     const product = products[x];
     let billingId = null;
 
-    const billingDoc = await db.collection('Billing').findOne({ accountCoding: { $eq: product.accountCoding } });
+    const code = `${product.accountCoding}_${product.provider}`;
+
+    const billingDoc = await db.collection('Billing').findOne({ code: { $eq: code } });
     if (billingDoc) {
       billingId = billingDoc._id;
     } else {
       const billingData = {
+        code,
         accountCoding: product.accountCoding,
         expenseAuthorityId: product.expenseAuthorityId,
         licencePlate: product.licencePlate,

Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ export default publicCloudProductNew(({ pathParams, queryParams, session }) => {`
`93`	`93`	`)`
`94`	`94`	`.refine(`
`95`	`95`	`async (formData) => {`
`96`		`- const hasBilling = await existBilling(formData.accountCoding);`
	`96`	`+ const hasBilling = await existBilling(formData.accountCoding, formData.provider);`
`97`	`97`	`if (!hasBilling) return true;`
`98`	`98`	`return formData.isEaApproval;`
`99`	`99`	`},`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ export default function BillingDownloadButton({ product }: { product: Product })`
`16`	`16`	`className="mt-2"`
`17`	`17`	`onClick={async () => {`
`18`	`18`	`setLoading(true);`
`19`		`- await downloadBilling(product.billing.accountCoding, product.licencePlate);`
	`19`	`+ await downloadBilling(product.billing.accountCoding, product.provider, product.licencePlate);`
`20`	`20`	`setLoading(false);`
`21`	`21`	`}}`
`22`	`22`	`>`