loadRelations from collections.

Author: adrigzr

src/datastore/async_methods/loadRelations.js

@@ -74,6 +74,14 @@ function loadRelations(resourceName, instance, relations, options) {
       relations = [relations];
     }
 
+    if (DSUtils.isArray(instance)) {
+      var instances = [];
+      angular.forEach(instance, function(object) {
+        instances.push(DS.get(resourceName, object));
+      });
+      instance = instances;
+    }
+
     if (!definition) {
       throw new DS.errors.NER(errorPrefix(resourceName) + resourceName);
     } else if (!DSUtils.isObject(instance)) {
@@ -96,40 +104,46 @@ function loadRelations(resourceName, instance, relations, options) {
     var tasks = [];
     var fields = [];
 
-    DSUtils.forEach(definition.relationList, function (def) {
-      var relationName = def.relation;
-      if (DSUtils.contains(relations, relationName)) {
-        var task;
-        var params = {};
-        if (options.allowSimpleWhere) {
-          params[def.foreignKey] = instance[definition.idAttribute];
-        } else {
-          params.where = {};
-          params.where[def.foreignKey] = {
-            '==': instance[definition.idAttribute]
-          };
-        }
+    if (DSUtils.isArray(instance)) {
+      angular.forEach(instance, function (object) {
+        tasks.push(DS.loadRelations(resourceName, object, relations, options));
+      });
+    } else {
+      DSUtils.forEach(definition.relationList, function (def) {
+        var relationName = def.relation;
+        if (DSUtils.contains(relations, relationName)) {
+          var task;
+          var params = {};
+          if (options.allowSimpleWhere) {
+            params[def.foreignKey] = instance[definition.idAttribute];
+          } else {
+            params.where = {};
+            params.where[def.foreignKey] = {
+              '==': instance[definition.idAttribute]
+            };
+          }
 
-        if (def.type === 'hasMany' && params[def.foreignKey]) {
-          task = DS.findAll(relationName, params, options);
-        } else if (def.type === 'hasOne') {
-          if (def.localKey && instance[def.localKey]) {
+          if (def.type === 'hasMany' && params[def.foreignKey]) {
+            task = DS.findAll(relationName, params, options);
+          } else if (def.type === 'hasOne') {
+            if (def.localKey && instance[def.localKey]) {
+              task = DS.find(relationName, instance[def.localKey], options);
+            } else if (def.foreignKey && params[def.foreignKey]) {
+              task = DS.findAll(relationName, params, options).then(function (hasOnes) {
+                return hasOnes.length ? hasOnes[0] : null;
+              });
+            }
+          } else if (instance[def.localKey]) {
             task = DS.find(relationName, instance[def.localKey], options);
-          } else if (def.foreignKey && params[def.foreignKey]) {
-            task = DS.findAll(relationName, params, options).then(function (hasOnes) {
-              return hasOnes.length ? hasOnes[0] : null;
-            });
           }
-        } else if (instance[def.localKey]) {
-          task = DS.find(relationName, instance[def.localKey], options);
-        }
 
-        if (task) {
-          tasks.push(task);
-          fields.push(def.localField);
+          if (task) {
+            tasks.push(task);
+            fields.push(def.localField);
+          }
         }
-      }
-    });
+      });
+    }
 
     deferred.resolve();
 

test/integration/datastore/async_methods/loadRelations.test.js

@@ -207,6 +207,22 @@ describe('DS.loadRelations(resourceName, instance(Id), relations[, options]): ',
       fail('Should not have succeeded!');
     });
 
+    $httpBackend.flush();
+  });
+  it('should load relations from array of objects', function () {
+    DS.inject('user', user10);
+    DS.inject('user', user16);
+
+    $httpBackend.expectGET('http://test.angular-cache.com/organization/14').respond(200, organization14);
+    $httpBackend.expectGET('http://test.angular-cache.com/organization/15').respond(200, organization15);
+
+    DS.loadRelations('user', [10, 16], ['organization']).then(function (users) {
+      assert.isObject(users[0].organization);
+      assert.equal(users[0].organization.id, organization14.id);
+      assert.isObject(users[1].organization);
+      assert.equal(users[1].organization.id, organization15.id);
+    }, fail);
+
     $httpBackend.flush();
   });
 });