Support clone with relation (fix #381) (#382)

* fix broken test

* Support clone with relation (fix #381)

* fix bug

* fix bug

* test fix

* more tests

Author: yuki-takeichi

integration/test/ParseObjectTest.js

@@ -1455,4 +1455,37 @@ describe('Parse Object', () => {
       done();
     }
   });
+
+  it('can clone with relation', async (done) => {
+    const testObject = new TestObject();
+    const o = new TestObject();
+    await o.save();
+    await testObject.save();
+    let relation = o.relation('aRelation');
+    relation.add(testObject);
+    await o.save();
+
+    const o2 = o.clone();
+    assert.equal(
+      o.relation('aRelation').targetClassName,
+      o2.relation('aRelation').targetClassName
+    );
+    let relations = await o.relation('aRelation').query().find();
+    assert.equal(relations.length, 1);
+
+    relations = await o2.relation('aRelation').query().find();
+    assert.equal(relations.length, 0);
+
+    relation = o2.relation('aRelation');
+    relation.add(testObject);
+    await o2.save();
+
+    relations = await o.relation('aRelation').query().find();
+    assert.equal(relations.length, 1);
+
+    relations = await o2.relation('aRelation').query().find();
+    assert.equal(relations.length, 1);
+
+    done();
+  });
 });

src/ParseObject.js

@@ -652,6 +652,10 @@ class ParseObject {
         !(changes[k] instanceof ParseACL)
       ) {
         newOps[k] = new SetOp(new ParseACL(changes[k]));
+      } else if (changes[k] instanceof ParseRelation) {
+        var relation = new ParseRelation(this, k);
+        relation.targetClassName = changes[k].targetClassName;
+        newOps[k] = new SetOp(relation);
       } else {
         newOps[k] = new SetOp(changes[k]);
       }

src/ParseOp.js

@@ -392,6 +392,8 @@ export class RelationOp extends Op {
       return this;
     } else if (previous instanceof UnsetOp) {
       throw new Error('You cannot modify a relation after deleting it.');
+    } else if (previous instanceof SetOp && previous._value instanceof ParseRelation) {
+      return this;
     } else if (previous instanceof RelationOp) {
       if (previous._targetClassName &&
         previous._targetClassName !== this._targetClassName) {

src/__tests__/ParseObject-test.js

@@ -22,6 +22,7 @@ jest.dontMock('../ParseFile');
 jest.dontMock('../ParseGeoPoint');
 jest.dontMock('../ParseObject');
 jest.dontMock('../ParseOp');
+jest.dontMock('../ParseRelation');
 jest.dontMock('../RESTController');
 jest.dontMock('../SingleInstanceStateController');
 jest.dontMock('../TaskQueue');
@@ -35,13 +36,48 @@ jest.dontMock('./test_helpers/mockXHR');
 jest.useFakeTimers();
 
 const mockRelation = function(parent, key) {
-  this.parentClass = parent.className;
-  this.parentId = parent.id;
+  // The parent and key fields will be populated by the parent
+  if (parent) {
+    this.parentClass = parent.className;
+    this.parentId = parent.id;
+  }
   this.key = key;
 };
 mockRelation.prototype.add = function(obj) {
   this.targetClassName = obj.className;
 };
+mockRelation.prototype.toJSON = function() {
+  return {
+    __type: 'Relation',
+    className: this.targetClassName
+  };
+};
+mockRelation.prototype._ensureParentAndKey = function(parent, key) {
+  this.key = this.key || key;
+  if (this.key !== key) {
+    throw new Error(
+      'Internal Error. Relation retrieved from two different keys.'
+    );
+  }
+  if (this.parent) {
+    if (this.parent.className !== parent.className) {
+      throw new Error(
+        'Internal Error. Relation retrieved from two different Objects.'
+      );
+    }
+    if (this.parent.id) {
+      if (this.parent.id !== parent.id) {
+        throw new Error(
+          'Internal Error. Relation retrieved from two different Objects.'
+        );
+      }
+    } else if (parent.id) {
+      this.parent = parent;
+    }
+  } else {
+    this.parent = parent;
+  }
+};
 jest.setMock('../ParseRelation', mockRelation);
 
 const mockQuery = function(className) {
@@ -514,6 +550,17 @@ describe('ParseObject', () => {
     expect(rel.targetClassName).toBe('Person');
   });
 
+  it('can be cloned with relation (#381)', () => {
+    const relationJSON = {__type: 'Relation', className: 'Bar'};
+    const o = ParseObject.fromJSON({
+      objectId: '7777777777',
+      className: 'Foo',
+      aRelation: relationJSON,
+    });
+    const o2 = o.clone();
+    expect(o2._getSaveJSON().aRelation).toEqual(relationJSON);
+  });
+
   it('can detect dirty object children', () => {
     const o = new ParseObject('Person');
     o._finishFetch({

src/__tests__/ParseOp-test.js

@@ -26,6 +26,13 @@ mockObject.prototype._getId = function() {
 mockObject.registerSubclass = function() {};
 jest.setMock('../ParseObject', mockObject);
 
+const mockRelation = function(parent, key) {
+  this.parent = parent;
+  this.key = key;
+}
+jest.setMock('../ParseRelation', mockRelation);
+
+const ParseRelation = require('../ParseRelation');
 const ParseObject = require('../ParseObject');
 const ParseOp = require('../ParseOp');
 const {
@@ -364,4 +371,12 @@ describe('ParseOp', () => {
       ]
     });
   });
+
+  it('can merge Relation Op with the previous Op', () => {
+    const r = new RelationOp();
+    const relation = new ParseRelation(null, null);
+    const set = new SetOp(relation);
+
+    expect(r.mergeWith(set)).toEqual(r);
+  });
 });