add user routes/tests and beginning of folder -> images/sequences

couple weeks of metro ride work here... both beginning of adaptation from sequence array build by sequence adapter and some tests to add users to the db (needed for relating sequences/images to a user as well as managing account upload to external services)

config.js

@@ -4,7 +4,8 @@ const base = {
 
 const development = {
     port: '8080',
-    mapillary: 'https://a.mapillary.com/v3/'
+    mapillary: 'https://a.mapillary.com/v3/',
+    injectDefaults: { simulate: { error: false }}
 };
 
 // for now...

db/posm-paths.sql

@@ -1,10 +1,10 @@
 -- bring in spatialite --
-SELECT load_extension("libspatialite");
+SELECT load_extension("mod_spatialite");
 SELECT InitSpatialMetaData();
 
 -- make the tables --
 CREATE TABLE Users (
-    id INTEGER PRIMARY KEY,
+    id UUID PRIMARY KEY,
     name TEXT NOT NULL
 );
 
@@ -28,4 +28,7 @@ CREATE TABLE Images(
 --- SpatialLite for image locations ---
 SELECT AddGeometryColumn(
     'Images', 'loc', 4326, 'POINT', 'XY'
-);
+);
+
+--- get out of here!!! ---
+.exit

handlers/sequence/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+    post: require('./post')
+}

handlers/sequence/post.js

@@ -19,13 +19,15 @@ module.exports = async (r, h) => {
 		sequences.forEach(async (sequence) => {
 			try {
 				const sequenceId = uuidv4();
-				await Promise.map([insertImages, insertSequence], async (builder) => {
-					try {
-						await builder(sequenceId, sequence, userId);
-					} catch (e) {
-						throw e;
-					}
-				})		
+				console.log(sequenceId);
+				return {}
+				// await Promise.map([insertImages, insertSequence], async (builder) => {
+				// 	try {
+				// 		await builder(sequenceId, sequence, userId);
+				// 	} catch (e) {
+				// 		throw e;
+				// 	}
+				// })		
 			} catch (e) {
 				throw e;
 			}

handlers/user/post.js

@@ -6,16 +6,16 @@ const uuidv4 = require('uuid/v4');
 
 module.exports = async (r, h) => {
 	try {
-        const user = r.params.user,
-              users = await db('Users').select('name')[0];
+        const user = r.payload,
+              users = await db('Users').select('name');
 
-        if (users.contains(user)) {
+        if (users.indexOf(user) === -1) {
             Boom.badRequest('user already exists');
-
         }
 
-        await db('Users').insert({id: uuidv4(), name: user});
-
+        await db('Users').insert({id: 3, name: user.name});
+        return h.response({ upload: 'successful' }).code(200)
+
     } catch (error) {
         throw error;
     }

package.json

@@ -8,7 +8,8 @@
   "scripts": {
     "migrate": "sqlite3 db/posm-paths.sqlite3 < db/posm-paths.sql",
     "test": "./node_modules/.bin/mocha test/**/* --exit",
-    "seed": "knex seed:run"
+    "seed": "knex seed:run",
+    "fixture": "yarn run migrate && yarn run seed"
   },
   "dependencies": {
     "bluebird": "^3.5.1",

routes/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
 module.exports = [
+	require('./user').post,
 	require('./sequence').post
 ]

routes/user/post.js

@@ -1,9 +1,15 @@
 'use strict';
 
-const pathsSchema = require('../../schema/paths');
+const Joi = require('joi');
 
 module.exports = {
 	method: 'POST',
-	path: '/sequence',
-	config: { handler: require('../../handlers/user').post }
+	path: '/user',
+	config: { 
+		handler: require('../../handlers/user').post,
+		validate: {
+			payload: Joi.object().keys({ name: Joi.string() }),
+			failAction: async (request, h, err) => err
+		}
+	}
 }

seeds/users.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const users = require('../testData/seeds').users;
+const uuidv4 = require('uuid/v4');
 
 Promise = require('bluebird');
 
@@ -9,7 +10,7 @@ exports.seed = async (knex, Promise) => {
         await knex('Users').del();
         return Promise.map(users, async (user) => {
             try {
-                await knex('Users').insert({name: user.name})
+                await knex('Users').insert({id: uuidv4(), name: user.name})
             } catch (error) {
                 console.error(error);
             }

test/helpers.js

@@ -0,0 +1,7 @@
+'use strict';
+
+const injectDefaults = require('../config')['development'].injectDefaults;
+
+module.exports = {
+    mergeDefaults: (request) => Object.assign(injectDefaults, request)
+}

test/sequence/handler.js

@@ -0,0 +1,30 @@
+// 'use strict';
+
+// const Joi = require('joi');
+// const chai = require('chai');
+// const expect = chai.expect;
+// const server = require('../server');
+// const mergeDefaults = require('../helpers').mergeDefaults;
+// const routes =  [ 
+//     require('../../routes/sequence').post 
+// ];
+
+// before(async () => await server.liftOff(routes))
+// describe('post', () => {
+    // it('replies 200 when successful creating/inserting image sequences', async () => {
+    //     try {
+    //         const request = mergeDefaults({
+    //                   method: 'POST',
+    //                   payload: require('../../testData/payloads.json').postSequence,
+    //                   url:'/sequence'
+    //               }),
+    //               r = await server.inject(request),
+    //               statusCode = r.statusCode;
+
+    //         expect(statusCode).to.equal(202);
+    //     } catch (error) {
+    //         console.error(error);
+
+    //     }
+    // })
+// })

test/sequence/index.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = {
+    handlerSpec: require('./handler'),
+    adapterSpec: require('./adapter')
+}

test/server.js

@@ -0,0 +1,51 @@
+'use strict';
+
+const Hapi = require('hapi');
+const config = require('../config')['development'];
+const routes = require('../routes');
+const host = config.host;
+const server = Hapi.server({ port: 3001, host: host })
+
+
+server.liftOff = async (route) => {
+    try {
+        server.route(route);
+
+        if (!module.parent) {
+            await server.start();
+            console.log(`test server started at ${server.info.uri}`)
+
+        } else {
+            await server.initialize()
+
+        }
+
+    } catch (error) {
+        throw error;
+
+    }
+}
+
+server.crashLanding = async () => {
+    try {
+        return await server.stop();
+
+    } catch (error) {
+        console.error(error)
+
+    }
+}
+
+void async function () {
+    try {
+        if (!module.parent) {
+            await server.start();
+
+        }
+    } catch (error) {
+        console.error(error);
+
+    }
+}()
+
+module.exports = server;

test/user/handler.js

@@ -0,0 +1,49 @@
+'use strict';
+
+const Joi = require('joi');
+const chai = require('chai');
+const expect = chai.expect;
+const server = require('../server');
+const mergeDefaults = require('../helpers').mergeDefaults;
+const newUserPayload = require('../../testData/payloads').postUser[0];
+const oldUserPayload = require('../../testData/payloads').postUser[1];
+const routes =  [ 
+    require('../../routes/user').post
+];
+
+before(async () => await server.liftOff(routes))
+describe('post', () => {
+    it('replies 200 when successful adding user to db', async () => {
+        try {
+            const request = mergeDefaults({
+                      method: 'POST',
+                      payload: newUserPayload,
+                      url:'/user'
+                  }),
+                  r = await server.inject(request),
+                  statusCode = r.statusCode;
+
+            expect(statusCode).to.equal(200);
+
+        } catch (error) {
+            console.error(error);
+
+        }
+    })
+    it('replies 400 when unsuccessful because user already in db', async () => {
+        try {
+            const request = mergeDefaults({
+                      method: 'POST',
+                      payload: oldUserPayload,
+                      url: '/user'
+                  }),
+                  r = await server.inject(request),
+                  statusCode = r.statusCode;
+
+            expect(statusCode).to.equal(400);
+
+        } catch (error) {
+            console.error(error);
+        }
+    })
+})

test/user/index.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+    handlerSpec: require('./handler')
+}

testData/payloads.js

@@ -0,0 +1,5 @@
+'use strict'
+
+module.exports = {
+    postUser: require('./users')[0]
+}

testData/seeds.js

@@ -0,0 +1,5 @@
+module.exports = {
+    users: require('./users')
+    // sequences: require('./sequences'),
+    // images: require('./images')
+}

testData/users.js

@@ -0,0 +1,6 @@
+'use strict';
+
+module.exports = [
+    {name: 'danbjoseph'},
+    {name: 'giblet'}
+]