kyle.belanger/whisky_collector
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update controllers and models

Browse source
This commit is contained in:
Kyle Belanger 2025-03-05 17:11:21 -05:00
parent ea382adda3
commit e0b06e3be8
10 changed files with 166 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/controllers/authController.js
View file

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

2
backend/src/controllers/collectionController.js
View file

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

2
backend/src/controllers/ratingController.js
View file

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

2
backend/src/controllers/whiskeyController.js
View file

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

45
backend/src/models/Collection.js
View file

@ -1,23 +1,26 @@
const { DataTypes } = require('sequelize'); const { DataTypes } = require('sequelize');
const { sequelize } = require('../config/db');
const Collection = sequelize.define('Collection', { module.exports = (sequelize) => {
id: { const Collection = sequelize.define('Collection', {
type: DataTypes.INTEGER, id: {
primaryKey: true, type: DataTypes.INTEGER,
autoIncrement: true primaryKey: true,
}, autoIncrement: true
purchaseDate: { },
type: DataTypes.DATE purchaseDate: {
}, type: DataTypes.DATE
purchasePrice: { },
type: DataTypes.FLOAT purchasePrice: {
}, type: DataTypes.FLOAT
notes: { },
type: DataTypes.TEXT notes: {
}, type: DataTypes.TEXT
bottleStatus: { },
type: DataTypes.ENUM('sealed', 'opened', 'empty'), bottleStatus: {
defaultValue: 'sealed' type: DataTypes.ENUM('sealed', 'opened', 'empty'),
} defaultValue: 'sealed'
}); }
});
return Collection;
};

81
backend/src/models/Rating.js
View file

@ -1,42 +1,45 @@
const { DataTypes } = require('sequelize'); const { DataTypes } = require('sequelize');
const { sequelize } = require('../config/db');
const Rating = sequelize.define('Rating', { module.exports = (sequelize) => {
id: { const Rating = sequelize.define('Rating', {
type: DataTypes.INTEGER, id: {
primaryKey: true, type: DataTypes.INTEGER,
autoIncrement: true primaryKey: true,
}, autoIncrement: true
score: { },
type: DataTypes.INTEGER, score: {
allowNull: false, type: DataTypes.INTEGER,
validate: { allowNull: false,
min: 0, validate: {
max: 100 min: 0,
max: 100
}
},
notes: {
type: DataTypes.TEXT
},
nose: {
type: DataTypes.INTEGER,
validate: {
min: 0,
max: 10
}
},
taste: {
type: DataTypes.INTEGER,
validate: {
min: 0,
max: 10
}
},
finish: {
type: DataTypes.INTEGER,
validate: {
min: 0,
max: 10
}
} }
}, });
notes: {
type: DataTypes.TEXT return Rating;
}, };
nose: {
type: DataTypes.INTEGER,
validate: {
min: 0,
max: 10
}
},
taste: {
type: DataTypes.INTEGER,
validate: {
min: 0,
max: 10
}
},
finish: {
type: DataTypes.INTEGER,
validate: {
min: 0,
max: 10
}
}
});

74
backend/src/models/User.js
View file

@ -1,39 +1,43 @@
const { DataTypes } = require('sequelize'); const { DataTypes } = require('sequelize');
const { sequelize } = require('../config/db');
const bcrypt = require('bcrypt');
const User = sequelize.define('User', { module.exports = (sequelize) => {
id: { const User = sequelize.define('User', {
type: DataTypes.INTEGER, id: {
primaryKey: true, type: DataTypes.INTEGER,
autoIncrement: true primaryKey: true,
}, autoIncrement: true
username: { },
type: DataTypes.STRING, username: {
allowNull: false, type: DataTypes.STRING,
unique: true allowNull: false,
}, unique: true
email: { },
type: DataTypes.STRING, email: {
allowNull: false, type: DataTypes.STRING,
unique: true, allowNull: false,
validate: { unique: true,
isEmail: true validate: {
isEmail: true
}
},
password: {
type: DataTypes.STRING,
allowNull: false
} }
}, });
password: {
type: DataTypes.STRING, // Add password hashing hook
allowNull: false User.beforeCreate(async (user) => {
} const bcrypt = require('bcrypt');
}, { const salt = await bcrypt.genSalt(10);
hooks: { user.password = await bcrypt.hash(user.password, salt);
beforeCreate: async (user) => { });
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);
};
User.prototype.validatePassword = async function(password) {
return await bcrypt.compare(password, this.password); return User;
}; };

47
backend/src/models/Whiskey.js Normal file
View file

@ -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;
};

44
backend/src/models/Whisky.js
View file

@ -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
}
});

18
backend/src/models/index.js
View file

@ -1,11 +1,14 @@
// src/models/index.js
const { sequelize } = require('../config/db'); const { sequelize } = require('../config/db');
const User = require('./User'); const { DataTypes } = require('sequelize');
const Whiskey = require('./Whiskey');
const Collection = require('./Collection');
const Rating = require('./Rating');
// 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); User.hasMany(Collection);
Collection.belongsTo(User); Collection.belongsTo(User);
@ -18,12 +21,11 @@ Rating.belongsTo(User);
Whiskey.hasMany(Rating); Whiskey.hasMany(Rating);
Rating.belongsTo(Whiskey); Rating.belongsTo(Whiskey);
// Exports // Export models
module.exports = { module.exports = {
User, User,
Whiskey, Whiskey,
Collection, Collection,
Rating, Rating,
sequelize sequelize
}; };