Smart Segments - Prevent includes from queryBuilder to overwrite incl…

…ude from segment scope

CHANGELOG.md

@@ -4,6 +4,9 @@
 ### Added
 - Technical - Add babel.
 
+### Changed
+- Smart Segments - Prevent includes from queryBuilder to overwrite include from segment scope.
+
 ## RELEASE 2.16.9 - 2018-11-08
 ### Changed
 - Smart Fields - Display a warning to show Smart Fields declared without a field attribute.

src/services/query-builder.js

@@ -24,20 +24,24 @@ function QueryBuilder(model, opts, params) {
   };
 
   this.getIncludes = function (modelForIncludes, fieldNamesRequested) {
-    var includes = [];
-    _.values(modelForIncludes.associations).forEach(function (association) {
-      if (!fieldNamesRequested ||
-        (fieldNamesRequested.indexOf(association.as) !== -1)) {
-        if (['HasOne', 'BelongsTo'].indexOf(association.associationType) > -1) {
-          includes.push({
-            model: association.target.unscoped(),
-            as: association.associationAccessor
-          });
-        }
-      }
-    });
-
-    return includes;
+    return _.values(modelForIncludes.associations)
+      .filter(function (association) {
+        return (
+          (!fieldNamesRequested ||
+            fieldNamesRequested.includes(association.as)) &&
+          ['HasOne', 'BelongsTo'].includes(association.associationType) &&
+          // Don't include models that are already included by the segment scope
+          (modelForIncludes._scope.include || []).every(function (include) {
+            return include.model !== association.target
+          })
+        );
+      })
+      .map(function (association) {
+        return {
+          model: association.target.unscoped(),
+          as: association.associationAccessor
+        };
+      });
   };
 
   this.getOrder = function (aliasName) {