Use common filter definition and clean up filter transformation

package.json

@@ -34,7 +34,7 @@
     "test": "jest --setupFiles dotenv/config"
   },
   "dependencies": {
-    "@beabee/beabee-common": "^0.20.3",
+    "@beabee/beabee-common": "^0.20.5",
     "@captchafox/node": "^1.2.0",
     "@inquirer/prompts": "^3.3.0",
     "@sendgrid/mail": "^8.1.0",

src/api/transformers/BaseContactTransformer.ts

@@ -4,26 +4,28 @@ import {
   PaginatedQuery,
   Rule,
   RuleGroup,
+  contactCalloutFilters,
   contactFilters,
   getCalloutFilters,
   isRuleGroup
 } from "@beabee/beabee-common";
+import { isUUID } from "class-validator";
 import { Brackets } from "typeorm";
 
 import { createQueryBuilder, getRepository } from "@core/database";
 
+import { individualAnswerFilterHandler } from "@api/transformers/BaseCalloutResponseTransformer";
 import { BaseTransformer } from "@api/transformers/BaseTransformer";
+import { prefixKeys } from "@api/utils";
 
+import Callout from "@models/Callout";
+import CalloutResponse from "@models/CalloutResponse";
 import Contact from "@models/Contact";
 import ContactProfile from "@models/ContactProfile";
 import ContactRole from "@models/ContactRole";
 import ContactContribution from "@models/ContactContribution";
 
 import { FilterHandler, FilterHandlers } from "@type/filter-handlers";
-import Callout from "@models/Callout";
-import { isUUID } from "class-validator";
-import { individualAnswerFilterHandler } from "./BaseCalloutResponseTransformer";
-import CalloutResponse from "@models/CalloutResponse";
 
 function flattenRules(rules: RuleGroup): Rule[] {
   return rules.rules.flatMap((rule) =>
@@ -73,13 +75,14 @@ export abstract class BaseContactTransformer<
     for (const calloutId of calloutIds) {
       const callout = await getRepository(Callout).findOneBy({ id: calloutId });
       if (callout) {
-        filters[`callouts.${calloutId}.hasAnswered`] = { type: "boolean" };
-
-        const calloutFilters = getCalloutFilters(callout.formSchema);
-        for (const key in calloutFilters) {
-          filters[`callouts.${calloutId}.responses.${key}`] =
-            calloutFilters[key];
-        }
+        Object.assign(
+          filters,
+          prefixKeys(`callouts.${calloutId}.`, contactCalloutFilters),
+          prefixKeys(
+            `callouts.${calloutId}.responses.`,
+            getCalloutFilters(callout.formSchema)
+          )
+        );
       }
     }
 

src/api/utils/index.ts

@@ -54,3 +54,14 @@ export function groupBy<T>(
   }
   return result;
 }
+
+export function prefixKeys(
+  prefix: string,
+  obj: Record<string, unknown>
+): Record<string, unknown> {
+  const newObj: any = {};
+  for (const key in obj) {
+    newObj[`${prefix}${key}`] = obj[key];
+  }
+  return newObj;
+}