From 919556c7beea229378eca487f3c491c4a947e95b Mon Sep 17 00:00:00 2001 From: Takeshi Kimata <117462761+kimatata@users.noreply.github.com> Date: Sat, 26 Oct 2024 10:58:04 +0900 Subject: [PATCH] fix: seed user data column name (#87) --- .../migrations/20240930124156-rename_table.js | 6 +-- backend/models/users.js | 54 ++++++++++--------- backend/seeders/seed.js | 48 ++++++++--------- 3 files changed, 56 insertions(+), 52 deletions(-) diff --git a/backend/migrations/20240930124156-rename_table.js b/backend/migrations/20240930124156-rename_table.js index b94fc58..2ba10b5 100644 --- a/backend/migrations/20240930124156-rename_table.js +++ b/backend/migrations/20240930124156-rename_table.js @@ -2,7 +2,7 @@ /** @type {import('sequelize-cli').Migration} */ module.exports = { - async up (queryInterface, Sequelize) { + async up(queryInterface, Sequelize) { /** * Add altering commands here. * @@ -15,12 +15,12 @@ module.exports = { await queryInterface.renameColumn('users', 'avatarPath', 'avatar_path'); }, - async down (queryInterface, Sequelize) { + async down(queryInterface, Sequelize) { /** * Add reverting commands here. * * Example: * await queryInterface.dropTable('users'); */ - } + }, }; diff --git a/backend/models/users.js b/backend/models/users.js index 6db7707..8d37df8 100644 --- a/backend/models/users.js +++ b/backend/models/users.js @@ -1,32 +1,36 @@ /** - * - * @param {import('sequelize').Sequelize} sequelize - * @param {*} DataTypes - * @returns + * + * @param {import('sequelize').Sequelize} sequelize + * @param {*} DataTypes + * @returns */ function defineUser(sequelize, DataTypes) { - const User = sequelize.define('User', { - email: { - type: DataTypes.STRING, - allowNull: false, - unique: true, + const User = sequelize.define( + 'User', + { + email: { + type: DataTypes.STRING, + allowNull: false, + unique: true, + }, + password: { + type: DataTypes.STRING, + allowNull: false, + }, + username: { + type: DataTypes.STRING, + allowNull: false, + }, + role: { + type: DataTypes.INTEGER, + allowNull: false, + }, + avatarPath: { + type: DataTypes.STRING, + }, }, - password: { - type: DataTypes.STRING, - allowNull: false, - }, - username: { - type: DataTypes.STRING, - allowNull: false, - }, - role: { - type: DataTypes.INTEGER, - allowNull: false, - }, - avatarPath: { - type: DataTypes.STRING, - }, - }, { underscored: true }); + { underscored: true } + ); User.associate = (models) => { User.hasMany(models.Project, { foreignKey: 'userId' }); diff --git a/backend/seeders/seed.js b/backend/seeders/seed.js index ea6b217..6206161 100644 --- a/backend/seeders/seed.js +++ b/backend/seeders/seed.js @@ -13,72 +13,72 @@ module.exports = { password: hashedPassword, username: 'Admin', role: 0, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'samuel@example.com', password: hashedPassword, username: 'Samuel Golden', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'trey@example.com', password: hashedPassword, username: 'Trey Fisher', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'zoe@example.com', password: hashedPassword, username: 'Zoe Woodward', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'roger@example.com', password: hashedPassword, username: 'Roger Hess', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'jasmine@example.com', password: hashedPassword, username: 'Jasmine Moody', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'tatsuya@example.com', password: hashedPassword, username: 'Suzuki Tatsuya', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, { email: 'eri@example.com', password: hashedPassword, username: 'Sato Eri', role: 1, - avatarPath: null, - createdAt: new Date(), - updatedAt: new Date(), + avatar_path: null, + created_at: new Date(), + updated_at: new Date(), }, ]);