diff --git a/server/src/entities/album-permission.entity.ts b/server/src/entities/album-permission.entity.ts index 48451b9c75..3e6687ef16 100644 --- a/server/src/entities/album-permission.entity.ts +++ b/server/src/entities/album-permission.entity.ts @@ -1,8 +1,10 @@ import { AlbumEntity } from 'src/entities/album.entity'; import { UserEntity } from 'src/entities/user.entity'; -import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm'; +import { Column, Entity, Index, ManyToOne, PrimaryColumn } from 'typeorm'; @Entity('albums_shared_users_users') +@Index('IDX_427c350ad49bd3935a50baab73', ['albums']) +@Index('IDX_f48513bf9bccefd6ff3ad30bd0', ['users']) export class AlbumPermissionsEntity { @PrimaryColumn({ type: 'uuid', name: 'albumsId', foreignKeyConstraintName: 'FK_f48513bf9bccefd6ff3ad30bd06' }) @ManyToOne(() => AlbumEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false }) diff --git a/server/src/entities/album.entity.ts b/server/src/entities/album.entity.ts index d1d8799532..5be72f0771 100644 --- a/server/src/entities/album.entity.ts +++ b/server/src/entities/album.entity.ts @@ -57,14 +57,15 @@ export class AlbumEntity { name: 'albums_shared_users_users', inverseJoinColumn: { name: 'usersId', - referencedColumnName: 'id', - foreignKeyConstraintName: 'FK_f48513bf9bccefd6ff3ad30bd06', + // referencedColumnName: 'id', + // foreignKeyConstraintName: 'FK_f48513bf9bccefd6ff3ad30bd06', }, joinColumn: { name: 'albumsId', - referencedColumnName: 'id', - foreignKeyConstraintName: 'FK_427c350ad49bd3935a50baab737', + // referencedColumnName: 'id', + // foreignKeyConstraintName: 'FK_427c350ad49bd3935a50baab737', }, + synchronize: false, }) sharedUsers!: UserEntity[]; diff --git a/server/src/migrations/1712848324419-AddAlbumPermissions.ts b/server/src/migrations/1712848324419-AddAlbumPermissions.ts deleted file mode 100644 index 7518e3e74b..0000000000 --- a/server/src/migrations/1712848324419-AddAlbumPermissions.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddAlbumPermissions1712848324419 implements MigrationInterface { - name = 'AddAlbumPermissions1712848324419' - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP INDEX "public"."IDX_427c350ad49bd3935a50baab73"`); - await queryRunner.query(`DROP INDEX "public"."IDX_f48513bf9bccefd6ff3ad30bd0"`); - await queryRunner.query(`ALTER TABLE "albums_shared_users_users" ADD "readonly" boolean NOT NULL DEFAULT true`); - await queryRunner.query(`CREATE INDEX "IDX_427c350ad49bd3935a50baab73" ON "albums_shared_users_users" ("albumsId") `); - await queryRunner.query(`CREATE INDEX "IDX_f48513bf9bccefd6ff3ad30bd0" ON "albums_shared_users_users" ("usersId") `); - } - - public async down(queryRunner: QueryRunner): Promise { - await queryRunner.query(`DROP INDEX "public"."IDX_f48513bf9bccefd6ff3ad30bd0"`); - await queryRunner.query(`DROP INDEX "public"."IDX_427c350ad49bd3935a50baab73"`); - await queryRunner.query(`ALTER TABLE "albums_shared_users_users" DROP COLUMN "readonly"`); - await queryRunner.query(`CREATE INDEX "IDX_f48513bf9bccefd6ff3ad30bd0" ON "albums_shared_users_users" ("usersId") `); - await queryRunner.query(`CREATE INDEX "IDX_427c350ad49bd3935a50baab73" ON "albums_shared_users_users" ("albumsId") `); - } - -} diff --git a/server/src/migrations/1712904446100-AddAlbumPermissions.ts b/server/src/migrations/1712904446100-AddAlbumPermissions.ts new file mode 100644 index 0000000000..50393e37b7 --- /dev/null +++ b/server/src/migrations/1712904446100-AddAlbumPermissions.ts @@ -0,0 +1,14 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class AddAlbumPermissions1712904446100 implements MigrationInterface { + name = 'AddAlbumPermissions1712904446100' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "albums_shared_users_users" ADD "readonly" boolean NOT NULL DEFAULT true`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE "albums_shared_users_users" DROP COLUMN "readonly"`); + } + +}