fix empty string errors

Author: wojtek-krysiak

config/config.js

@@ -4,7 +4,7 @@ module.exports = {
     password: process.env.POSTGRES_PASSWORD,
     port: process.env.POSTGRES_PORT || 5432,
     database: process.env.POSTGRES_DATABASE || 'database_test',
-    host: process.env.POSTGRES_HOST || 'postgres',
+    host: process.env.POSTGRES_HOST || 'localhost',
     dialect: 'postgres',
   },
 }

index.js

@@ -3,17 +3,17 @@
  *
  * @description
  * ### A Sequelize database adapter for AdminBro.
- * 
+ *
  * #### Installation
- * 
+ *
  * To install the adapter run
- * 
+ *
  * ```
  * yarn add admin-bro-sequelizejs
  * ```
- * 
+ *
  * ### Usage
- * 
+ *
  * In order to use it in your project register the adapter first:
  *
  * ```javascript
@@ -22,12 +22,12 @@
  *
  * AdminBro.registerAdapter(AdminBroSequelize)
  * ```
- * 
+ *
  * ### Passing an entire database
- * 
+ *
  * Sequelize generates folder in your app called `./models` and there is an `index.js` file.
  * You can require it and pass to {@link AdminBroOptions} like this:
- * 
+ *
  * ```javascript
  * const db = require('../models');
  * const AdminBro = new AdminBro({
@@ -36,20 +36,20 @@
  * })
  * //...
  * ```
- * 
+ *
  * ### Passing each resource
- * 
+ *
  * Also you can pass a single resource and adjust it to your needs via {@link ResourceOptions}.
  *
  * So let say you have a model called `vendor` and there is a `vendor.js` file in your `./models`.
  * Within this file there is
- * 
+ *
  * ```javascript
  * //...
  * sequelize.define('vendor', //...
  * //...
  * ```
- * 
+ *
  * In order to pass it directly, run this code:
  *
  * ```javascript
@@ -65,13 +65,13 @@
  * })
  * //...
  * ```
- * 
- * 
+ *
+ *
  */
 
 /**
  * Implementation of {@link BaseDatabase} for Sequelize Adapter
- * 
+ *
  * @type {typeof BaseDatabase}
  * @static
  */

migrations/20191216175344-create-post.js

@@ -0,0 +1,39 @@
+
+
+module.exports = {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Posts', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER,
+    },
+    title: {
+      type: Sequelize.STRING,
+    },
+    description: {
+      type: Sequelize.STRING,
+    },
+    publishedAt: {
+      type: Sequelize.DATE,
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+    },
+    userId: {
+      type: Sequelize.INTEGER,
+      references: {
+        model: 'Users',
+        key: 'id',
+      },
+      onUpdate: 'CASCADE',
+      onDelete: 'SET NULL',
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+    },
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Posts'),
+}

models/post.js

@@ -0,0 +1,11 @@
+module.exports = (sequelize, DataTypes) => {
+  const Post = sequelize.define('Post', {
+    title: DataTypes.STRING,
+    description: DataTypes.STRING,
+    publishedAt: DataTypes.DATE,
+  }, {})
+  Post.associate = function (models) {
+    Post.belongsTo(models.User, { foreignKey: 'userId' })
+  }
+  return Post
+}

models/user.js

@@ -12,7 +12,7 @@ module.exports = (sequelize, DataTypes) => {
     },
   }, {})
   User.associate = function (models) {
-    // associations can be defined here
+    User.hasMany(models.Post, { foreignKey: 'userId' })
   }
   return User
 }

spec/database.spec.js

@@ -28,7 +28,7 @@ describe('Database', function () {
   describe('#resources', function () {
     it('fetches all resources when entire db is given', function () {
       const database = new Database(db)
-      expect(database.resources()).to.have.lengthOf(1)
+      expect(database.resources()).to.have.lengthOf(2)
       expect(database.resources()[0]).to.be.an.instanceof(Resource)
     })
 

spec/resource.spec.js

@@ -130,6 +130,24 @@ describe('Resource', function () {
         }
       })
     })
+
+    context('record with empty id field', function () {
+      beforeEach(function () {
+        this.SequelizeModel = db.sequelize.models.Post
+        this.resource = new Resource(this.SequelizeModel)
+      })
+
+      it('creates record without an error', async function () {
+        this.params = {
+          title: 'some title',
+          description: 'doe',
+          publishedAt: '2019-12-10 12:00',
+          userId: '',
+        }
+        this.recordParams = await this.resource.create(this.params)
+        expect(this.recordParams.userId).to.be.null
+      })
+    })
   })
 
   describe('#update', function () {

src/resource.js

@@ -106,8 +106,9 @@ class Resource extends BaseResource {
   }
 
   async create(params) {
+    const parsedParams = this.parseParams(params)
     try {
-      const record = await this.SequelizeModel.create(params)
+      const record = await this.SequelizeModel.create(parsedParams)
       return record.toJSON()
     } catch (error) {
       if (error.name === SEQUELIZE_VALIDATION_ERROR) {
@@ -118,8 +119,9 @@ class Resource extends BaseResource {
   }
 
   async update(id, params) {
+    const parsedParams = this.parseParams(params)
     try {
-      await this.SequelizeModel.update(params, {
+      await this.SequelizeModel.update(parsedParams, {
         where: { id },
       })
       const record = await this.findById(id)
@@ -144,6 +146,29 @@ class Resource extends BaseResource {
     }, {})
     return new ValidationError(`${this.name()} validation failed`, errors)
   }
+
+  /**
+   * Check all params against values they hold. In case of wrong value it corrects it.
+   *
+   * What it does esactly:
+   * - removes keys with empty strings for the `number`, `float` and 'reference' properties.
+   *
+   * @param   {Object}  params  received from AdminBro form
+   *
+   * @return  {Object}          converted params
+   */
+  parseParams(params) {
+    const parasedParams = { ...params }
+    this.properties().forEach((property) => {
+      const value = parasedParams[property.name()]
+      if (['number', 'float', 'reference'].includes(property.type())) {
+        if (value === '') {
+          delete parasedParams[property.name()]
+        }
+      }
+    })
+    return parasedParams
+  }
 }
 
 module.exports = Resource