fix(File): add missing fields for #toJSON (#438)

Author: leeyeh

src/av.js

@@ -248,12 +248,7 @@ AV._encode = function(value, seenObjects, disallowObjects) {
     if (!value.url() && !value.id) {
       throw new Error("Tried to save an object containing an unsaved file.");
     }
-    return {
-      __type: "File",
-      id:  value.id,
-      name: value.name(),
-      url: value.url()
-    };
+    return value._toFullJSON();
   }
   if (_.isObject(value)) {
     return _.mapObject(value, (v, k) => AV._encode(v, seenObjects, disallowObjects));

src/file.js

@@ -199,8 +199,35 @@ module.exports = function(AV) {
   AV.File.prototype = {
     className: '_File',
 
-    toJSON: function() {
-      return AV._encode(this);
+    _toFullJSON(seenObjects) {
+      var json = _.clone(this.attributes);
+      AV._objectEach(json, function(val, key) {
+        json[key] = AV._encode(val, seenObjects);
+      });
+      AV._objectEach(this._operations, function(val, key) {
+        json[key] = val;
+      });
+
+      if (_.has(this, "id")) {
+        json.objectId = this.id;
+      }
+      _(['createdAt', 'updatedAt']).each((key) => {
+        if (_.has(this, key)) {
+          const val = this[key];
+          json[key] = _.isDate(val) ? val.toJSON() : val;
+        }
+      });
+      json.__type = "File";
+      return json;
+    },
+
+    toJSON() {
+      const json = this._toFullJSON();
+      // add id and keep __type for backward compatible
+      if (_.has(this, 'id')) {
+        json.id = this.id;
+      }
+      return json;
     },
 
     /**
@@ -487,6 +514,7 @@ module.exports = function(AV) {
         name: value.name,
         url: value.url,
         mime_type: value.mime_type,
+        bucket: value.bucket,
       };
       value.attributes.metaData = value.metaData || {};
       value.id = value.objectId;
@@ -496,6 +524,7 @@ module.exports = function(AV) {
       delete value.url;
       delete value.name;
       delete value.mime_type;
+      delete value.bucket;
       _.extend(this, value);
       return this;
     }

src/object.js

@@ -211,21 +211,12 @@ module.exports = function(AV) {
       if (_.has(this, "id")) {
         json.objectId = this.id;
       }
-      if (_.has(this, "createdAt")) {
-        if (_.isDate(this.createdAt)) {
-          json.createdAt = this.createdAt.toJSON();
-        } else {
-          json.createdAt = this.createdAt;
+      _(['createdAt', 'updatedAt']).each((key) => {
+        if (_.has(this, key)) {
+          const val = this[key];
+          json[key] = _.isDate(val) ? val.toJSON() : val;
         }
-      }
-
-      if (_.has(this, "updatedAt")) {
-        if (_.isDate(this.updatedAt)) {
-          json.updatedAt = this.updatedAt.toJSON();
-        } else {
-          json.updatedAt = this.updatedAt;
-        }
-      }
+      });
       json.__type = "Object";
       json.className = this.className;
       return json;

test/file.js

@@ -123,7 +123,7 @@ describe('File', function() {
     });
   });
 
-  describe('Fetch', function() {
+  describe('#fetch', function() {
     var fileId = '52f9dd5ae4b019816c865985';
     it('createWithoutData() should return a File', function() {
       var file = AV.File.createWithoutData(fileId);
@@ -136,16 +136,32 @@ describe('File', function() {
         file.save();
       }).to.throwError(/File already saved\./);
     });
-    it('fetch() should retrieve all data', function() {
-      var file = AV.File.createWithoutData(fileId);
-      return file.fetch().then(function(file) {
+    describe('fetch', () => {
+      before(function() {
+        return AV.File.createWithoutData(fileId)
+          .fetch()
+          .then(file => this.file = file);
+      })
+      it('should retrieve all data', function() {
+        var file = this.file;
         expect(file).to.be.a(AV.File);
         expect(file.id).to.be(fileId);
         expect(file.name()).to.be('myfile.txt');
         expect(file.get('mime_type')).to.be('text/plain');
         expect(typeof file.url()).to.be('string');
       });
-    });
+      it('decode and encode', function () {
+        const json = this.file.toJSON();
+        // backward compatible check
+        json.should.have.properties(['__type', 'id', 'name', 'url']);
+        const file = AV._decode(json);
+        expect(file).to.be.a(AV.File);
+        expect(file.id).to.be(fileId);
+        expect(file.name()).to.be('myfile.txt');
+        expect(file.get('mime_type')).to.be('text/plain');
+        expect(typeof file.url()).to.be('string');
+      });
+    })
   });
 
   describe('File get and set', function() {