From 75f9335a444e22b1095d82134ec59971fd0acb04 Mon Sep 17 00:00:00 2001
From: mike12345567 <me@michaeldrury.co.uk>
Date: Wed, 12 May 2021 12:52:34 +0100
Subject: [PATCH] Fixing an issue found with queries, if an optional property
 isn't set then problems could arise before.

---
 packages/server/src/api/controllers/query.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/server/src/api/controllers/query.js b/packages/server/src/api/controllers/query.js
index e3f961f07..d239ac017 100644
--- a/packages/server/src/api/controllers/query.js
+++ b/packages/server/src/api/controllers/query.js
@@ -58,6 +58,9 @@ async function enrichQueryFields(fields, parameters) {
 
   // enrich the fields with dynamic parameters
   for (let key of Object.keys(fields)) {
+    if (fields[key] == null) {
+      continue
+    }
     if (typeof fields[key] === "object") {
       // enrich nested fields object
       enrichedQuery[key] = await enrichQueryFields(fields[key], parameters)