Merge pull request #5 from feathersjs/error-mapping

Error mapping

.gitignore

@@ -29,3 +29,4 @@ node_modules
 
 lib/
 *.sqlite
+*.sqlite-journal

.travis.yml

@@ -1,4 +1,6 @@
 language: node_js
 node_js:
+  - '0.10'
+  - '0.12'
   - 'node'
   - 'iojs'

example/app.js

@@ -10,10 +10,12 @@ var sequelize = new Sequelize('sequelize', '', '', {
 });
 var Todo = sequelize.define('todo', {
   text: {
-    type: Sequelize.STRING
+    type: Sequelize.STRING,
+    allowNull: false
   },
   complete: {
-    type: Sequelize.BOOLEAN
+    type: Sequelize.BOOLEAN,
+    defaultValue: false
   }
 }, {
   freezeTableName: true
@@ -46,4 +48,4 @@ app.use('/todos', sequelizeService({
 // Start the server
 module.exports = app.listen(3030);
 
-console.log('Feathers Todo memory service running on 127.0.0.1:3030');
+console.log('Feathers Todo sequelize service running on 127.0.0.1:3030');

package.json

@@ -55,21 +55,23 @@
   },
   "dependencies": {
     "babel-polyfill": "^6.3.14",
-    "feathers-errors": "^0.2.5",
+    "feathers": "^1.3.0",
+    "feathers-errors": "^1.1.5",
     "feathers-query-filters": "^1.1.1",
     "uberproto": "^1.1.2"
   },
   "devDependencies": {
-    "sequelize": "^3.14.1",
     "babel-cli": "^6.1.2",
     "babel-core": "^6.1.2",
     "babel-plugin-add-module-exports": "^0.1.1",
     "babel-preset-es2015": "^6.1.2",
     "body-parser": "^1.14.1",
+    "chai": "^3.4.1",
     "feathers": "^1.2.0",
-    "feathers-service-tests": "^0.5.1",
+    "feathers-service-tests": "^0.5.2",
     "jshint": "^2.8.0",
     "mocha": "^2.3.3",
+    "sequelize": "^3.14.1",
     "sqlite3": "^3.1.1"
   }
 }

src/index.js

@@ -2,34 +2,8 @@ if(!global._babelPolyfill) { require('babel-polyfill'); }
 
 import Proto from 'uberproto';
 import filter from 'feathers-query-filters';
-import { types as errors } from 'feathers-errors';
-
-function getOrder(sort) {
-	let order = [];
-
-	Object.keys(sort).forEach(name =>
-		order.push([ name, sort[name] === 1 ? 'ASC' : 'DESC' ]));
-
-	return order;
-}
-
-function getWhere(query) {
-	let where = Object.assign({}, query);
-
-	Object.keys(where).forEach(prop => {
-		let value = where[prop];
-		if(value.$nin) {
-			value = Object.assign({}, value);
-
-			value.$notIn = value.$nin;
-			delete value.$nin;
-
-			where[prop] = value;
-		}
-	});
-
-	return where;
-}
+import errors from 'feathers-errors';
+import {errorHandler, getOrder, getWhere} from './utils';
 
 class Service {
 	constructor(options) {
@@ -53,7 +27,7 @@ class Service {
 			attributes: filters.$select || null
 		};
 
-		if(this.paginate.default) {
+		if (this.paginate.default) {
 			const limit = Math.min(filters.$limit || this.paginate.default,
 				this.paginate.max || Number.MAX_VALUE);
 
@@ -66,10 +40,10 @@ class Service {
 					skip: filters.$skip || 0,
 					data: result.rows
 				};
-			});
+			}).catch(errorHandler);
 		}
 
-		return this.Model.findAll(query);
+		return this.Model.findAll(query).catch(errorHandler);
 	}
 
 	get(id) {
@@ -79,12 +53,16 @@ class Service {
 			}
 
 			return instance;
-		});
+		})
+		.catch(errorHandler);
 	}
 
 	create(data) {
-		return Array.isArray(data) ?
-			this.Model.bulkCreate(data) : this.Model.create(data);
+		if (Array.isArray(data)) {
+			return this.Model.bulkCreate(data).catch(errorHandler);
+		}
+
+		return this.Model.create(data).catch(errorHandler);
 	}
 
 	patch(id, data, params) {
@@ -102,7 +80,8 @@ class Service {
 			}
 
 			return this.get(id, params);
-		});
+		})
+		.catch(errorHandler);
 	}
 
 	update(id, data) {
@@ -127,7 +106,8 @@ class Service {
 			});
 
 			return instance.update(copy);
-		});
+		})
+		.catch(errorHandler);
 	}
 
 	remove(id, params) {
@@ -141,7 +121,8 @@ class Service {
 			}
 
 			return this.Model.destroy({ where }).then(() => data);
-		});
+		})
+		.catch(errorHandler);
 	}
 }
 

src/utils.js

@@ -0,0 +1,60 @@
+import errors from 'feathers-errors';
+
+export function errorHandler(error) {
+  let feathersError = error;
+
+  if (error.name) {
+    switch(error.name) {
+      case 'SequelizeValidationError':
+      case 'SequelizeUniqueConstraintError':
+      case 'SequelizeExclusionConstraintError':
+      case 'SequelizeForeignKeyConstraintError':
+      case 'SequelizeInvalidConnectionError':
+        feathersError = new errors.BadRequest(error);
+        break;
+      case 'SequelizeTimeoutError':
+      case 'SequelizeConnectionTimedOutError':
+        feathersError = new errors.Timeout(error);
+        break;
+      case 'SequelizeConnectionRefusedError':
+      case 'SequelizeAccessDeniedError':
+        feathersError = new errors.Forbidden(error);
+        break;
+      case 'SequelizeHostNotReachableError':
+        feathersError = new errors.Unavailable(error);
+        break;
+      case 'SequelizeHostNotFoundError':
+        feathersError = new errors.NotFound(error);
+        break;
+    }
+  }
+
+  throw feathersError;
+}
+
+export function getOrder(sort) {
+  let order = [];
+
+  Object.keys(sort).forEach(name =>
+    order.push([ name, sort[name] === 1 ? 'ASC' : 'DESC' ]));
+
+  return order;
+}
+
+export function getWhere(query) {
+  let where = Object.assign({}, query);
+
+  Object.keys(where).forEach(prop => {
+    let value = where[prop];
+    if(value.$nin) {
+      value = Object.assign({}, value);
+
+      value.$notIn = value.$nin;
+      delete value.$nin;
+
+      where[prop] = value;
+    }
+  });
+
+  return where;
+}

test/index.test.js

@@ -1,38 +1,39 @@
 // jshint expr:true
 
-import { base, example } from 'feathers-service-tests';
+import { base, orm, example } from 'feathers-service-tests';
 import Sequelize from 'sequelize';
 import errors from 'feathers-errors';
 import feathers from 'feathers';
 import service from '../src';
 import server from '../example/app';
 
-describe('Feathers Sequelize Service', () => {
-  const sequelize = new Sequelize('sequelize', '', '', {
-    dialect: 'sqlite',
-    storage: './db.sqlite',
-    logging: false
-  });
-  const Model = sequelize.define('user', {
-    name: {
-      type: Sequelize.STRING
-    },
-    age: {
-      type: Sequelize.INTEGER
-    },
-    created: {
-      type: Sequelize.BOOLEAN
-    },
-    time: {
-      type: Sequelize.INTEGER
-    }
-  }, {
-    freezeTableName: true
-  });
-  const _ids = {};
-  const app = feathers().use('/people', service({ Model }));
-  const people = app.service('people');
+const sequelize = new Sequelize('sequelize', '', '', {
+  dialect: 'sqlite',
+  storage: './db.sqlite',
+  logging: false
+});
+const Model = sequelize.define('user', {
+  name: {
+    type: Sequelize.STRING,
+    allowNull: false
+  },
+  age: {
+    type: Sequelize.INTEGER
+  },
+  created: {
+    type: Sequelize.BOOLEAN
+  },
+  time: {
+    type: Sequelize.INTEGER
+  }
+}, {
+  freezeTableName: true
+});
+const _ids = {};
+const app = feathers().use('/people', service({ Model }));
+const people = app.service('people');
 
+describe('Feathers Sequelize Service', () => {
   beforeEach(done => {
     Model.sync({ force: true }).then(() => {
       return Model.create({
@@ -45,7 +46,11 @@ describe('Feathers Sequelize Service', () => {
     });
   });
 
-  base(people, _ids, errors.types);
+  base(people, _ids, errors);
+});
+
+describe('Sequelize service ORM errors', () => {
+  orm(people, _ids, errors);
 });
 
 describe('Sequelize service example test', () => {