Production deploy

api.planx.uk/modules/gis/service/digitalLand.ts

@@ -17,7 +17,9 @@
   };
 }
 
+/** When a team publishes their granular Article 4 data, add them to this list */
 const localAuthorityMetadata: Record<string, LocalAuthorityMetadata> = {
+  barkingAndDagenham: require("./local_authorities/metadata/barkingAndDagenham"),
   barnet: require("./local_authorities/metadata/barnet"),
   birmingham: require("./local_authorities/metadata/birmingham"),
   buckinghamshire: require("./local_authorities/metadata/buckinghamshire"),
@@ -70,8 +72,8 @@
     options,
   )}${datasets}`;
   const res = await fetch(url)
     .then((response: { json: () => any }) => response.json())
     .catch((error: any) => console.log(error));
 
   // if analytics are "on", store an audit record of the raw response
   if (extras?.analytics !== "false") {
@@ -105,11 +107,10 @@
   // check for & add any 'positive' constraints to the formattedResult
   let formattedResult: Record<string, Constraint> = {};
   if (res && res.count > 0 && res.entities) {
     res.entities.forEach((entity: { dataset: any }) => {
       // get the planx variable that corresponds to this entity's 'dataset', should never be null because our initial request is filtered on 'dataset'
-      const key = Object.keys(baseSchema).find(
-        (key) =>
-          baseSchema[key]["digital-land-datasets"]?.includes(entity.dataset),
+      const key = Object.keys(baseSchema).find((key) =>
+        baseSchema[key]["digital-land-datasets"]?.includes(entity.dataset),
       );
       // because there can be many digital land datasets per planx variable, check if this key is already in our result
       if (key && Object.keys(formattedResult).includes(key)) {
@@ -154,7 +155,7 @@
     formattedResult["designated.nationalPark"] &&
     formattedResult["designated.nationalPark"].value
   ) {
     formattedResult["designated.nationalPark"]?.data?.forEach((entity: any) => {
       if (
         baseSchema[broads]["digital-land-entities"]?.includes(entity.entity)
       ) {
@@ -255,11 +256,8 @@
     .then((responses) => {
       responses.forEach((response: any) => {
         // get the planx variable that corresponds to this 'dataset', should never be null because we only requested known datasets
-        const key = Object.keys(baseSchema).find(
-          (key) =>
-            baseSchema[key]["digital-land-datasets"]?.includes(
-              response.dataset,
-            ),
+        const key = Object.keys(baseSchema).find((key) =>
+          baseSchema[key]["digital-land-datasets"]?.includes(response.dataset),
         );
         if (key) metadata[key] = response;
       });

api.planx.uk/modules/gis/service/local_authorities/metadata/barkingAndDagenham.ts

@@ -0,0 +1,27 @@
+/*
+LAD20CD: E09000002
+LAD20NM: Barking and Dagenham
+LAD20NMW:
+FID:
+
+https://www.planning.data.gov.uk/entity/?dataset=article-4-direction-area&geometry_curie=statistical-geography%3AE09000002&entry_date_day=&entry_date_month=&entry_date_year=
+https://docs.google.com/spreadsheets/d/1UmxQ95SjU72j0KaVIIkrIfhdE_k_lcFNhUWBc53GEIA/edit#gid=0
+*/
+
+import { LocalAuthorityMetadata } from "../../digitalLand";
+
+const planningConstraints: LocalAuthorityMetadata["planningConstraints"] = {
+  article4: {
+    // Planx granular values link to entity.reference on Planning Data
+    records: {
+      "article4.barkingAndDagenham.additionalStoreys.dagenhamVillage": "A4D01",
+      "article4.barkingAndDagenham.additionalStoreys.lymington": "A4D02",
+      "article4.barkingAndDagenham.becontree":
+        "Proposed Becontree Design Guide Article 4",
+      // "article4.barkingAndDagenham.becontree.corners": "TBD",
+      "article4.barkingAndDagenham.hmo": "A4D03",
+    },
+  },
+};
+
+export { planningConstraints };

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

@@ -46,7 +46,7 @@ describe("buildContentFromSessions function", () => {
           },
         },
         id: "123",
-        created_at: "2022-05-01T01:02:03.865452+00:00",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
         flow: {
           slug: "apply-for-a-lawful-development-certificate",
         },
@@ -56,7 +56,7 @@ describe("buildContentFromSessions function", () => {
     const result = `Service: Apply for a lawful development certificate
       Address: 1 High Street
       Project type: New office premises
-      Expiry Date: 29 May 2022
+      Expiry Date: 29 May 2026
       Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=123`;
     expect(
       await buildContentFromSessions(
@@ -80,7 +80,7 @@ describe("buildContentFromSessions function", () => {
           },
         },
         id: "123",
-        created_at: "2022-05-01T01:02:03.865452+00:00",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
         flow: {
           slug: "apply-for-a-lawful-development-certificate",
         },
@@ -97,7 +97,7 @@ describe("buildContentFromSessions function", () => {
           },
         },
         id: "456",
-        created_at: "2022-05-01T01:02:03.865452+00:00",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
         flow: {
           slug: "apply-for-a-lawful-development-certificate",
         },
@@ -114,7 +114,7 @@ describe("buildContentFromSessions function", () => {
           },
         },
         id: "789",
-        created_at: "2022-05-01T01:02:03.865452+00:00",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
         flow: {
           slug: "apply-for-a-lawful-development-certificate",
         },
@@ -123,15 +123,15 @@ describe("buildContentFromSessions function", () => {
     const result = `Service: Apply for a lawful development certificate
       Address: 1 High Street
       Project type: New office premises
-      Expiry Date: 29 May 2022
+      Expiry Date: 29 May 2026
       Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=123\n\nService: Apply for a lawful development certificate
       Address: 2 High Street
       Project type: New office premises
-      Expiry Date: 29 May 2022
+      Expiry Date: 29 May 2026
       Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=456\n\nService: Apply for a lawful development certificate
       Address: 3 High Street
       Project type: New office premises
-      Expiry Date: 29 May 2022
+      Expiry Date: 29 May 2026
       Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=789`;
     expect(
       await buildContentFromSessions(
@@ -141,6 +141,56 @@ describe("buildContentFromSessions function", () => {
     ).toEqual(result);
   });
 
+  it("should filter out expired sessions", async () => {
+    const sessions: PartialDeep<LowCalSession>[] = [
+      {
+        data: {
+          passport: {
+            data: {
+              _address: {
+                single_line_address: "1 High Street",
+              },
+              "proposal.projectType": ["new.office"],
+            },
+          },
+        },
+        id: "123",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
+        flow: {
+          slug: "apply-for-a-lawful-development-certificate",
+        },
+      },
+      {
+        data: {
+          passport: {
+            data: {
+              _address: {
+                single_line_address: "2 High Street",
+              },
+              "proposal.projectType": ["new.office"],
+            },
+          },
+        },
+        id: "456",
+        created_at: "2022-05-01T01:02:03.865452+00:00",
+        flow: {
+          slug: "apply-for-a-lawful-development-certificate",
+        },
+      },
+    ];
+    const result = `Service: Apply for a lawful development certificate
+      Address: 1 High Street
+      Project type: New office premises
+      Expiry Date: 29 May 2026
+      Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=123`;
+    expect(
+      await buildContentFromSessions(
+        sessions as LowCalSession[],
+        { slug: "team" } as Team,
+      ),
+    ).toEqual(result);
+  });
+
   it("should handle an empty address field", async () => {
     const sessions: PartialDeep<LowCalSession>[] = [
       {
@@ -153,7 +203,7 @@ describe("buildContentFromSessions function", () => {
           },
         },
         id: "123",
-        created_at: "2022-05-01T01:02:03.865452+00:00",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
         flow: {
           slug: "apply-for-a-lawful-development-certificate",
         },
@@ -163,7 +213,7 @@ describe("buildContentFromSessions function", () => {
     const result = `Service: Apply for a lawful development certificate
       Address: Address not submitted
       Project type: New office premises
-      Expiry Date: 29 May 2022
+      Expiry Date: 29 May 2026
       Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=123`;
     expect(
       await buildContentFromSessions(
@@ -187,7 +237,7 @@ describe("buildContentFromSessions function", () => {
           },
         },
         id: "123",
-        created_at: "2022-05-01T01:02:03.865452+00:00",
+        created_at: "2026-05-01T01:02:03.865452+00:00",
         flow: {
           slug: "apply-for-a-lawful-development-certificate",
         },
@@ -197,7 +247,7 @@ describe("buildContentFromSessions function", () => {
     const result = `Service: Apply for a lawful development certificate
       Address: 1 High Street
       Project type: Project type not submitted
-      Expiry Date: 29 May 2022
+      Expiry Date: 29 May 2026
       Link: example.com/team/apply-for-a-lawful-development-certificate/preview?sessionId=123`;
     expect(
       await buildContentFromSessions(

api.planx.uk/modules/saveAndReturn/service/resumeApplication.ts

@@ -1,9 +1,15 @@
-import { gql } from "graphql-request";
-import { LowCalSession, Team } from "../../../types";
-import { convertSlugToName, getResumeLink, calculateExpiryDate } from "./utils";
-import { sendEmail } from "../../../lib/notify";
 import type { SiteAddress } from "@opensystemslab/planx-core/types";
+import { differenceInDays } from "date-fns";
+import { gql } from "graphql-request";
 import { $api, $public } from "../../../client";
+import { sendEmail } from "../../../lib/notify";
+import { LowCalSession, Team } from "../../../types";
+import {
+  DAYS_UNTIL_EXPIRY,
+  calculateExpiryDate,
+  convertSlugToName,
+  getResumeLink,
+} from "./utils";
 
 /**
  * Send a "Resume" email to an applicant which list all open applications for a given council (team)
@@ -46,7 +52,9 @@ const validateRequest = async (
           where: {
             email: { _eq: $email }
             deleted_at: { _is_null: true }
+            locked_at: { _is_null: true }
             submitted_at: { _is_null: true }
+            sanitised_at: { _is_null: true }
             flow: { team: { slug: { _eq: $teamSlug } } }
           }
           order_by: { flow: { slug: asc }, created_at: asc }
@@ -113,15 +121,20 @@ const buildContentFromSessions = async (
     const resumeLink = getResumeLink(session, team, session.flow.slug);
     const expiryDate = calculateExpiryDate(session.created_at);
 
-    return `Service: ${service}
+    // Filter out any sessions that are expired (safety net for failed sanitation)
+    const today = new Date();
+    const sessionAge = differenceInDays(today, new Date(session.created_at));
+
+    if (sessionAge < DAYS_UNTIL_EXPIRY)
+      return `Service: ${service}
       Address: ${addressLine || "Address not submitted"}
       Project type: ${projectType || "Project type not submitted"}
       Expiry Date: ${expiryDate}
       Link: ${resumeLink}`;
   };
 
   const content = await Promise.all(sessions.map(contentBuilder));
-  return content.join("\n\n");
+  return content.filter(Boolean).join("\n\n");
 };
 
-export { resumeApplication, buildContentFromSessions };
+export { buildContentFromSessions, resumeApplication };

api.planx.uk/modules/saveAndReturn/service/validateSession.ts

@@ -104,8 +104,8 @@ async function reconcileSessionData({
 
   const findParentNode = (nodeId: string): string | undefined => {
     const [parentId, _] =
-      Object.entries(currentFlow).find(
-        ([_, node]) => node.edges?.includes(nodeId),
+      Object.entries(currentFlow).find(([_, node]) =>
+        node.edges?.includes(nodeId),
       ) || [];
     return parentId;
   };

api.planx.uk/modules/webhooks/service/sanitiseApplicationData/operations.ts

@@ -68,8 +68,12 @@ export const getExpiredSessionIds = async (): Promise<string[]> => {
     query GetExpiredSessionIds($retentionPeriod: timestamptz) {
       lowcal_sessions(
         where: {
-          submitted_at: { _lt: $retentionPeriod }
           sanitised_at: { _is_null: true }
+          _or: [
+            { deleted_at: { _lt: $retentionPeriod } }
+            { submitted_at: { _lt: $retentionPeriod } }
+            { locked_at: { _lt: $retentionPeriod } }
+          ]
         }
       ) {
         id
@@ -123,6 +127,7 @@ export const sanitiseLowcalSessions: Operation = async () => {
           _or: [
             { deleted_at: { _lt: $retentionPeriod } }
             { submitted_at: { _lt: $retentionPeriod } }
+            { locked_at: { _lt: $retentionPeriod } }
           ]
         }
       ) {

api.planx.uk/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "dependencies": {
     "@airbrake/node": "^2.1.8",
-    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#aa93cbf",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#d74afe2",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",
@@ -15,7 +15,7 @@
     "copyfiles": "^2.4.1",
     "cors": "^2.8.5",
     "csv-stringify": "^6.4.5",
-    "date-fns": "^2.29.3",
+    "date-fns": "^3.3.1",
     "dompurify": "^3.0.6",
     "express": "^4.18.2",
     "express-async-errors": "^3.1.1",
@@ -85,7 +85,7 @@
     "@types/lodash": "^4.14.202",
     "@types/mime": "^3.0.4",
     "@types/multer": "^1.4.11",
-    "@types/node": "^18.18.1",
+    "@types/node": "^18.19.13",
     "@types/passport": "^1.0.16",
     "@types/passport-google-oauth20": "^2.0.14",
     "@types/supertest": "^2.0.16",
@@ -95,7 +95,7 @@
     "@typescript-eslint/eslint-plugin": "^5.62.0",
     "@typescript-eslint/parser": "^5.62.0",
     "dotenv": "^16.3.1",
-    "esbuild": "^0.19.2",
+    "esbuild": "^0.20.0",
     "esbuild-jest": "^0.5.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
@@ -106,7 +106,7 @@
     "lint-staged": "^15.0.2",
     "nock": "^13.4.0",
     "node-dev": "^8.0.0",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.4",
     "rimraf": "^5.0.5",
     "supertest": "^6.3.3",
     "ts-jest": "^29.1.1",