fix(tests): resolve all pre-existing tests failing

Author: kyle1morel

app/src/controllers/generalProject.ts

@@ -92,7 +92,7 @@ const generateGeneralProjectData = async (
 
   // Create activity and link contact if required
   if (!activityId) {
-    activityId = (await createActivity(tx, Initiative.GENERAL, generateCreateStamps(currentContext)))?.activityId;
+    activityId = (await createActivity(tx, Initiative.GENERAL, generateCreateStamps(currentContext))).activityId;
     const contacts = await searchContacts(tx, { userId: [currentContext.userId!] });
     if (contacts[0]) await createActivityContact(tx, activityId, contacts[0].contactId, ActivityContactRole.PRIMARY);
   }
@@ -108,7 +108,8 @@ const generateGeneralProjectData = async (
       companyNameRegistered: data.basic.registeredName,
       projectName: data.basic.projectName,
       projectNumber: data.basic.projectNumber,
-      projectDescription: data.basic.projectDescription
+      projectDescription: data.basic.projectDescription,
+      isRegisteredInBc: data.basic.registeredId !== null
     };
   }
 
@@ -208,7 +209,11 @@ const generateGeneralProjectData = async (
       astNotes: null,
       atsClientId: null,
       checkProvincialPermits: null,
-      atsEnquiryId: null
+      atsEnquiryId: null,
+      region: null,
+      area: null,
+      activityType: null,
+      businessArea: null
     } as GeneralProject,
     appliedPermits,
     investigatePermits

app/src/services/generalProject.ts

@@ -1,7 +1,5 @@
 import { Prisma } from '@prisma/client';
 
-import { jsonToPrismaInputJson } from '../db/utils/utils.ts';
-
 import type { PrismaTransactionClient } from '../db/dataConnection.ts';
 import type { IStamps } from '../interfaces/IStamps.ts';
 import type {

app/src/types/models.ts

@@ -60,7 +60,7 @@ export type EscalationTypeCode = EscalationTypeCodeBase;
 
 const generalProjectBase = Prisma.validator<Prisma.general_projectDefaultArgs>()({});
 export type GeneralProjectBase = Prisma.general_projectGetPayload<typeof generalProjectBase>;
-export type GeneralProject = GeneralProjectBase & { activity?: Activity; user?: User | null };
+export type GeneralProject = GeneralProjectBase & { activity?: Activity; projectId?: string; user?: User | null };
 
 const housingProjectBase = Prisma.validator<Prisma.housing_projectDefaultArgs>()({});
 export type HousingProjectBase = Prisma.housing_projectGetPayload<typeof housingProjectBase>;

app/src/types/stuff.d.ts

@@ -214,6 +214,7 @@ export interface GeneralProjectIntake {
     geomarkUrl: string | null;
     geoJson: Prisma.JsonValue;
     ltsaPidLookup: string | null;
+    locationPids: string | null;
     latitude: number | null;
     longitude: number | null;
     streetAddress: string;

app/tests/unit/controllers/activityContact.spec.ts

@@ -37,6 +37,11 @@ const FAKE_MEMBER_ACTIVITY_CONTACT = {
 };
 const FAKE_PRIMARY_ACTIVITY_CONTACT = { ...TEST_ACTIVITY_CONTACT_1, contact: TEST_CONTACT_1 };
 
+const PROJECT_WITH_PROJECTID = {
+  ...TEST_HOUSING_PROJECT_1,
+  projectId: TEST_HOUSING_PROJECT_1.housingProjectId
+};
+
 const verifyPrimaryChangeSpy = jest.spyOn(activityContactHelpers, 'verifyPrimaryChange');
 
 let app: express.Express;
@@ -83,9 +88,7 @@ describe('DELETE /activity/:activityId/contact/:contactId', () => {
   const emailSpy = jest.spyOn(emailService, 'email');
 
   beforeEach(() => {
-    getProjectByActivityIdSpy.mockResolvedValue({
-      ...TEST_HOUSING_PROJECT_1
-    });
+    getProjectByActivityIdSpy.mockResolvedValue(PROJECT_WITH_PROJECTID);
   });
 
   it('should call services and respond with 204', async () => {
@@ -149,9 +152,7 @@ describe('POST /activity/:activityId/contact/:contactId', () => {
 
   beforeEach(() => {
     searchContactsSpy.mockResolvedValue([TEST_CONTACT_1]);
-    getProjectByActivityIdSpy.mockResolvedValue({
-      ...TEST_HOUSING_PROJECT_1
-    });
+    getProjectByActivityIdSpy.mockResolvedValue(PROJECT_WITH_PROJECTID);
   });
 
   it('should call services and respond with 201 and result', async () => {
@@ -219,9 +220,7 @@ describe('PUT /activity/:activityId/contact/:contactId', () => {
 
   beforeEach(() => {
     searchContactsSpy.mockResolvedValue([TEST_CONTACT_1]);
-    getProjectByActivityIdSpy.mockResolvedValue({
-      ...TEST_HOUSING_PROJECT_1
-    });
+    getProjectByActivityIdSpy.mockResolvedValue(PROJECT_WITH_PROJECTID);
   });
 
   it('should call services and respond with 200', async () => {

app/tests/unit/controllers/electrificationProject.spec.ts

@@ -1,3 +1,5 @@
+import { Prisma } from '@prisma/client';
+
 import {
   TEST_CURRENT_CONTEXT,
   TEST_ELECTRIFICATION_INTAKE,
@@ -36,7 +38,6 @@ import { uuidv4Pattern } from '../../../src/utils/regexp.ts';
 import type { Request, Response } from 'express';
 import type {
   ActivityContact,
-  Contact,
   Draft,
   ElectrificationProject,
   ElectrificationProjectIntake,
@@ -570,28 +571,46 @@ describe('updateElectrificationProjectDraftController', () => {
 describe('updateElectrificationProjectController', () => {
   const updateSpy = jest.spyOn(electrificationProjectService, 'updateElectrificationProject');
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { electrificationProjectId, ...rest } = TEST_ELECTRIFICATION_PROJECT_1;
+
+  const UPDATED_BODY: Omit<ElectrificationProject, 'electrificationProjectId'> = {
+    ...rest,
+    projectName: 'NEW NAME'
+  };
+  const UPDATED_PROJECT: ElectrificationProject = { ...TEST_ELECTRIFICATION_PROJECT_1, projectName: 'NEW NAME' };
+
   it('should call services and respond with 200 and result', async () => {
     const req = {
-      body: { project: TEST_ELECTRIFICATION_PROJECT_1 },
-      currentContext: TEST_CURRENT_CONTEXT
+      body: UPDATED_BODY,
+      currentContext: TEST_CURRENT_CONTEXT,
+      params: {
+        electrificationProjectId: TEST_ELECTRIFICATION_PROJECT_1.electrificationProjectId
+      }
     };
 
-    const updated: ElectrificationProject = { ...TEST_ELECTRIFICATION_PROJECT_1, projectName: 'NEW NAME' };
-
-    updateSpy.mockResolvedValue(updated);
+    updateSpy.mockResolvedValue(UPDATED_PROJECT);
 
     await updateElectrificationProjectController(
-      req as unknown as Request<never, never, { project: ElectrificationProject; contacts: Contact[] }>,
+      req as unknown as Request<
+        { electrificationProjectId: string },
+        never,
+        Omit<Prisma.electrification_projectUpdateInput, 'electrificationProjectId'>
+      >,
       res as unknown as Response
     );
 
     expect(updateSpy).toHaveBeenCalledTimes(1);
-    expect(updateSpy).toHaveBeenCalledWith(prismaTxMock, {
-      ...req.body.project,
-      updatedAt: expect.any(Date) as Date,
-      updatedBy: TEST_CURRENT_CONTEXT.userId
-    });
+    expect(updateSpy).toHaveBeenCalledWith(
+      prismaTxMock,
+      {
+        ...UPDATED_BODY,
+        updatedAt: expect.any(Date) as Date,
+        updatedBy: TEST_CURRENT_CONTEXT.userId
+      },
+      UPDATED_PROJECT.electrificationProjectId
+    );
     expect(res.status).toHaveBeenCalledWith(200);
-    expect(res.json).toHaveBeenCalledWith(updated);
+    expect(res.json).toHaveBeenCalledWith(UPDATED_PROJECT);
   });
 });

app/tests/unit/controllers/enquiry.spec.ts

@@ -65,6 +65,11 @@ describe('createEnquiryController', () => {
       currentContext: TEST_CURRENT_CONTEXT
     };
 
+    const PROJECT_WITH_PROJECTID = {
+      ...TEST_HOUSING_PROJECT_1,
+      projectId: TEST_HOUSING_PROJECT_1.housingProjectId
+    };
+
     createActivitySpy.mockResolvedValue(TEST_ACTIVITY_ELECTRIFICATION);
     searchContactsSpy.mockResolvedValue([TEST_CONTACT_1]);
     createActivityContactSpy.mockResolvedValue({
@@ -79,7 +84,7 @@ describe('createEnquiryController', () => {
     ]);
     upsertContactsSpy.mockResolvedValue([TEST_CONTACT_1]);
     createEnquirySpy.mockResolvedValue(TEST_ENQUIRY_1);
-    getProjectByActivityIdSpy.mockResolvedValue(TEST_HOUSING_PROJECT_1);
+    getProjectByActivityIdSpy.mockResolvedValue(PROJECT_WITH_PROJECTID);
 
     await createEnquiryController(req as unknown as Request<never, never, EnquiryIntake>, res as unknown as Response);
 

app/tests/unit/controllers/generalProject.spec.ts

@@ -1,3 +1,5 @@
+import { Prisma } from '@prisma/client';
+
 import {
   createGeneralProjectController,
   deleteGeneralProjectController,
@@ -754,27 +756,45 @@ describe('updateGeneralProjectDraftController', () => {
 describe('updateGeneralProjectController', () => {
   const updateSpy = jest.spyOn(generalProjectService, 'updateGeneralProject');
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { generalProjectId, ...rest } = TEST_GENERAL_PROJECT_1;
+
+  const UPDATED_BODY: Omit<GeneralProject, 'generalProjectId'> = {
+    ...rest,
+    projectName: 'NEW NAME'
+  };
   const UPDATED_PROJECT: GeneralProject = { ...TEST_GENERAL_PROJECT_1, projectName: 'NEW NAME' };
 
   it('should call services and respond with 200 and result', async () => {
     const req = {
-      body: UPDATED_PROJECT,
-      currentContext: TEST_CURRENT_CONTEXT
+      body: UPDATED_BODY,
+      currentContext: TEST_CURRENT_CONTEXT,
+      params: {
+        generalProjectId: UPDATED_PROJECT.generalProjectId
+      }
     };
 
     updateSpy.mockResolvedValue(UPDATED_PROJECT);
 
     await updateGeneralProjectController(
-      req as unknown as Request<never, never, GeneralProject>,
+      req as unknown as Request<
+        { generalProjectId: string },
+        never,
+        Omit<Prisma.general_projectUpdateInput, 'generalProjectId'>
+      >,
       res as unknown as Response
     );
 
     expect(updateSpy).toHaveBeenCalledTimes(1);
-    expect(updateSpy).toHaveBeenCalledWith(prismaTxMock, {
-      ...UPDATED_PROJECT,
-      updatedAt: expect.any(Date) as Date,
-      updatedBy: TEST_CURRENT_CONTEXT.userId
-    });
+    expect(updateSpy).toHaveBeenCalledWith(
+      prismaTxMock,
+      {
+        ...UPDATED_BODY,
+        updatedAt: expect.any(Date) as Date,
+        updatedBy: TEST_CURRENT_CONTEXT.userId
+      },
+      UPDATED_PROJECT.generalProjectId
+    );
     expect(res.status).toHaveBeenCalledWith(200);
     expect(res.json).toHaveBeenCalledWith(UPDATED_PROJECT);
   });