update controllers and models

backend/src/controllers/authController.js

@@ -1,5 +1,5 @@
 const jwt = require('jsonwebtoken');
-const { User } = require('../models/User');
+const { User } = require('../models');
 const { Op } = require('sequelize');
 
 exports.register = async (req, res) => {

backend/src/controllers/collectionController.js

@@ -1,4 +1,4 @@
-const { Collection, Whiskey } = require('../models/Whiskey');
+const { Collection, Whiskey } = require('../models');
 
 // Get user's collection
 exports.getUserCollection = async (req, res) => {

backend/src/controllers/ratingController.js

@@ -1,4 +1,4 @@
-const { Rating, Whiskey, User } = require('../models/Whiskey');
+const { Rating, Whiskey, User } = require('../models');
 
 // Get all ratings for a whiskey
 exports.getWhiskeyRatings = async (req, res) => {

backend/src/controllers/whiskeyController.js

@@ -1,4 +1,4 @@
-const { Whiskey } = require('../models/Whiskey');
+const { Whiskey } = require('../models');
 const { Op } = require('sequelize');
 
 // Get all whiskies

backend/src/models/Collection.js

@@ -1,6 +1,6 @@
 const { DataTypes } = require('sequelize');
-const { sequelize } = require('../config/db');
 
+module.exports = (sequelize) => {
   const Collection = sequelize.define('Collection', {
     id: {
       type: DataTypes.INTEGER,
@@ -21,3 +21,6 @@ const Collection = sequelize.define('Collection', {
       defaultValue: 'sealed'
     }
   });
+  
+  return Collection;
+};

backend/src/models/Rating.js

@@ -1,6 +1,6 @@
 const { DataTypes } = require('sequelize');
-const { sequelize } = require('../config/db');
 
+module.exports = (sequelize) => {
   const Rating = sequelize.define('Rating', {
     id: {
       type: DataTypes.INTEGER,
@@ -40,3 +40,6 @@ const Rating = sequelize.define('Rating', {
       }
     }
   });
+  
+  return Rating;
+};

backend/src/models/User.js

@@ -1,7 +1,6 @@
 const { DataTypes } = require('sequelize');
-const { sequelize } = require('../config/db');
-const bcrypt = require('bcrypt');
 
+module.exports = (sequelize) => {
   const User = sequelize.define('User', {
     id: {
       type: DataTypes.INTEGER,
@@ -25,15 +24,20 @@ const User = sequelize.define('User', {
       type: DataTypes.STRING,
       allowNull: false
     }
-}, {
-  hooks: {
-    beforeCreate: async (user) => {
-      const salt = await bcrypt.genSalt(10);
-      user.password = await bcrypt.hash(user.password, salt);
-    }
-  }
   });
   
+  // Add password hashing hook
+  User.beforeCreate(async (user) => {
+    const bcrypt = require('bcrypt');
+    const salt = await bcrypt.genSalt(10);
+    user.password = await bcrypt.hash(user.password, salt);
+  });
+  
+  // Add password validation method
   User.prototype.validatePassword = async function(password) {
+    const bcrypt = require('bcrypt');
     return await bcrypt.compare(password, this.password);
   };
+  
+  return User;
+};

backend/src/models/Whiskey.js

@@ -0,0 +1,47 @@
+const { DataTypes } = require('sequelize');
+
+module.exports = (sequelize) => {
+  const Whiskey = sequelize.define('Whiskey', {
+    id: {
+      type: DataTypes.INTEGER,
+      primaryKey: true,
+      autoIncrement: true
+    },
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false
+    },
+    distillery: {
+      type: DataTypes.STRING,
+      allowNull: false
+    },
+    type: {
+      type: DataTypes.STRING,
+      allowNull: false
+    },
+    country: {
+      type: DataTypes.STRING,
+      allowNull: false
+    },
+    region: {
+      type: DataTypes.STRING
+    },
+    age: {
+      type: DataTypes.INTEGER
+    },
+    abv: {
+      type: DataTypes.FLOAT
+    },
+    price: {
+      type: DataTypes.FLOAT
+    },
+    description: {
+      type: DataTypes.TEXT
+    },
+    imageUrl: {
+      type: DataTypes.STRING
+    }
+  });
+  
+  return Whiskey;
+};

backend/src/models/Whisky.js

@@ -1,44 +0,0 @@
-const { DataTypes } = require('sequelize');
-const { sequelize } = require('../config/db');
-
-const Whiskey = sequelize.define('Whiskey', {
-  id: {
-    type: DataTypes.INTEGER,
-    primaryKey: true,
-    autoIncrement: true
-  },
-  name: {
-    type: DataTypes.STRING,
-    allowNull: false
-  },
-  distillery: {
-    type: DataTypes.STRING,
-    allowNull: false
-  },
-  type: {
-    type: DataTypes.STRING,
-    allowNull: false
-  },
-  country: {
-    type: DataTypes.STRING,
-    allowNull: false
-  },
-  region: {
-    type: DataTypes.STRING
-  },
-  age: {
-    type: DataTypes.INTEGER
-  },
-  abv: {
-    type: DataTypes.FLOAT
-  },
-  price: {
-    type: DataTypes.FLOAT
-  },
-  description: {
-    type: DataTypes.TEXT
-  },
-  imageUrl: {
-    type: DataTypes.STRING
-  }
-});

backend/src/models/index.js

@@ -1,11 +1,14 @@
+// src/models/index.js
 const { sequelize } = require('../config/db');
-const User = require('./User');
-const Whiskey = require('./Whiskey');
-const Collection = require('./Collection');
-const Rating = require('./Rating');
+const { DataTypes } = require('sequelize');
 
-// Define relationships
+// Initialize models
+const User = require('./User')(sequelize);
+const Whiskey = require('./Whiskey')(sequelize);
+const Collection = require('./Collection')(sequelize);
+const Rating = require('./Rating')(sequelize);
 
+// Define associations
 User.hasMany(Collection);
 Collection.belongsTo(User);
 
@@ -18,8 +21,7 @@ Rating.belongsTo(User);
 Whiskey.hasMany(Rating);
 Rating.belongsTo(Whiskey);
 
-// Exports
-
+// Export models
 module.exports = {
   User,
   Whiskey,