fix: drop pg function get_flow_schema in favor of simpler js data m…

…unging (#2540)
theopensystemslab · Dec 7, 2023 · d51efca · d51efca
1 parent aa686fb
commit d51efca
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 42 deletions.
diff --git a/api.planx.uk/modules/flows/downloadSchema/controller.ts b/api.planx.uk/modules/flows/downloadSchema/controller.ts
@@ -6,8 +6,6 @@ import { ServerError } from "../../../errors";
 
 interface DownloadFlowSchemaResponse {
   message: string;
-  alteredNodes: Node[] | null;
-  description?: string;
 }
 
 export const downloadFlowSchema = z.object({
@@ -34,7 +32,7 @@ export const downloadFlowSchemaController: DownloadFlowSchemaController =
     } catch (error) {
       return next(
         new ServerError({
-          message: `Failed to download flow schema: ${error}`,
+          message: `Failed to download schema for flow ${res.locals.parsedReq.params?.flowId}: ${error}`,
         }),
       );
     }

diff --git a/api.planx.uk/modules/flows/downloadSchema/service.ts b/api.planx.uk/modules/flows/downloadSchema/service.ts
@@ -1,5 +1,4 @@
-import { $public } from "../../../client";
-import { gql } from "graphql-request";
+import { getFlowData } from "../../../helpers";
 
 interface FlowSchema {
   node: string;
@@ -9,27 +8,21 @@ interface FlowSchema {
 }
 
 export const getFlowSchema = async (flowId: string) => {
-  const { flowSchema } = await $public.client.request<{
-    flowSchema: FlowSchema[];
-  }>(
-    gql`
-      query ($flow_id: String!) {
-        flowSchema: get_flow_schema(args: { published_flow_id: $flow_id }) {
-          node
-          type
-          text
-          planx_variable
-        }
-      }
-    `,
-    { flow_id: flowId },
-  );
+  const flow = await getFlowData(flowId);
 
-  if (!flowSchema.length) {
-    throw Error(
-      "Can't find a schema for this flow. Make sure it's published or try a different flow id.",
-    );
-  }
+  const data: FlowSchema[] = [];
+  Object.entries(flow.data).map(([nodeId, nodeData]) =>
+    data.push({
+      node: nodeId,
+      type: nodeData?.type?.toString() || "_root",
+      text: nodeData.data?.text,
+      planx_variable:
+        nodeData.data?.fn ||
+        nodeData.data?.val ||
+        nodeData.data?.output ||
+        nodeData.data?.dataFieldBoundary,
+    }),
+  );
 
-  return flowSchema;
+  return data;
 };
diff --git a/hasura.planx.uk/metadata/functions.yaml b/hasura.planx.uk/metadata/functions.yaml
@@ -1,6 +1,3 @@
 - function:
     schema: public
     name: diff_latest_published_flow
-- function:
-    schema: public
-    name: get_flow_schema
diff --git a/hasura.planx.uk/metadata/tables.yaml b/hasura.planx.uk/metadata/tables.yaml
@@ -236,19 +236,6 @@
           - document_template
           - flow_id
         filter: {}
-- table:
-    schema: public
-    name: flow_schemas
-  select_permissions:
-    - role: public
-      permission:
-        columns:
-          - flow_id
-          - node
-          - planx_variable
-          - text
-          - type
-        filter: {}
 - table:
     schema: public
     name: flows

diff --git a/hasura.planx.uk/migrations/1701881725039_drop_function_get_flow_schema/down.sql b/hasura.planx.uk/migrations/1701881725039_drop_function_get_flow_schema/down.sql
@@ -0,0 +1,4 @@
+-- Could not auto-generate a down migration.
+-- Please write an appropriate down migration for the SQL below:
+-- DROP FUNCTION public.get_flow_schema CASCADE;
+-- DROP TABLE public.flow_schemas CASCADE;
diff --git a/hasura.planx.uk/migrations/1701881725039_drop_function_get_flow_schema/up.sql b/hasura.planx.uk/migrations/1701881725039_drop_function_get_flow_schema/up.sql
@@ -0,0 +1,2 @@
+DROP FUNCTION public.get_flow_schema CASCADE;
+DROP TABLE public.flow_schemas CASCADE;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		DROP FUNCTION public.get_flow_schema CASCADE;
		DROP TABLE public.flow_schemas CASCADE;