Contextify hasMany relation

Also refactor the tests to use supertest-as-promised
strongloop · Dec 19, 2016 · 4cb056c · 4cb056c
1 parent 39962e7
commit 4cb056c
Show file tree

Hide file tree

Showing 3 changed files with 178 additions and 131 deletions.
diff --git a/lib/model.js b/lib/model.js
@@ -249,6 +249,14 @@ module.exports = function(registry) {
     // resolve relation functions
     sharedClass.resolve(function resolver(define) {
       var relations = ModelCtor.relations || {};
+      var defineRaw = define;
+      var define = function(name, options, fn) {
+        if (options.accepts) {
+          options = extend({}, options);
+          options.accepts = setupOptionsArgs(options.accepts);
+        }
+        defineRaw(name, options, fn);
+      };
 
       // get the relations
       for (var relationName in relations) {
@@ -578,10 +586,15 @@ module.exports = function(registry) {
     define('__findById__' + relationName, {
       isStatic: false,
       http: {verb: 'get', path: '/' + pathName + '/:fk'},
-      accepts: {arg: 'fk', type: 'any',
-        description: format('Foreign key for %s', relationName),
-        required: true,
-        http: {source: 'path'}},
+      accepts: [
+        {
+          arg: 'fk', type: 'any',
+          description: format('Foreign key for %s', relationName),
+          required: true,
+          http: {source: 'path'},
+        },
+        {arg: 'options', type: 'object', http: 'optionsFromRequest'},
+      ],
       description: format('Find a related item by id for %s.', relationName),
       accessType: 'READ',
       returns: {arg: 'result', type: toModelName, root: true},
@@ -592,10 +605,15 @@ module.exports = function(registry) {
     define('__destroyById__' + relationName, {
       isStatic: false,
       http: {verb: 'delete', path: '/' + pathName + '/:fk'},
-      accepts: {arg: 'fk', type: 'any',
-        description: format('Foreign key for %s', relationName),
-        required: true,
-        http: {source: 'path'}},
+      accepts: [
+        {
+          arg: 'fk', type: 'any',
+          description: format('Foreign key for %s', relationName),
+          required: true,
+          http: {source: 'path'},
+        },
+        {arg: 'options', type: 'object', http: 'optionsFromRequest'},
+      ],
       description: format('Delete a related item by id for %s.', relationName),
       accessType: 'WRITE',
       returns: [],
@@ -611,6 +629,7 @@ module.exports = function(registry) {
           required: true,
           http: {source: 'path'}},
         {arg: 'data', type: 'object', model: toModelName, http: {source: 'body'}},
+        {arg: 'options', type: 'object', http: 'optionsFromRequest'},
       ],
       description: format('Update a related item by id for %s.', relationName),
       accessType: 'WRITE',
@@ -636,7 +655,12 @@ module.exports = function(registry) {
         accepts: [{arg: 'fk', type: 'any',
           description: format('Foreign key for %s', relationName),
           required: true,
-          http: {source: 'path'}}].concat(accepts),
+          http: {source: 'path'}},
+        ].concat(accepts).concat([
+          {
+            arg: 'options', type: 'object', http: 'optionsFromRequest',
+          },
+        ]),
         description: format('Add a related item by id for %s.', relationName),
         accessType: 'WRITE',
         returns: {arg: relationName, type: modelThrough.modelName, root: true},

diff --git a/package.json b/package.json
@@ -95,7 +95,8 @@
     "sinon-chai": "^2.8.0",
     "strong-error-handler": "^1.0.1",
     "strong-task-emitter": "^0.0.6",
-    "supertest": "^2.0.0"
+    "supertest": "^2.0.0",
+    "supertest-as-promised": "^4.0.2"
   },
   "repository": {
     "type": "git",