Merge caef1ab into 2a3b93c

andela · Jan 15, 2019 · c8f2de3 · c8f2de3
2 parents 2a3b93c + caef1ab
commit c8f2de3
Show file tree

Hide file tree

Showing 75 changed files with 1,520 additions and 97 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1,2 @@
+server/seeders
+server/migrations
diff --git a/package.json b/package.json
@@ -4,8 +4,10 @@
   "description": "A Social platform for the creative at heart",
   "main": "index.js",
   "scripts": {
-    "db:migrate": "node_modules/.bin/sequelize db:migrate:undo:all && node_modules/.bin/sequelize db:migrate",
-    "db:seed": "node_modules/.bin/sequelize db:seed:all",
+    "undomigrate": "babel-node node_modules/.bin/sequelize db:migrate:undo:all",
+    "migrate": "npm run undomigrate && babel-node node_modules/.bin/sequelize db:migrate",
+    "undoseed": "babel-node node_modules/.bin/sequelize db:seed:undo:all",
+    "seed": "babel-node node_modules/.bin/sequelize db:seed:all",
     "comp": "babel index.js -d build",
     "clear": "rimraf build && babel index.js -d build",
     "start": "npm run comp && node build/index.js",
@@ -25,7 +27,6 @@
     "express": "^4.16.3",
     "express-jwt": "^5.3.1",
     "express-session": "^1.15.6",
-    "jsonwebtoken": "^8.3.0",
     "method-override": "^2.3.10",
     "methods": "^1.1.2",
     "mocha": "^5.2.0",
@@ -37,13 +38,15 @@
     "pg": "^7.7.1",
     "request": "^2.87.0",
     "sequelize": "^4.42.0",
+    "sequelize-auto-migrations": "^1.0.3",
     "slug": "^0.9.3",
     "swagger-ui-express": "^4.0.2",
     "underscore": "^1.9.1"
   },
   "devDependencies": {
     "@babel/cli": "^7.2.3",
     "@babel/core": "^7.2.2",
+    "@babel/node": "^7.2.2",
     "@babel/preset-env": "^7.2.3",
     "@babel/register": "^7.0.0",
     "chai": "^4.2.0",
@@ -55,7 +58,6 @@
     "nyc": "^13.1.0",
     "sequelize-cli": "^5.4.0",
     "nodemon": "^1.18.9",
-    "nyc": "^13.1.0",
     "rimraf": "^2.6.3",
     "yamljs": "^0.3.0"
   }

diff --git a/server/config/config.js b/server/config/config.js
@@ -11,6 +11,10 @@ module.exports = {
   },
   production: {
     url: process.env.DATABASE_URL,
-    dialect: 'postgres'
+    dialect: 'postgres',
+    ssl: true,
+    dialectOptions: {
+      ssl: true
+    }
   }
 };
diff --git a/server/migrations/20190109125019-create-user.js b/server/migrations/20190109125019-create-user.js
diff --git a/server/migrations/20190111125231-create-user.js b/server/migrations/20190111125231-create-user.js
@@ -0,0 +1,62 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Users', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    fullName: {
+      type: Sequelize.STRING,
+      allowNull: false,
+    },
+    userName: {
+      type: Sequelize.STRING,
+      allowNull: false,
+      unique: true
+    },
+    email: {
+      type: Sequelize.STRING,
+      allowNull: false,
+      unique: true
+    },
+    password: {
+      type: Sequelize.STRING,
+      allowNull: false
+    },
+    isVerified: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: false
+    },
+    bio: {
+      type: Sequelize.STRING
+    },
+    img: {
+      type: Sequelize.STRING
+    },
+    notifySettings: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: true
+    },
+    roleId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    authTypeId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Users')
+};
diff --git a/server/migrations/20190111125359-create-role.js b/server/migrations/20190111125359-create-role.js
@@ -0,0 +1,26 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Roles', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    type: {
+      type: Sequelize.STRING,
+      allowNull: false,
+      unique: true
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Roles')
+};
diff --git a/server/migrations/20190111125457-create-notificationType.js b/server/migrations/20190111125457-create-notificationType.js
@@ -0,0 +1,26 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('NotificationTypes', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    type: {
+      type: Sequelize.STRING,
+      allowNull: false,
+      unique: true
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('NotificationTypes')
+};
diff --git a/server/migrations/20190111125509-create-authType.js b/server/migrations/20190111125509-create-authType.js
@@ -0,0 +1,26 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('AuthTypes', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    type: {
+      type: Sequelize.STRING,
+      unique: true,
+      allowNull: false
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('AuthTypes')
+};
diff --git a/server/migrations/20190111130213-create-article.js b/server/migrations/20190111130213-create-article.js
@@ -0,0 +1,52 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Articles', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    slug: {
+      type: Sequelize.STRING,
+      allowNull: false,
+      unique: true
+    },
+    title: {
+      type: Sequelize.STRING,
+      allowNull: {
+        args: false,
+        msg: 'Please enter a title for your article'
+      },
+    },
+    content: {
+      type: Sequelize.STRING,
+      allowNull: false
+    },
+    banner: {
+      type: Sequelize.STRING,
+      allowNull: false
+    },
+    isPublished: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: false
+    },
+    isReported: {
+      type: Sequelize.BOOLEAN,
+      defaultValue: false
+    },
+    userId: {
+      type: Sequelize.INTEGER
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Articles')
+};
diff --git a/server/migrations/20190111130326-create-comment.js b/server/migrations/20190111130326-create-comment.js
@@ -0,0 +1,33 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Comments', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    content: {
+      type: Sequelize.TEXT,
+      allowNull: false
+    },
+    userId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    articleId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Comments')
+};
diff --git a/server/migrations/20190111130634-create-reply.js b/server/migrations/20190111130634-create-reply.js
@@ -0,0 +1,33 @@
+export default {
+  up: (queryInterface, Sequelize) => queryInterface.createTable('Replies', {
+    id: {
+      allowNull: false,
+      autoIncrement: true,
+      primaryKey: true,
+      type: Sequelize.INTEGER
+    },
+    userId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    articleId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    commentId: {
+      type: Sequelize.INTEGER,
+      allowNull: false
+    },
+    createdAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    },
+    updatedAt: {
+      allowNull: false,
+      type: Sequelize.DATE,
+      defaultValue: Sequelize.literal('CURRENT_TIMESTAMP')
+    }
+  }),
+  down: (queryInterface, Sequelize) => queryInterface.dropTable('Replies')
+};