From 3111ee49426f2abb9b538232f467c57add680d1c Mon Sep 17 00:00:00 2001
From: Jelmer Visser <jelmer@weflycheap.nl>
Date: Thu, 26 Sep 2019 16:07:53 +0200
Subject: [PATCH] Fix for null values with manyToMany and manyWay

---
 packages/strapi-hook-mongoose/lib/relations.js       | 6 +++---
 packages/strapi-plugin-graphql/services/Resolvers.js | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/strapi-hook-mongoose/lib/relations.js b/packages/strapi-hook-mongoose/lib/relations.js
index 22bc3464f8..8d44d5f09c 100644
--- a/packages/strapi-hook-mongoose/lib/relations.js
+++ b/packages/strapi-hook-mongoose/lib/relations.js
@@ -159,7 +159,7 @@ module.exports = {
                     return _.set(
                       acc,
                       current,
-                      property.map(val => val[assocModel.primaryKey] || val)
+                      property ? property.map(val => val[assocModel.primaryKey] || val) : property
                     );
                   }
 
@@ -187,12 +187,12 @@ module.exports = {
                       return assocModel.updateMany(
                         {
                           [assocModel.primaryKey]: {
-                            $in: property.map(
+                            $in: property ? property.map(
                               val =>
                                 new mongoose.Types.ObjectId(
                                   val[assocModel.primaryKey] || val
                                 )
-                            ),
+                            ) : property,
                           },
                         },
                         {
diff --git a/packages/strapi-plugin-graphql/services/Resolvers.js b/packages/strapi-plugin-graphql/services/Resolvers.js
index 53ece2e335..9c4bf91dfa 100644
--- a/packages/strapi-plugin-graphql/services/Resolvers.js
+++ b/packages/strapi-plugin-graphql/services/Resolvers.js
@@ -172,9 +172,7 @@ const buildAssocResolvers = (model, name, { plugin }) => {
               _.set(
                 queryOpts,
                 ['query', ref.primaryKey],
-                obj[association.alias].map(val => val[ref.primaryKey] || val) ||
-                  []
-              );
+                (obj[association.alias] ? obj[association.alias].map(val => val[ref.primaryKey] || val) : []));
             } else {
               _.set(queryOpts, ['query', association.via], obj[ref.primaryKey]);
             }