routes for users not logged in to get and post networks

.eslintignore

@@ -2,3 +2,4 @@
 **/vendor/*
 **/*.min.js
 **/coverage/*
+**/log.json

.gitignore

@@ -23,6 +23,7 @@ logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+log.json
 
 # Runtime data
 pids

__test__/neuralNetwork-router.test.js

@@ -24,7 +24,6 @@ describe(`Neural Network Router`, () => {
         .then(response => {
           tempUserMock.user = response.user;
           tempUserMock.token = response.token;
-          // console.log(tempUserMock);
           return superagent.post(`${API_URL}/neuralnetwork/${triWaveToTest}/testname`)
             .set('Authorization', `Bearer ${tempUserMock.token}`);
         })
@@ -81,47 +80,25 @@ describe(`Neural Network Router`, () => {
     }, 100000);
   });
 
-  // test(`neural network PUT request should return a 200 status if there are no errors`, () => {
-  //   let tempUserMock = {};
-  //   return userMockFactory.create()
-  //     .then(response => {
-  //       tempUserMock.user = response.user;
-  //       tempUserMock.token = response.token;
-  //       return neuralNetworkMockFactory.create()
-  //         .then(response => {
-  //           tempUserMock.user = response.user;
-  //           tempUserMock.networkID = response.networkID;
-  //           return superagent.put(`${API_URL}/neuralnetwork/${tempUserMock.networkID}`)
-  //             .set('Authorization', `Bearer ${tempUserMock.token}`)
-  //             .send({neuralNetwork: placeholderNetwork});
-  //         });
-  //     })
-  //     .then(response => {
-  //       expect(response.status).toEqual(200);
-  //       expect(response.body.neuralNetwork).toBeTruthy();
-  //       expect(response.body._id).toBeTruthy();
-  //     });
-  // });
-  // });
 
-//   describe(`neural network DELETE request`, () => {
-//     test(`neural network DELETE request should return a 204 status if there are no errors`, () => {
-//       let tempUserMock = {};
-//       return userMockFactory.create()
-//         .then(response => {
-//           tempUserMock.user = response.user;
-//           tempUserMock.token = response.token;
-//           return neuralNetworkMockFactory.create()
-//             .then(response => {
-//               tempUserMock.user = response.user;
-//               tempUserMock.networkID = response.networkID;
-//               return superagent.delete(`${API_URL}/neuralnetwork/${tempUserMock.networkID}`)
-//                 .set('Authorization', `Bearer ${tempUserMock.token}`);
-//             });
-//         })
-//         .then(response => {
-//           expect(response.status).toEqual(204);
-//         });
-//     });
-//   });
+  describe(`neural network DELETE request`, () => {
+    test(`neural network DELETE request should return a 204 status if there are no errors`, () => {
+      let tempUserMock = {};
+      return userMockFactory.create()
+        .then(response => {
+          tempUserMock.user = response.user;
+          tempUserMock.token = response.token;
+          return neuralNetworkMockFactory.create()
+            .then(response => {
+              tempUserMock.user = response.user;
+              tempUserMock.networkID = response.networkID;
+              return superagent.delete(`${API_URL}/neuralnetwork/${tempUserMock.networkID}`)
+                .set('Authorization', `Bearer ${tempUserMock.token}`);
+            });
+        })
+        .then(response => {
+          expect(response.status).toEqual(204);
+        });
+    });
+  });
 });

lib/neural-net.js

@@ -25,7 +25,6 @@ const myNetwork = new Network({
 });
 
 const predictor = (dataToProcess, network = myNetwork) => {
-  console.log(network);
   dataToProcess.neuralTransformedArray = [];
 
   const arrayToProcess = dataToProcess.neuralArray;
@@ -60,8 +59,8 @@ const predictor = (dataToProcess, network = myNetwork) => {
     dataToProcess.neuralTransformedArray.push(network.activate([...currentValues])[0]);
   }
   // Andrew - attaching the trained network to the output object for use in other modules
+  // Andrew - The toJSON method deconstructs the network, but does not stringify it.
   dataToProcess.neuralNet = network.toJSON();
-  console.log(dataToProcess.neuralNet, Network.fromJSON(dataToProcess.neuralNet));
 
   return dataToProcess;
 };

models/user.js

@@ -48,7 +48,6 @@ userSchema.methods.createToken = function(){
   this.tokenSeed = crypto.randomBytes(64).toString('hex');
   return this.save()
     .then(user => {
-      console.log('createtoken user: ', user);
       return jsonWebToken.sign({
         tokenSeed: user.tokenSeed,
       }, process.env.SECRET_SALT);

routes/neuralNetwork-router.js

@@ -15,10 +15,24 @@ const waveWriter = require('../lib/wave-writer');
 
 const neuralNetworkRouter = module.exports = new Router();
 
-neuralNetworkRouter.post(`/neuralnetwork/save/:neuralnetname`);
+neuralNetworkRouter.post(`/neuralnetwork/save/:neuralnetname`, jsonParser, bearerAuthMiddleware, (request, response, next) => {
+  if (!request.params.neuralnetname){
+    throw new httpErrors('__ERROR__', 'Network must have a name');
+  }
+  return new NeuralNetworkModel({
+    neuralNetwork: request.body,
+    name: request.params.neuralnetname,
+  }).save()
+    .then(network => {
+      request.user.neuralNetworks.push(network._id);
+      return User.findByIdAndUpdate(request.user._id, request.user)
+        .then(() => response.sendStatus(200))
+        .catch(next);
+    });
+});
 
 // user must be logged in to perform any actions on a saved network/save a network
-neuralNetworkRouter.post(`/neuralnetwork/:wavename/:neuralnetname`, jsonParser, bearerAuthMiddleware, (request, response, next) => {
+neuralNetworkRouter.post(`/neuralnetwork/:wavename/:neuralnetname`, bearerAuthMiddleware, (request, response, next) => {
   // need to add the neuralNetwork created through WaveRouter to the user's array of networks
 
   // Andrew - TODO: check where this error is handled or if it needs to be refactored
@@ -39,7 +53,6 @@ neuralNetworkRouter.post(`/neuralnetwork/:wavename/:neuralnetname`, jsonParser,
       let parsedFile = waveParser(data);
       parsedFile = neuralNetwork(parsedFile);
       neuralGeneratedFile = waveWriter(parsedFile);
-      console.log(parsedFile.neuralNet);
       const neuralNetworkToSave = JSON.stringify(parsedFile.neuralNet);
 
       return new NeuralNetworkModel({
@@ -56,9 +69,24 @@ neuralNetworkRouter.post(`/neuralnetwork/:wavename/:neuralnetname`, jsonParser,
     });
 });
 
-// neuralNetworkRouter.get('/neuralnetwork/wave/:wavename', (request, response, next) => {
+neuralNetworkRouter.get('/neuralnetwork/wave/:wavename', (request, response, next) => {
+
+  if (!request.params.wavename) {
+    throw new httpErrors('__ERROR__', 'User must select a wave to use');
+  }
+
+  const path = `${__dirname}/../assets/${request.params.wavename}.wav`;
 
-// });
+  return fsx.readFile(path)
+    .then(data => {
+      let parsedFile = waveParser(data);
+      parsedFile = neuralNetwork(parsedFile);
+      const neuralGeneratedFile = waveWriter(parsedFile);
+      const neuralNetworkToSave = JSON.stringify(parsedFile.neuralNet);
+      return response.json({neuralNetworkToSave, neuralGeneratedFile});
+    })
+    .catch(next);
+});
 
 neuralNetworkRouter.get('/neuralnetwork/:networkID', bearerAuthMiddleware, (request, response, next) => {
   NeuralNetworkModel.findById(request.params.networkID)
@@ -87,7 +115,6 @@ neuralNetworkRouter.put('/neuralnetwork/:networkID/:wavename', jsonParser, beare
   return NeuralNetworkModel.findById(request.params.networkID)
     .then(foundNet => {
       foundNeuralNetwork = Network.fromJSON(JSON.parse(foundNet.neuralNetwork));
-      console.log(foundNeuralNetwork);
       return fsx.readFile(path)
         .then(data => {
           let parsedFile = waveParser(data);