Sequelize model relationship fixes

server/sequelize/associations/BookReference.js

@@ -4,7 +4,9 @@ module.exports = models => {
     Review,
   } = models;
 
-  BookReference.hasMany(Review);
+  BookReference.hasMany(Review, {
+    foreignKey: 'bookReferenceId',
+  });
 
   return BookReference;
 }

server/sequelize/associations/Review.js

@@ -4,7 +4,7 @@ module.exports = models => {
     User,
     PermissionLevel,
     BookReference,
-    Reactions,
+    Reaction,
   } = models;
 
   Review.belongsTo(User, {
@@ -22,7 +22,7 @@ module.exports = models => {
     onDelete: 'SET NULL',
   });
 
-  Review.hasMany(Reactions.scope('Review'), {
+  Review.hasMany(Reaction.scope('Review'), {
     foreignKey: 'targetId',
     constraints: false,
     as: 'Reactions',

server/sequelize/associations/Shelf.js

@@ -21,7 +21,9 @@ module.exports = models => {
     onDelete: 'CASCADE',
   });
 
-  Shelf.hasMany(ShelfItem);
+  Shelf.hasMany(ShelfItem, {
+    foreignKey: 'shelfId',
+  });
 
   return Shelf;
 }

server/sequelize/associations/ShelfItem.js

@@ -16,7 +16,9 @@ module.exports = models => {
     onDelete: 'CASCADE',
   });
 
-  ShelfItem.hasMany(Status);
+  ShelfItem.hasMany(Status, {
+    foreignKey: 'shelfItemId',
+  });
 
   return ShelfItem;
 }

server/sequelize/associations/Status.js

@@ -1,9 +1,10 @@
 module.exports = models => {
   const {
     Status,
+    PermissionLevel,
     User,
     ShelfItem,
-    Reactions,
+    Reaction,
   } = models;
 
   Status.belongsTo(User, {
@@ -21,7 +22,7 @@ module.exports = models => {
     onDelete: 'SET NULL',
   });
 
-  Status.hasMany(Reactions.scope('Status'), {
+  Status.hasMany(Reaction.scope('Status'), {
     foreignKey: 'targetId',
     constraints: false,
     as: 'Reactions',

server/sequelize/associations/User.js

@@ -13,19 +13,27 @@ module.exports = models => {
     foreignKey: 'permissionLevel',
     onDelete: 'SET NULL',
   });
-  User.hasMany(Shelf);
+  User.hasMany(Shelf, {
-  User.hasMany(Status);
+    foreignKey: 'userId',
-  User.hasMany(Review);
+  });
+  User.hasMany(Status, {
+    foreignKey: 'userId',
+  });
+  User.hasMany(Review, {
+    foreignKey: 'userId',
+  });
   User.hasMany(Recommendation, {
     foreignKey: 'toUser',
   });
-  User.hasMany(Follow, {
+  User.belongsToMany(User, {
-    foreignKey: 'follower',
+    through: Follow,
-    as: 'Followers',
-  });
-  User.belongsTo(Follow.scope('internal'), {
     foreignKey: 'following',
-    as: 'Follows',
+    as: 'following',
+  });
+  User.belongsToMany(User, {
+    through: Follow,
+    foreignKey: 'follower',
+    as: 'follower',
   });
 
   return User;

server/sequelize/associations/index.js

@@ -5,7 +5,7 @@ module.exports = models => {
   const associatedModels = {};
   
   Object.keys(models).forEach(modelName => {
-    const associationFileName = path.resolve(__dirname, modelName, '.js');
+    const associationFileName = path.resolve(__dirname, modelName + '.js');
     if (fs.existsSync(associationFileName)) {
       associatedModels[modelName] = require(associationFileName)(models);
     } else {

server/sequelize/models/Follow.js

@@ -49,18 +49,22 @@ module.exports = sequelize => sequelize.define('Follow', {
 }, {
   indexes: [
     {
-      fields: ['follower'],
+      fields: ['follower', 'domain'],
     },
     {
       fields: ['following', 'domain'],
     },
   ],
   scopes: {
-    internal: {
+    internalFollowers: {
       where: {
         followerDomain: {
           [Sequelize.Op.is]: null,
         },
+      },
+    },
+    internalFollowing: {
+      where: {
         followingDomain: {
           [Sequelize.Op.is]: null,
         },

server/sequelize/models/Shelf.js

@@ -23,7 +23,7 @@ module.exports = sequelize => sequelize.define('Shelf', {
     },
   },
   permissionLevel: {
-    type: Sequelize.BOOLEAN,
+    type: Sequelize.NUMBER,
     allowNull: false,
     references: {
       model: sequelize.models.PermissionLevel,

server/sequelize/models/index.js

@@ -11,6 +11,7 @@ module.exports = sequelize => {
     'Review',
     'Recommendation',
     'Reaction',
+    'Follow',
   ];
 
   const models = {};