Merge pull request #3138 from pangratz/fix_2793

Custom primaryKey for embedded polymorphic relations work
emberjs · Jun 1, 2015 · 92704a0 · 92704a0
2 parents 09809f3 + db8cbe6
commit 92704a0
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 5 deletions.
diff --git a/packages/ember-data/lib/serializers/embedded-records-mixin.js b/packages/ember-data/lib/serializers/embedded-records-mixin.js
@@ -1,4 +1,3 @@
-var get = Ember.get;
 var forEach = Ember.EnumerableUtils.forEach;
 var camelize = Ember.String.camelize;
 
@@ -442,11 +441,10 @@ function extractEmbeddedHasManyPolymorphic(store, key, hash) {
     var modelName = data.type;
     var embeddedSerializer = store.serializerFor(modelName);
     var embeddedTypeClass = store.modelFor(modelName);
-    var primaryKey = get(embeddedSerializer, 'primaryKey');
 
     var embeddedRecord = embeddedSerializer.normalize(embeddedTypeClass, data, null);
     store.push(embeddedTypeClass, embeddedRecord);
-    ids.push({ id: embeddedRecord[primaryKey], type: modelName });
+    ids.push({ id: embeddedRecord.id, type: modelName });
   });
 
   hash[key] = ids;
@@ -476,12 +474,11 @@ function extractEmbeddedBelongsToPolymorphic(store, key, hash) {
   var modelName = data.type;
   var embeddedSerializer = store.serializerFor(modelName);
   var embeddedTypeClass = store.modelFor(modelName);
-  var primaryKey = get(embeddedSerializer, 'primaryKey');
 
   var embeddedRecord = embeddedSerializer.normalize(embeddedTypeClass, data, null);
   store.push(embeddedTypeClass, embeddedRecord);
 
-  hash[key] = embeddedRecord[primaryKey];
+  hash[key] = embeddedRecord.id;
   hash[key + 'Type'] = modelName;
   return hash;
 }

diff --git a/packages/ember-data/tests/integration/serializers/embedded-records-mixin-test.js b/packages/ember-data/tests/integration/serializers/embedded-records-mixin-test.js
@@ -1165,6 +1165,63 @@ test("extractSingle with polymorphic hasMany", function() {
 
 });
 
+test("extractSingle with polymorphic hasMany and custom primary key", function() {
+  SuperVillain.reopen({
+    secretWeapons: DS.hasMany("secretWeapon", { polymorphic: true })
+  });
+
+  env.registry.register('adapter:super-villain', DS.ActiveModelAdapter);
+  env.registry.register('serializer:light-saber', DS.ActiveModelSerializer.extend({
+    primaryKey: 'custom'
+  }));
+  env.registry.register('serializer:super-villain', DS.ActiveModelSerializer.extend(DS.EmbeddedRecordsMixin, {
+    attrs: {
+      secretWeapons: { embedded: 'always' }
+    }
+  }));
+  var serializer = env.container.lookup("serializer:super-villain");
+
+  var json_hash = {
+    super_villain: {
+      id: "1",
+      first_name: "Tom",
+      last_name: "Dale",
+      secret_weapons: [
+        {
+          custom: "1",
+          type: "LightSaber",
+          name: "Tom's LightSaber",
+          color: "Red"
+        },
+        {
+          id: "1",
+          type: "SecretWeapon",
+          name: "The Death Star"
+        }
+      ]
+    }
+  };
+  var json;
+
+  run(function() {
+    json = serializer.extractSingle(env.store, SuperVillain, json_hash);
+  });
+
+  deepEqual(json, {
+    id: "1",
+    firstName: "Tom",
+    lastName: "Dale",
+    secretWeapons: [
+      { id: "1", type: "light-saber" },
+      { id: "1", type: "secret-weapon" }
+    ]
+  }, "Custom primary key of embedded hasMany is correctly normalized");
+
+  equal(env.store.recordForId("lightSaber", "1").get("name"), "Tom's LightSaber", "Embedded polymorphic LightSaber with custom primary key is found");
+  equal(env.store.recordForId("secretWeapon", "1").get("name"), "The Death Star", "Embedded polymorphic SecretWeapon found");
+
+});
+
 test("extractSingle with polymorphic belongsTo", function() {
   expect(2);
 
@@ -1211,6 +1268,55 @@ test("extractSingle with polymorphic belongsTo", function() {
 
 });
 
+test("extractSingle with polymorphic belongsTo and custom primary key", function() {
+  expect(2);
+
+  SuperVillain.reopen({
+    secretLab: DS.belongsTo("secretLab", { polymorphic: true })
+  });
+
+  env.registry.register('adapter:super-villain', DS.ActiveModelAdapter);
+  env.registry.register('serializer:super-villain', DS.ActiveModelSerializer.extend(DS.EmbeddedRecordsMixin, {
+    attrs: {
+      secretLab: { embedded: 'always' }
+    }
+  }));
+  env.registry.register('serializer:bat-cave', DS.ActiveModelSerializer.extend({
+    primaryKey: 'custom'
+  }));
+  var serializer = env.container.lookup("serializer:super-villain");
+
+  var json_hash = {
+    super_villain: {
+      id: "1",
+      first_name: "Tom",
+      last_name: "Dale",
+      secret_lab: {
+        custom: "1",
+        type: "bat-cave",
+        infiltrated: true
+      }
+    }
+  };
+
+  var json;
+
+  run(function() {
+    json = serializer.extractSingle(env.store, SuperVillain, json_hash);
+  });
+
+  deepEqual(json, {
+    id: "1",
+    firstName: "Tom",
+    lastName: "Dale",
+    secretLab: "1",
+    secretLabType: "bat-cave"
+  }, "Custom primary key is correctly normalized");
+
+  equal(env.store.recordForId("batCave", "1").get("infiltrated"), true, "Embedded polymorphic BatCave with custom primary key is found");
+
+});
+
 test("Mixin can be used with RESTSerializer which does not define keyForAttribute", function() {
   run(function() {
     homePlanet = env.store.createRecord(HomePlanet, { name: "Villain League", id: "123" });