chore: Tidy up - linting and dropping custom DeepPartial type

api.planx.uk/inviteToPay/createPaymentSendEvents.ts

@@ -124,8 +124,8 @@ interface GetTeamSlugByFlowId {
   flows: {
     team: {
       slug: string;
-    }
-  }
+    };
+  };
 }
 
 const getTeamSlugByFlowId = async (id: Flow["id"]): Promise<Team["slug"]> => {

api.planx.uk/notify/routeSendEmailRequest.test.ts

@@ -217,9 +217,7 @@ describe("Send Email endpoint", () => {
       const softDeleteSessionMock = queryMock
         .getCalls()
         .find((mock) => mock.id === "SoftDeleteLowcalSession");
-      expect(
-        softDeleteSessionMock?.response.data.session.id,
-      ).toEqual("123");
+      expect(softDeleteSessionMock?.response.data.session.id).toEqual("123");
     });
   });
 });

api.planx.uk/saveAndReturn/resumeApplication.test.ts

@@ -4,36 +4,33 @@ import app from "../server";
 import { queryMock } from "../tests/graphqlQueryMock";
 import { mockLowcalSession, mockTeam } from "../tests/mocks/saveAndReturnMocks";
 import { buildContentFromSessions } from "./resumeApplication";
+import { PartialDeep } from "type-fest";
 
 const ENDPOINT = "/resume-application";
 const TEST_EMAIL = "[email protected]";
 
-type DeepPartial<T> = T extends object
-  ? {
-      [P in keyof T]?: DeepPartial<T[P]>;
-    }
-  : T;
-
 const mockFormatRawProjectTypes = jest
   .fn()
   .mockResolvedValue(["New office premises"]);
 
 jest.mock("@opensystemslab/planx-core", () => {
-  const actualCoreDomainClient = jest.requireActual("@opensystemslab/planx-core").CoreDomainClient;
+  const actualCoreDomainClient = jest.requireActual(
+    "@opensystemslab/planx-core",
+  ).CoreDomainClient;
 
   return {
     CoreDomainClient: class extends actualCoreDomainClient {
       constructor() {
         super();
         this.formatRawProjectTypes = () => mockFormatRawProjectTypes();
       }
-    }
+    },
   };
 });
 
 describe("buildContentFromSessions function", () => {
   it("should return correctly formatted content for a single session", async () => {
-    const sessions: DeepPartial<LowCalSession>[] = [
+    const sessions: PartialDeep<LowCalSession>[] = [
       {
         data: {
           passport: {
@@ -67,7 +64,7 @@ describe("buildContentFromSessions function", () => {
   });
 
   it("should return correctly formatted content for multiple session", async () => {
-    const sessions: DeepPartial<LowCalSession>[] = [
+    const sessions: PartialDeep<LowCalSession>[] = [
       {
         data: {
           passport: {
@@ -142,7 +139,7 @@ describe("buildContentFromSessions function", () => {
   });
 
   it("should handle an empty address field", async () => {
-    const sessions: DeepPartial<LowCalSession>[] = [
+    const sessions: PartialDeep<LowCalSession>[] = [
       {
         data: {
           passport: {
@@ -175,7 +172,7 @@ describe("buildContentFromSessions function", () => {
 
   it("should handle an empty project type field", async () => {
     mockFormatRawProjectTypes.mockResolvedValueOnce("");
-    const sessions: DeepPartial<LowCalSession>[] = [
+    const sessions: PartialDeep<LowCalSession>[] = [
       {
         data: {
           passport: {

api.planx.uk/saveAndReturn/resumeApplication.ts

@@ -85,10 +85,13 @@ const validateRequest = async (
         }
       }
     `;
-    const { sessions, teams } = await $api.client.request<ValidateRequest>(query, {
-      teamSlug,
-      email: email.toLowerCase(),
-    });
+    const { sessions, teams } = await $api.client.request<ValidateRequest>(
+      query,
+      {
+        teamSlug,
+        email: email.toLowerCase(),
+      },
+    );
 
     if (!teams?.length) throw Error;
 

api.planx.uk/saveAndReturn/utils.ts

@@ -237,8 +237,8 @@ const getSaveAndReturnPublicHeaders = (sessionId: string, email: string) => ({
   "x-hasura-lowcal-email": email.toLowerCase(),
 });
 
-interface SetupEmailNotifications { 
-  session: { hasUserSaved: boolean } 
+interface SetupEmailNotifications {
+  session: { hasUserSaved: boolean };
 }
 
 // Update lowcal_sessions.has_user_saved column to kick-off the setup_lowcal_expiry_events &
@@ -259,7 +259,9 @@ const setupEmailEventTriggers = async (sessionId: string) => {
     `;
     const {
       session: { hasUserSaved },
-    } = await $api.client.request<SetupEmailNotifications>(mutation, { sessionId });
+    } = await $api.client.request<SetupEmailNotifications>(mutation, {
+      sessionId,
+    });
     return hasUserSaved;
   } catch (error) {
     throw new Error(

api.planx.uk/send/bops.test.ts

@@ -9,7 +9,9 @@ jest.mock("../saveAndReturn/utils", () => ({
 }));
 
 jest.mock("@opensystemslab/planx-core", () => {
-  const actualCoreDomainClient = jest.requireActual("@opensystemslab/planx-core").CoreDomainClient;
+  const actualCoreDomainClient = jest.requireActual(
+    "@opensystemslab/planx-core",
+  ).CoreDomainClient;
 
   return {
     CoreDomainClient: class extends actualCoreDomainClient {
@@ -21,7 +23,7 @@ jest.mock("@opensystemslab/planx-core", () => {
             redactedExportData: expectedPayload,
           });
       }
-    }
+    },
   };
 });
 

api.planx.uk/send/bops.ts

@@ -15,7 +15,7 @@ interface CreateBopsApplication {
   insertBopsApplication: {
     id: string;
     bopsId: string;
-  }
+  };
 }
 
 /**
@@ -167,8 +167,8 @@ const sendToBOPS = async (req: Request, res: Response, next: NextFunction) => {
 
 interface FindApplication {
   bopsApplications: {
-    response: Record<string, string>
-  }[]
+    response: Record<string, string>;
+  }[];
 }
 
 /**

api.planx.uk/send/email.test.ts

@@ -11,7 +11,9 @@ const mockGenerateCSVData = jest.fn().mockResolvedValue([
 ]);
 
 jest.mock("@opensystemslab/planx-core", () => {
-  const actualCoreDomainClient = jest.requireActual("@opensystemslab/planx-core").CoreDomainClient;
+  const actualCoreDomainClient = jest.requireActual(
+    "@opensystemslab/planx-core",
+  ).CoreDomainClient;
 
   return {
     Passport: jest.fn().mockImplementation(() => ({