From cecb99b4b6edadcb3e4e841df4a83318f580db04 Mon Sep 17 00:00:00 2001
From: mgabor <>
Date: Wed, 17 Apr 2024 10:39:57 +0200
Subject: [PATCH] clean up userId and albumId

---
 server/src/entities/album-user.entity.ts         |  8 ++++----
 server/src/repositories/album-user.repository.ts | 11 +++++------
 server/src/services/album.service.ts             |  4 +---
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/server/src/entities/album-user.entity.ts b/server/src/entities/album-user.entity.ts
index 7dcd08727a..084617dd41 100644
--- a/server/src/entities/album-user.entity.ts
+++ b/server/src/entities/album-user.entity.ts
@@ -12,11 +12,11 @@ export enum AlbumUserRole {
 @Index('IDX_427c350ad49bd3935a50baab73', ['album'])
 @Index('IDX_f48513bf9bccefd6ff3ad30bd0', ['user'])
 export class AlbumUserEntity {
-  @PrimaryColumn({ type: 'uuid' })
-  albumsId!: string;
+  @PrimaryColumn({ type: 'uuid', name: 'albumsId' })
+  albumId!: string;
 
-  @PrimaryColumn({ type: 'uuid' })
-  usersId!: string;
+  @PrimaryColumn({ type: 'uuid', name: 'usersId' })
+  userId!: string;
 
   @JoinColumn({ name: 'albumsId' })
   @ManyToOne(() => AlbumEntity, { onDelete: 'CASCADE', onUpdate: 'CASCADE', nullable: false })
diff --git a/server/src/repositories/album-user.repository.ts b/server/src/repositories/album-user.repository.ts
index 90398b4ce0..45a0a61356 100644
--- a/server/src/repositories/album-user.repository.ts
+++ b/server/src/repositories/album-user.repository.ts
@@ -11,19 +11,18 @@ export class AlbumUserRepository implements IAlbumUserRepository {
   constructor(@InjectRepository(AlbumUserEntity) private repository: Repository<AlbumUserEntity>) {}
 
   async create(dto: Partial<AlbumUserEntity>): Promise<AlbumUserEntity> {
-    const { user, album } = await this.repository.save(dto);
-    return this.repository.findOneOrFail({ where: { user, album }, relations: { user: true } });
+    const { userId, albumId } = await this.repository.save(dto);
+    return this.repository.findOneOrFail({ where: { userId, albumId } });
   }
 
   async update({ userId, albumId }: AlbumPermissionId, dto: Partial<AlbumUserEntity>): Promise<AlbumUserEntity> {
-    await this.repository.update({ user: { id: userId }, album: { id: albumId } }, dto);
+    await this.repository.update({ userId, albumId }, dto);
     return this.repository.findOneOrFail({
-      where: { user: { id: userId }, album: { id: albumId } },
-      relations: { user: true },
+      where: { userId, albumId },
     });
   }
 
   async delete({ userId, albumId }: AlbumPermissionId): Promise<void> {
-    await this.repository.delete({ user: { id: userId }, album: { id: albumId } });
+    await this.repository.delete({ userId, albumId });
   }
 }
diff --git a/server/src/services/album.service.ts b/server/src/services/album.service.ts
index 3561553fef..5cc20b24d0 100644
--- a/server/src/services/album.service.ts
+++ b/server/src/services/album.service.ts
@@ -231,9 +231,7 @@ export class AlbumService {
         throw new BadRequestException('User not found');
       }
 
-      album.sharedUsers.push(
-        await this.albumUserRepository.create({ user: { id: userId }, album: { id } } as AlbumUserEntity),
-      );
+      album.sharedUsers.push(await this.albumUserRepository.create({ userId: userId, albumId: id }));
     }
 
     return mapAlbumWithoutAssets(album);