trying to fix public lobby

littlegubs · Aug 25, 2024 · bddd9df · bddd9df
1 parent 83b33ad
commit bddd9df
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/lobbies/entities/lobby-user.entity.ts b/src/lobbies/entities/lobby-user.entity.ts
@@ -3,6 +3,7 @@ import {
     Column,
     CreateDateColumn,
     Entity,
+    JoinColumn,
     ManyToOne,
     OneToOne,
     PrimaryGeneratedColumn,
@@ -84,6 +85,7 @@ export class LobbyUser {
 
     @OneToOne(() => User, (user) => user.currentLobby, { onDelete: 'CASCADE' })
     @Expose({ groups: ['wsLobby'] })
+    @JoinColumn()
     user: User
 
     @ManyToOne(() => Lobby, (lobby) => lobby.lobbyUsers, {

diff --git a/src/migration/1724582123266-userLobby.ts b/src/migration/1724582123266-userLobby.ts
@@ -0,0 +1,26 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UserLobby1724582123266 implements MigrationInterface {
+    name = 'UserLobby1724582123266'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`user\` DROP FOREIGN KEY \`FK_62aaa60b7d806a445ecd50870e2\``);
+        await queryRunner.query(`DROP INDEX \`REL_62aaa60b7d806a445ecd50870e\` ON \`user\``);
+        await queryRunner.query(`ALTER TABLE \`user\` DROP COLUMN \`currentLobbyId\``);
+        await queryRunner.query(`ALTER TABLE \`lobby_user\` ADD \`userId\` int NULL`);
+        await queryRunner.query(`ALTER TABLE \`lobby_user\` ADD UNIQUE INDEX \`IDX_8299cbcd62fd1a04f84617885b\` (\`userId\`)`);
+        await queryRunner.query(`CREATE UNIQUE INDEX \`REL_8299cbcd62fd1a04f84617885b\` ON \`lobby_user\` (\`userId\`)`);
+        await queryRunner.query(`ALTER TABLE \`lobby_user\` ADD CONSTRAINT \`FK_8299cbcd62fd1a04f84617885b7\` FOREIGN KEY (\`userId\`) REFERENCES \`user\`(\`id\`) ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`lobby_user\` DROP FOREIGN KEY \`FK_8299cbcd62fd1a04f84617885b7\``);
+        await queryRunner.query(`DROP INDEX \`REL_8299cbcd62fd1a04f84617885b\` ON \`lobby_user\``);
+        await queryRunner.query(`ALTER TABLE \`lobby_user\` DROP INDEX \`IDX_8299cbcd62fd1a04f84617885b\``);
+        await queryRunner.query(`ALTER TABLE \`lobby_user\` DROP COLUMN \`userId\``);
+        await queryRunner.query(`ALTER TABLE \`user\` ADD \`currentLobbyId\` int NULL`);
+        await queryRunner.query(`CREATE UNIQUE INDEX \`REL_62aaa60b7d806a445ecd50870e\` ON \`user\` (\`currentLobbyId\`)`);
+        await queryRunner.query(`ALTER TABLE \`user\` ADD CONSTRAINT \`FK_62aaa60b7d806a445ecd50870e2\` FOREIGN KEY (\`currentLobbyId\`) REFERENCES \`lobby_user\`(\`id\`) ON DELETE SET NULL ON UPDATE NO ACTION`);
+    }
+
+}
diff --git a/src/users/user.entity.ts b/src/users/user.entity.ts
@@ -68,7 +68,6 @@ export class User {
     games: Game[]
 
     @OneToOne(() => LobbyUser, (lobbyUser) => lobbyUser.user, { onDelete: 'SET NULL' })
-    @JoinColumn()
     currentLobby?: LobbyUser
 
     @Column()
@@ -79,7 +78,7 @@ export class User {
     @UpdateDateColumn()
     updatedAt: Date
 
-    @BeforeInsert() async hashPassword() {
+    @BeforeInsert() async hashPassword(): Promise<void> {
         this.password = await bcrypt.hash(this.password, 8)
     }