From eca0126f45b43f417811dc096aa47eb99430a698 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20K=C3=BChl?= Date: Sun, 25 May 2025 19:48:49 +0200 Subject: [PATCH] fixed determination of user roles in seeder.helper.js --- backend/helper/seeder.helper.js | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/backend/helper/seeder.helper.js b/backend/helper/seeder.helper.js index 867aa28..0b7182f 100644 --- a/backend/helper/seeder.helper.js +++ b/backend/helper/seeder.helper.js @@ -1,6 +1,6 @@ const bcrypt = require("bcryptjs"); -export const createUsers = async (queryInterface, roles, users) => { +const createUsers = async (queryInterface, roles, users) => { // Create Authentications await queryInterface.bulkInsert('Authentications', users.map((player) => { return { @@ -26,22 +26,22 @@ export const createUsers = async (queryInterface, roles, users) => { }; })); - const createdUsers = await queryInterface.select(null, 'Users'); - const userRoles = createdUsers.flatMap(user => user.roles.map(role => ({ - id: user.id, - role: role - }))); - const rolesByName = roles.reduce((map, role) => { map[role.name] = role; return map; - }) + }, {}); + + const createdUsers = await queryInterface.select(null, 'Users'); + const userRoles = users.flatMap(user => user.roles.map(role => ({ + id: createdUsers.find(user => user.firstName === user.firstName && user.lastName === user.lastName).id, + role: rolesByName[role] + }))); // Create UserRoles await queryInterface.bulkInsert('UserRoles', userRoles.map(userRole => { return { userId: userRole.id, - roleId: rolesByName[userRole.role].id, + roleId: userRole.role.id, createdAt: new Date(), updatedAt: new Date() }; @@ -50,9 +50,11 @@ export const createUsers = async (queryInterface, roles, users) => { return createdUsers; } -export const createPlayer = async (queryInterface, roles, players) => { - - const users = await createUsers(queryInterface, roles, players); +const createPlayer = async (queryInterface, roles, players) => { + const users = await createUsers(queryInterface, roles, players.map(player => ({ + ...player, + roles: player.roles || ['player'] + }))); // Create Players await queryInterface.bulkInsert('Players', players.map(player => { @@ -64,6 +66,7 @@ export const createPlayer = async (queryInterface, roles, players) => { bats: player.bats, throws: player.throws, state: player.state, + jerseyNumber: player.jerseyNumber, userId: user ? user.id : null, createdAt: new Date(), updatedAt: new Date() @@ -72,3 +75,8 @@ export const createPlayer = async (queryInterface, roles, players) => { } + +module.exports = { + createPlayer, + createUsers +}