chore: Modularise feedback endpoint

api.planx.uk/modules/admin/controller.ts

@@ -0,0 +1,20 @@
+import { generateFeedbackCSV } from "./service/feedback/downloadFeedbackCSV";
+import { DownloadFeedbackCSVController } from "./service/feedback/types";
+
+export const downloadFeedbackCSV: DownloadFeedbackCSVController = async (
+  req,
+  res,
+  next,
+) => {
+  try {
+    const feedbackFishCookie = res.locals.parsedReq.query.cookie;
+    const csvStream = await generateFeedbackCSV(feedbackFishCookie);
+    res.header("Content-type", "text/csv");
+    return csvStream.pipe(res);
+  } catch (error) {
+    return next({
+      message:
+        "Failed to generate FeedbackFish CSV: " + (error as Error).message,
+    });
+  }
+};

api.planx.uk/modules/admin/docs.yaml

@@ -0,0 +1,28 @@
+openapi: 3.1.0
+info:
+  title: Plan✕ API
+  version: 0.1.0
+tags:
+  - name: admin
+    description: Admin only utility endpoints
+paths:
+  /admin/feedback:
+    get:
+      tags: ["admin"]
+      security:
+        - bearerAuth: []
+      summary: Download FeedbackFish CSV
+      parameters:
+        - in: query
+          name: cookie
+          type: string
+          description: Cookie from FeedbackFish to authenticate request
+          required: true
+      responses:
+        "200":
+          content:
+            text/csv:
+              schema:
+                type: string
+        "500":
+          $ref: "#/components/responses/ErrorMessage"

api.planx.uk/modules/admin/routes.ts

@@ -1,28 +1,36 @@
 import { Router } from "express";
 import { usePlatformAdminAuth } from "../auth/middleware";
-import { downloadFeedbackCSV } from "./feedback/downloadFeedbackCSV";
 import { getOneAppXML } from "./session/oneAppXML";
 import { getBOPSPayload } from "./session/bops";
 import { getCSVData, getRedactedCSVData } from "./session/csv";
 import { getHTMLExport, getRedactedHTMLExport } from "./session/html";
 import { generateZip } from "./session/zip";
 import { getSessionSummary } from "./session/summary";
 import { getDigitalPlanningApplicationPayload } from "./session/digitalPlanningData";
+import { validate } from "../../shared/middleware/validate";
+import { downloadFeedbackCSVSchema } from "./service/feedback/types";
+import { downloadFeedbackCSV } from "./controller";
 
 const router = Router();
 
-router.use("/admin", usePlatformAdminAuth);
-router.get("/admin/feedback", downloadFeedbackCSV);
-router.get("/admin/session/:sessionId/xml", getOneAppXML);
-router.get("/admin/session/:sessionId/bops", getBOPSPayload);
-router.get("/admin/session/:sessionId/csv", getCSVData);
-router.get("/admin/session/:sessionId/csv-redacted", getRedactedCSVData);
-router.get("/admin/session/:sessionId/html", getHTMLExport);
-router.get("/admin/session/:sessionId/html-redacted", getRedactedHTMLExport);
-router.get("/admin/session/:sessionId/zip", generateZip);
-router.get("/admin/session/:sessionId/summary", getSessionSummary);
+router.use(usePlatformAdminAuth);
 router.get(
-  "/admin/session/:sessionId/digital-planning-application",
+  "/feedback",
+  validate(downloadFeedbackCSVSchema),
+  downloadFeedbackCSV,
+);
+
+// TODO: Split the routes below into controller and service components
+router.get("/session/:sessionId/xml", getOneAppXML);
+router.get("/session/:sessionId/bops", getBOPSPayload);
+router.get("/session/:sessionId/csv", getCSVData);
+router.get("/session/:sessionId/csv-redacted", getRedactedCSVData);
+router.get("/session/:sessionId/html", getHTMLExport);
+router.get("/session/:sessionId/html-redacted", getRedactedHTMLExport);
+router.get("/session/:sessionId/zip", generateZip);
+router.get("/session/:sessionId/summary", getSessionSummary);
+router.get(
+  "/session/:sessionId/digital-planning-application",
   getDigitalPlanningApplicationPayload,
 );
 

api.planx.uk/modules/admin/feedback/downloadFeedbackCSV.test.ts → api.planx.uk/modules/admin/service/feedback/downloadFeedbackCSV.test.ts

@@ -1,8 +1,9 @@
-import { Feedback, parseFeedback } from "./downloadFeedbackCSV";
+import { parseFeedback } from "./downloadFeedbackCSV";
 import supertest from "supertest";
-import app from "../../../server";
-import { authHeader } from "../../../tests/mockJWT";
+import app from "../../../../server";
+import { authHeader } from "../../../../tests/mockJWT";
 import Axios from "axios";
+import { Feedback } from "./types";
 
 jest.mock("axios");
 const mockAxios = Axios as jest.Mocked<typeof Axios>;
@@ -72,8 +73,11 @@ describe("Download feedback CSV endpoint", () => {
     await supertest(app)
       .get(ENDPOINT)
       .set(auth)
-      .expect(401)
-      .then((res) => expect(res.body).toEqual({ error: "Missing cookie" }));
+      .expect(400)
+      .then((res) => {
+        expect(res.body).toHaveProperty("issues");
+        expect(res.body).toHaveProperty("name", "ZodError");
+      });
   });
 
   it("returns an error if request to FeedbackFish fails", async () => {

api.planx.uk/modules/admin/service/feedback/downloadFeedbackCSV.ts

@@ -0,0 +1,85 @@
+import { gql } from "graphql-request";
+import Axios from "axios";
+import { stringify } from "csv-stringify";
+import { Feedback, METADATA_KEYS, ParsedFeedback } from "./types";
+
+export const generateFeedbackCSV = async (feedbackFishCookie: string) => {
+  const feedback = await fetchFeedback(feedbackFishCookie);
+  const parsedFeedback = parseFeedback(feedback);
+  const csvStream = stringify(parsedFeedback, {
+    header: true,
+    columns: [
+      "id",
+      "text",
+      "category",
+      "createdAt",
+      "location",
+      "screenshotUrl",
+      "device",
+      ...METADATA_KEYS,
+    ],
+  });
+  return csvStream;
+};
+
+const fetchFeedback = async (cookie: string): Promise<Feedback[]> => {
+  const feedbackFishGraphQLEndpoint = "https://graphcdn.api.feedback.fish/";
+  const body = {
+    query: gql`
+      query getFeedback($projectId: String!) {
+        feedback(projectId: $projectId) {
+          id
+          text
+          category
+          createdAt
+          location
+          screenshotUrl
+          metadata {
+            key
+            value
+          }
+          device {
+            client {
+              name
+              version
+            }
+            os {
+              name
+              version
+            }
+          }
+        }
+      }
+    `,
+    operationName: "getFeedback",
+    variables: {
+      projectId: "65f02de00b90d1",
+    },
+  };
+
+  try {
+    const result = await Axios.post(feedbackFishGraphQLEndpoint, body, {
+      headers: { cookie },
+    });
+    const feedback: Feedback[] = result.data.data.feedback;
+    return feedback;
+  } catch (error) {
+    throw Error(
+      "Failed to connect to FeedbackFish: " + (error as Error).message,
+    );
+  }
+};
+
+const generateMetadata = (feedback: ParsedFeedback): ParsedFeedback => {
+  // Transform metadata into kv pairs
+  feedback.metadata?.forEach(({ key, value }) => (feedback[key] = value));
+  // Drop redundant raw metadata
+  delete feedback.metadata;
+  return feedback;
+};
+
+export const parseFeedback = (feedback: Feedback[]): ParsedFeedback[] => {
+  const parsedFeedback: ParsedFeedback[] = [...feedback];
+  parsedFeedback.map(generateMetadata);
+  return parsedFeedback;
+};