diff --git a/database/entity/LoginUserRoles.ts b/database/entity/LoginUserRoles.ts deleted file mode 100644 index 1efa81caf..000000000 --- a/database/entity/LoginUserRoles.ts +++ /dev/null @@ -1 +0,0 @@ -export { LoginUserRoles } from './0003-login_server_tables/LoginUserRoles' diff --git a/database/entity/index.ts b/database/entity/index.ts index 9d3b10ea7..8ecc447cc 100644 --- a/database/entity/index.ts +++ b/database/entity/index.ts @@ -2,7 +2,6 @@ import { Balance } from './Balance' import { LoginElopageBuys } from './LoginElopageBuys' import { LoginEmailOptIn } from './LoginEmailOptIn' import { LoginUser } from './LoginUser' -import { LoginUserRoles } from './LoginUserRoles' import { LoginUserBackup } from './LoginUserBackup' import { Migration } from './Migration' import { ServerUser } from './ServerUser' @@ -20,7 +19,6 @@ export const entities = [ LoginElopageBuys, LoginEmailOptIn, LoginUser, - LoginUserRoles, LoginUserBackup, Migration, ServerUser, diff --git a/database/src/factories/login-user-roles.factory.ts b/database/src/factories/login-user-roles.factory.ts deleted file mode 100644 index 5b7ba9c9d..000000000 --- a/database/src/factories/login-user-roles.factory.ts +++ /dev/null @@ -1,16 +0,0 @@ -import Faker from 'faker' -import { define } from 'typeorm-seeding' -import { LoginUserRoles } from '../../entity/LoginUserRoles' -import { LoginUserRolesContext } from '../interface/UserContext' - -define(LoginUserRoles, (faker: typeof Faker, context?: LoginUserRolesContext) => { - if (!context) context = {} - if (!context.userId) throw new Error('LoginUserRoles: No userId present!') - if (!context.roleId) throw new Error('LoginUserRoles: No roleId present!') - - const userRoles = new LoginUserRoles() - userRoles.userId = context.userId - userRoles.roleId = context.roleId - - return userRoles -}) diff --git a/database/src/seeds/helpers/user-helpers.ts b/database/src/seeds/helpers/user-helpers.ts index e1e33a94b..85a6cd88f 100644 --- a/database/src/seeds/helpers/user-helpers.ts +++ b/database/src/seeds/helpers/user-helpers.ts @@ -17,7 +17,6 @@ import { User } from '../../../entity/User' import { LoginUser } from '../../../entity/LoginUser' import { LoginUserBackup } from '../../../entity/LoginUserBackup' import { ServerUser } from '../../../entity/ServerUser' -import { LoginUserRoles } from '../../../entity/LoginUserRoles' import { Balance } from '../../../entity/Balance' import { Transaction } from '../../../entity/Transaction' import { TransactionSignature } from '../../../entity/TransactionSignature' @@ -33,10 +32,6 @@ export const userSeeder = async (factory: Factory, userData: UserInterface): Pro if (userData.isAdmin) { await factory(ServerUser)(createServerUserContext(userData)).create() - - // This is crazy: we just need the relation to roleId but no role at all - // It works with LoginRoles empty!! - await factory(LoginUserRoles)(createLoginUserRolesContext(loginUser)).create() } if (userData.addBalance) {