From 9b94a73b8d4e51a3b92e2c8967757776f042f2b5 Mon Sep 17 00:00:00 2001
From: Jim LAURIE <j.laurie6993@gmail.com>
Date: Tue, 18 Sep 2018 15:32:12 +0200
Subject: [PATCH] Fix association detection

---
 packages/strapi-hook-bookshelf/lib/relations.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-hook-bookshelf/lib/relations.js b/packages/strapi-hook-bookshelf/lib/relations.js
index e22b8418d1..550c928b23 100644
--- a/packages/strapi-hook-bookshelf/lib/relations.js
+++ b/packages/strapi-hook-bookshelf/lib/relations.js
@@ -302,7 +302,7 @@ module.exports = {
   },
 
   addRelation: async function (params) {
-    const association = this.associations.find(x => x.via === params.foreignKey);
+    const association = this.associations.find(x => x.via === params.foreignKey && _.get(params.values, x.alias, null));
 
     if (!association) {
       // Resolve silently.
@@ -325,7 +325,7 @@ module.exports = {
   },
 
   removeRelation: async function (params) {
-    const association = this.associations.find(x => x.via === params.foreignKey);
+    const association = this.associations.find(x => x.via === params.foreignKey && _.get(params.values, x.alias, null));
 
     if (!association) {
       // Resolve silently.