Merge pull request #39 from AnyFetch/new-api-post-subcompany

New `POST /subcompanies` behavior

config/configuration.js

@@ -57,10 +57,7 @@ module.exports = {
     },
     fakeCompany: {
       name: 'the_fake_subcompany',
-      hydraters: [
-        'http://plaintext.hydrater.anyfetch.com/hydrate',
-        'http://pdf.hydrater.anyfetch.com/hydrate',
-      ]
+      hydraters: []
     },
     fakeDocument: {
       identifier: 'the "unique" document identifier (éüà)',
@@ -93,4 +90,4 @@ module.exports = {
       contentType: 'image/jpeg'
     }
   }
-};
+};

config/json/api-descriptors.json

@@ -39,6 +39,7 @@
     "endpoint": "/subcompanies",
     "verb": "POST",
     "body": [
+      "user",
       "name",
       "hydraters"
     ]

lib/utility/create-subcompany-with-admin.js

@@ -1,9 +1,6 @@
 'use strict';
 
 var async = require('async');
-var rarity = require('rarity');
-
-var rarity = require('rarity');
 
 /**
  * Create a new user and move it to a new subcompany.
@@ -19,14 +16,16 @@ module.exports = function createSubcompanyWithAdmin(subcompany, newAdmin, finalC
   async.waterfall([
     // Create the admin user who will be named admin of the new subcompany
     function createAdmin(cb) {
-      self.postUser(newAdmin, rarity.slice(1, cb));
+      self.postUser(newAdmin, cb);
     },
-
-    function createSubcompany(cb) {
-      var newAdminFetch = new self.constructor(newAdmin.email, newAdmin.password);
-      newAdminFetch.postSubcompany(subcompany, function(err, res) {
+    function extractId(res, cb) {
+      cb(null, res.body.id);
+    },
+    function createSubcompany(adminId, cb) {
+      subcompany.user = adminId;
+      self.postSubcompany(subcompany, function(err, res) {
         cb(err, res.body);
       });
     },
   ], finalCb);
-};
+};

test/helpers.js

@@ -185,8 +185,9 @@ describe('<High-level helper functions>', function() {
     it('should have created the new user and moved it to the subcompany', function(done) {
       var newAdminFetch = new Anyfetch(admin.email, admin.password);
       newAdminFetch.getCompany(function(err, res) {
-        var company = res.body;
         should(err).not.be.ok;
+
+        var company = res.body;
         should(company).be.ok;
         company.should.have.property('id').and.equal(subcompanyId);
 

test/mappings.js

@@ -29,7 +29,7 @@ describe('<Low-level mapping functions>', function() {
     before(function() {
       anyfetch = new Anyfetch(accessToken);
     });
-    
+
     var testEndpoint = function(name) {
       describe(name, function() {
         var expected = configuration.apiDescriptors[name];
@@ -92,11 +92,11 @@ describe('<Low-level mapping functions>', function() {
       it('should use the correct verb', function() {
         res.req.method.should.equal(expected.verb);
       });
-      
+
       it('should target the correct endpoint', function() {
         res.req.path.should.startWith(expected.endpoint);
       });
-      
+
       it('should have the expected return code', function() {
         res.res.statusCode.should.equal(expected.expectedStatus);
       });
@@ -149,17 +149,17 @@ describe('<Low-level mapping functions>', function() {
 
         it('should post file created with `fs.createReadStream`', function(done) {
           hash.file = fs.createReadStream(hash.path);
-          subFunctions.postFile(hash, done);          
+          subFunctions.postFile(hash, done);
         });
 
         it('should post file without knowing mime-type', function(done) {
           var file = fs.createReadStream(hash.path);
-          subFunctions.postFile({ file: file }, done);          
+          subFunctions.postFile({ file: file }, done);
         });
 
         it('should post file from a path', function(done) {
           var filename = __dirname + '/samples/hello.md';
-          subFunctions.postFile({ file: filename }, done);          
+          subFunctions.postFile({ file: filename }, done);
         });
       });
 
@@ -207,7 +207,7 @@ describe('<Low-level mapping functions>', function() {
             done();
           });
         });
-        
+
         // Delete phony document
         it('...delete phony document', function(done) {
           anyfetch.deleteDocumentById(documentId, done);
@@ -246,20 +246,18 @@ describe('<Low-level mapping functions>', function() {
       var companyInfos = {
         name: 'the-fake-company'
       };
-      var userId = null;
       var subcompanyId = null;
 
       before(function(done) {
         // Setup: an admin user who will be named admin of the new subcompany
         anyfetch.postUser(userInfos, function(err, res) {
-          userId = res.body.id;
+          companyInfos.user = res.body.id;
           done(err);
         });
       });
 
-      it('should create a subcompany as the new user', function(done) {
-        var chuckFetch = new Anyfetch(userInfos.email, userInfos.password);
-        chuckFetch.postSubcompanies(companyInfos, function(err, res) {
+      it('should create a subcompany with the new user', function(done) {
+        anyfetch.postSubcompanies(companyInfos, function(err, res) {
           subcompanyId = res.body.id;
           done(err);
         });