Merge pull request #421 from beabee-communityrm/v0.14.x

Merge changes from v0.14.x

src/api/interceptors/ValidateResponseInterceptor.ts

@@ -41,7 +41,7 @@ export class ValidateResponseInterceptor implements InterceptorInterface {
         });
       }
     } catch (errors) {
-      log.error("Validation failed on response", { errors });
+      log.notice("Validation failed on response", { errors });
       // TODO: Just log error for now
       // throw new InternalServerError("Validation failed");
     }

src/api/utils/rules.ts

@@ -211,13 +211,19 @@ function prepareRule(
     }
 
     case "contact":
-      if (!contact) {
-        throw new Error("No contact provided to map contact field type");
-      }
-      // Map "me" to contact id
       return [
         simpleField,
-        rule.value.map((v) => (v === "me" ? contact.id : v))
+        rule.value.map((v) => {
+          // Map "me" to contact id
+          if (v === "me") {
+            if (!contact) {
+              throw new Error("No contact provided to map contact field type");
+            }
+            return contact.id;
+          } else {
+            return v;
+          }
+        })
       ];
 
     default:

src/models/Callout.ts

@@ -1,3 +1,10 @@
+import {
+  SetCalloutFormSchema,
+  CalloutData,
+  CalloutAccess,
+  CalloutCaptcha,
+  CalloutChannel
+} from "@beabee/beabee-common";
 import {
   Column,
   CreateDateColumn,
@@ -12,13 +19,6 @@ import type CalloutTag from "./CalloutTag";
 import type CalloutVariant from "./CalloutVariant";
 
 import { CalloutResponseViewSchema } from "@type/index";
-import {
-  SetCalloutFormSchema,
-  CalloutData,
-  CalloutAccess,
-  CalloutCaptcha,
-  CalloutChannel
-} from "@beabee/beabee-common";
 
 @Entity()
 export default class Callout extends ItemWithStatus implements CalloutData {