axe-api 1.5.0-rc-7 → 1.5.0-rc-9

package/build/src/Handlers/Helpers.js

@@ -197,8 +197,13 @@ const getRelatedData = (version, data, withArray, model, modelList, database, ha
         }
         const dataFieldKey = getPrimaryOrForeignKeyByRelation(definedRelation, dataField);
         const searchFieldKey = getPrimaryOrForeignKeyByRelation(definedRelation, searchField);
-        // We should find the parent Primary Key values.
-        const parentPrimaryKeyValues = data.map((item) => item[dataFieldKey]);
+        // We should find the parent Primary Key values. We shouldn't allow NULL or
+        // undefined as the primary key value. NULL or undefined cannot be used as a
+        // key between relations. Also, there is no need to have duplicated values
+        // in the array.
+        const parentPrimaryKeyValues = [
+            ...new Set(data.map((item) => item[dataFieldKey]).filter((item) => item)),
+        ];
         // Selecting the special field for the relations
         let selectColumns = ["*"];
         if (clientQuery.fields.length > 0) {
@@ -236,7 +241,12 @@ const getRelatedData = (version, data, withArray, model, modelList, database, ha
             foreignModelQuery.whereNull(foreignModel.instance.deletedAtColumn);
         }
         // Fetching related records by foreignKey and primary key values.
-        let relatedRecords = yield foreignModelQuery.whereIn(searchFieldKey, parentPrimaryKeyValues);
+        let relatedRecords = [];
+        // If there is not any parentPrimaryKeyValues, that means the relationship
+        // query would return empty. So no need to execute those query at this phase.
+        if (parentPrimaryKeyValues.length > 0) {
+            relatedRecords = yield foreignModelQuery.whereIn(searchFieldKey, parentPrimaryKeyValues);
+        }
         // Adding related data source to the request tags to set cache tag values
         const { primaryKey } = foreignModel.instance;
         const cacheConfig = foreignModel.getCacheConfiguration(handler);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axe-api",
-  "version": "1.5.0-rc-7",
+  "version": "1.5.0-rc-9",
   "description": "AXE API is a simple tool to create Rest APIs quickly.",
   "main": "build/index.js",
   "types": "build/index.d.ts",