feat: Explicitly handle redaction (#2313)

* chore: Handle redactions more explicitly * test: Update tests * chore: Bump planx-core
theopensystemslab · Oct 17, 2023 · bf52435 · bf52435
1 parent 102393e
commit bf52435
Show file tree

Hide file tree

Showing 20 changed files with 370 additions and 320 deletions.
diff --git a/api.planx.uk/admin/session/bops.test.ts b/api.planx.uk/admin/session/bops.test.ts
@@ -6,9 +6,7 @@ import { expectedPayload } from "../../tests/mocks/bopsMocks";
 const endpoint = (strings: TemplateStringsArray) =>
   `/admin/session/${strings[0]}/bops`;
 
-const mockGenerateBOPSPayload = jest.fn().mockResolvedValue({
-  exportData: expectedPayload,
-});
+const mockGenerateBOPSPayload = jest.fn().mockResolvedValue(expectedPayload);
 
 jest.mock("@opensystemslab/planx-core", () => {
   return {

diff --git a/api.planx.uk/admin/session/bops.ts b/api.planx.uk/admin/session/bops.ts
@@ -20,7 +20,7 @@ export const getBOPSPayload = async (
   next: NextFunction,
 ) => {
   try {
-    const { exportData } = await $api.export.bopsPayload(req.params.sessionId);
+    const exportData = await $api.export.bopsPayload(req.params.sessionId);
     res.set("content-type", "application/json");
     return res.send(exportData);
   } catch (error) {

diff --git a/api.planx.uk/admin/session/csv.test.ts b/api.planx.uk/admin/session/csv.test.ts
@@ -5,16 +5,13 @@ import { authHeader } from "../../tests/mockJWT";
 const endpoint = (strings: TemplateStringsArray) =>
   `/admin/session/${strings[0]}/csv`;
 
-const mockGenerateCSVData = jest.fn().mockResolvedValue({
-  responses: [
-    {
-      question: "Is this a test?",
-      responses: [{ value: "Yes" }],
-      metadata: {},
-    },
-  ],
-  redactedResponses: [],
-});
+const mockGenerateCSVData = jest.fn().mockResolvedValue([
+  {
+    question: "Is this a test?",
+    responses: [{ value: "Yes" }],
+    metadata: {},
+  },
+]);
 jest.mock("@opensystemslab/planx-core", () => {
   return {
     CoreDomainClient: jest.fn().mockImplementation(() => ({

diff --git a/api.planx.uk/admin/session/csv.ts b/api.planx.uk/admin/session/csv.ts
@@ -27,7 +27,7 @@ export async function getCSVData(
 ) {
   try {
     const $client = getClient();
-    const { responses } = await $client.export.csvData(req.params.sessionId);
+    const responses = await $client.export.csvData(req.params.sessionId);
 
     if (req.query?.download) {
       stringify(responses, {
@@ -71,7 +71,7 @@ export async function getRedactedCSVData(
 ) {
   try {
     const $client = getClient();
-    const { redactedResponses } = await $client.export.csvData(
+    const redactedResponses = await $client.export.csvDataRedacted(
       req.params.sessionId,
     );
 

diff --git a/api.planx.uk/admin/session/html.ts b/api.planx.uk/admin/session/html.ts
@@ -24,7 +24,7 @@ export const getHTMLExport: HTMLExportHandler = async (req, res, next) => {
     const session = await $client.session.find(req.params.sessionId);
     if (!session) throw Error(`Unable to find session ${req.params.sessionId}`);
 
-    const { responses } = await $client.export.csvData(req.params.sessionId);
+    const responses = await $client.export.csvData(req.params.sessionId);
     const boundingBox =
       session.data.passport.data["property.boundary.site.buffered"];
 
@@ -65,7 +65,7 @@ export const getRedactedHTMLExport: HTMLExportHandler = async (
     const session = await $client.session.find(req.params.sessionId);
     if (!session) throw Error(`Unable to find session ${req.params.sessionId}`);
 
-    const { redactedResponses } = await $client.export.csvData(
+    const redactedResponses = await $client.export.csvDataRedacted(
       req.params.sessionId,
     );
     const boundingBox =

diff --git a/api.planx.uk/admin/session/oneAppXML.test.ts b/api.planx.uk/admin/session/oneAppXML.test.ts
@@ -12,7 +12,9 @@ const mockGenerateOneAppXML = jest
 jest.mock("../../client", () => {
   return {
     $api: {
-      generateOneAppXML: () => mockGenerateOneAppXML(),
+      export: {
+        oneAppPayload: () => mockGenerateOneAppXML(),
+      },
     },
   };
 });

diff --git a/api.planx.uk/admin/session/oneAppXML.ts b/api.planx.uk/admin/session/oneAppXML.ts
@@ -20,7 +20,7 @@ export const getOneAppXML = async (
   next: NextFunction,
 ) => {
   try {
-    const xml = await $api.generateOneAppXML(req.params.sessionId);
+    const xml = await $api.export.oneAppPayload(req.params.sessionId);
     res.set("content-type", "text/xml");
     return res.send(xml);
   } catch (error) {

diff --git a/api.planx.uk/package.json b/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#d92224b",
+    "@opensystemslab/planx-core": "git+https://github.com/theopensystemslab/planx-core#3a85966",
     "@types/isomorphic-fetch": "^0.0.36",
     "adm-zip": "^0.5.10",
     "aws-sdk": "^2.1467.0",