Merge pull request #38 from ohtuprojekti-ilmo/variable-name-refactoring

changed all occurences of '<modelname>_id' to 'id'

controllers/memberships.js

@@ -10,7 +10,7 @@ function checkIfValidRole(role) {
 
 membershipRouter.post('/', checkLogin, (req, res) => {
   if (!req.body.student_number) return res.status(400).json({ error: 'student_number undefined' })
-  if (!req.body.group_id) return res.status(400).json({ error: 'group_id undefined' })
+  if (!req.body.id) return res.status(400).json({ error: 'id undefined' })
   if (!req.body.role) return res.status(400).json({ error: 'role undefined' })
   if (!checkIfValidRole(req.body.role)) return res.status(400).json({ error: 'invalid role' })
 
@@ -18,21 +18,21 @@ membershipRouter.post('/', checkLogin, (req, res) => {
     .then(user => {
       if (!user) return res.status(400).json({ error: 'user not found' })
 
-      db.Group.findById(req.body.group_id)
+      db.Group.findById(req.body.id)
         .then(group => {
           if (!group) return res.status(400).json({ error: 'group not found' })
 
           db.Membership.findOne({
             where: {
               student_number: req.body.student_number,
-              group_id: req.body.group_id
+              id: req.body.id
             }
           })
             .then(membership => {
               if (membership) return res.status(400).json({ error: 'user is already in that group' })
 
               db.Membership.create({
-                group_id: req.body.group_id,
+                id: req.body.id,
                 student_number: req.body.student_number,
                 role: req.body.role
               })

controllers/topics.js

@@ -77,7 +77,7 @@ topicsRouter.get('/:id', (req, res) => {
   } else {
     db.Topic.findOne({
       where: {
-        topic_id: id
+        id: id
       }
     })
       .then(topic => {

models/group.js

@@ -1,6 +1,6 @@
 module.exports = (sequelize, Sequelize) => {
   const Group = sequelize.define('group', {
-    group_id: {
+    id: {
       type: Sequelize.INTEGER,
       autoIncrement: true,
       primaryKey: true
@@ -12,7 +12,7 @@ module.exports = (sequelize, Sequelize) => {
 
   Group.associate = (models) => {
     Group.hasMany(models.Membership, {
-      foreignKey: 'group_id',
+      foreignKey: 'id',
       as: 'groups',
     })
   }

models/membership.js

@@ -1,6 +1,6 @@
 module.exports = (sequelize, Sequelize) => {
   const Membership = sequelize.define('membership', {
-    membership_id: {
+    id: {
       type: Sequelize.INTEGER,
       autoIncrement: true,
       primaryKey: true

models/review.js

@@ -1,6 +1,6 @@
 module.exports = (sequelize, Sequelize) => {
   const Review = sequelize.define('review', {
-    review_id: {
+    id: {
       type: Sequelize.INTEGER,
       primaryKey: true,
       autoIncrement: true
@@ -18,7 +18,7 @@ module.exports = (sequelize, Sequelize) => {
 
   Review.associate = (models) => {
     Review.hasMany(models.Review_answer, {
-      foreignKey: 'review_id',
+      foreignKey: 'id',
       as: 'review answers',
     })
   }

models/review_answer.js

@@ -1,6 +1,6 @@
 module.exports = (sequelize, Sequelize) => {
   const Review_answer = sequelize.define('review_answer', {
-    review_answer_id: {
+    id: {
       type: Sequelize.INTEGER,
       primaryKey: true,
       autoIncrement: true
@@ -12,7 +12,7 @@ module.exports = (sequelize, Sequelize) => {
 
   Review_answer.associate = (models) => {
     Review_answer.belongsTo(models.User, {
-      foreignKey: 'review_id',
+      foreignKey: 'id',
     })
   }
 

models/topic.js

@@ -1,6 +1,6 @@
 module.exports = (sequelize, Sequelize) => {
   const Topic = sequelize.define('topic', {
-    topic_id: {
+    id: {
       type: Sequelize.INTEGER,
       primaryKey: true,
       autoIncrement: true

models/user.js

@@ -29,7 +29,7 @@ module.exports = (sequelize, Sequelize) => {
       as: 'Memberships',
     })
     // User.hasOne(models.Review_answer, {
-    //   foreignKey: 'review_answer_id',
+    //   foreignKey: 'id',
     // })
   }