inherit accepted from model's remoteMethod

David Cheung · David Cheung · commit 9d0bb18472fb · 2016-11-18T10:30:30.000-05:00
this is needed because we added allowArray flag to persisted model's
remoteMethod, but when relations try to rebuild such methods, it does
not carry over such flags
diff --git a/lib/model.js b/lib/model.js
@@ -668,7 +668,11 @@ module.exports = function(registry) {
     define('__create__' + scopeName, {
       isStatic: isStatic,
       http: { verb: 'post', path: '/' + pathName },
-      accepts: { arg: 'data', type: 'object', model: toModelName, http: { source: 'body' }},
+      // retrieve original remoteMethod's arguments, so it properly inherits options
+      accepts: retrieveRemoteMethodInformation.call(this, toModelName, 'create') ?
+        retrieveRemoteMethodInformation.call(this, toModelName, 'create').accepts[0] :
+        // fall back to default accepts, when theres no remote for modelTo
+        { arg: 'data', type: 'object', model: toModelName, http: { source: 'body' }},
       description: format('Creates a new instance in %s of this model.', scopeName),
       accessType: 'WRITE',
       returns: { arg: 'data', type: toModelName, root: true },
@@ -692,6 +696,16 @@ module.exports = function(registry) {
     });
   };
 
+  // helper method to extract the actual model's remoteMethod options / flags
+  function retrieveRemoteMethodInformation(toModelName, methodName) {
+    // has remoteClass
+    if (!this.app._remotes._classes[toModelName]) return false;
+
+    return this.app._remotes._classes[toModelName]._methods.find(function(obj) {
+      if (obj.name == methodName) return true;
+    });
+  }
+
   /**
   * Enabled deeply-nested queries of related models via REST API.
   *
diff --git a/test/model.test.js b/test/model.test.js
@@ -164,6 +164,72 @@ describe.onServer('Remote Methods', function() {
           done();
         });
     });
+
+    it('creates related models', function(done) {
+      User.create({ first: 'Bob' }, function(err, res) {
+        expect(res).to.have.property('id');
+        var aPost = { title: 'A story', content: 'Once upon a time' };
+        request(app)
+          .post('/users/' + res.id + '/posts')
+          .send(aPost)
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .end(function(err, result) {
+            if (err) return done(err);
+            expect(result.body).to.have.property('id');
+            expect(result.body).to.have.property('title', aPost.title);
+            expect(result.body).to.have.property('content', aPost.content);
+            done();
+          });
+      });
+    });
+
+    it('creates array of hasMany models', function(done) {
+      User.create({ first: 'Bob' }, function(err, res) {
+        expect(res).to.have.property('id');
+        var twoPosts = [
+          { title: 'One story', content: 'Content #1' },
+          { title: 'Two story', content: 'Content #2' },
+        ];
+        request(app)
+          .post('/users/' + res.id + '/posts')
+          .send(twoPosts)
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .end(function(err, result) {
+            if (err) return done(err);
+            expect(result.body.length).to.eql(2);
+            expect(result.body).to.have.deep.property('[0].title', 'One story');
+            expect(result.body).to.have.deep.property('[1].title', 'Two story');
+            done();
+          });
+      });
+    });
+
+    it('rejects array of obj input for hasOne relation', function(done) {
+      var Friend = app.registry.createModel('friend', { name: String });
+      app.model(Friend, { dataSource: 'db' });
+      User.hasOne(Friend);
+
+      User.create({ first: 'Bob' }, function(err, res) {
+        expect(res).to.have.property('id');
+        var twoFriends = [
+          { name: 'bob' },
+          { name: 'rob' },
+        ];
+        request(app)
+          .post('/users/' + res.id + '/friend')
+          .send(twoFriends)
+          .expect('Content-Type', /json/)
+          .expect(400)
+          .end(function(err, result) {
+            if (err) return done(err);
+            var resError = result.body.error;
+            expect(resError.message).to.match(/value(.*?)not(.*?)object(\.?)/i);
+            done();
+          });
+      });
+    });
   });
   // destoryAll is not exposed as a remoteMethod by default
   describe('Model.destroyAll(callback)', function() {
