refactor: create album users (#9315)

server/src/dtos/album.dto.ts

@@ -1,5 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { ArrayNotEmpty, IsEnum, IsString } from 'class-validator';
+import { Type } from 'class-transformer';
+import { ArrayNotEmpty, IsArray, IsEnum, IsString, ValidateNested } from 'class-validator';
 import _ from 'lodash';
 import { PropertyLifecycle } from 'src/decorators';
 import { AssetResponseDto, mapAsset } from 'src/dtos/asset-response.dto';
@@ -32,6 +33,14 @@ export class AddUsersDto {
   albumUsers!: AlbumUserAddDto[];
 }
 
+class AlbumUserCreateDto {
+  @ValidateUUID()
+  userId!: string;
+
+  @IsEnum(AlbumUserRole)
+  role!: AlbumUserRole;
+}
+
 export class CreateAlbumDto {
   @IsString()
   @ApiProperty()
@@ -41,7 +50,15 @@ export class CreateAlbumDto {
   @Optional()
   description?: string;
 
+  @Optional()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => AlbumUserCreateDto)
+  @PropertyLifecycle({ addedAt: 'v1.104.0' })
+  albumUsers?: AlbumUserCreateDto[];
+
   @ValidateUUID({ optional: true, each: true })
+  @PropertyLifecycle({ deprecatedAt: 'v1.104.0' })
   sharedWithUserIds?: string[];
 
   @ValidateUUID({ optional: true, each: true })

server/src/repositories/album.repository.ts

@@ -281,11 +281,11 @@ export class AlbumRepository implements IAlbumRepository {
       .execute();
   }
 
-  async create(album: Partial<AlbumEntity>): Promise<AlbumEntity> {
+  create(album: Partial<AlbumEntity>): Promise<AlbumEntity> {
     return this.save(album);
   }
 
-  async update(album: Partial<AlbumEntity>): Promise<AlbumEntity> {
+  update(album: Partial<AlbumEntity>): Promise<AlbumEntity> {
     return this.save(album);
   }
 

server/src/services/album.service.spec.ts

@@ -194,7 +194,7 @@ describe(AlbumService.name, () => {
         ownerId: authStub.admin.user.id,
         albumName: albumStub.empty.albumName,
         description: albumStub.empty.description,
-        albumUsers: [{ user: { id: 'user-id' } }],
+        albumUsers: [{ userId: 'user-id', role: AlbumUserRole.EDITOR }],
         assets: [{ id: '123' }],
         albumThumbnailAssetId: '123',
       });

server/src/services/album.service.ts

@@ -114,7 +114,12 @@ export class AlbumService {
   }
 
   async create(auth: AuthDto, dto: CreateAlbumDto): Promise<AlbumResponseDto> {
+    const albumUsers = dto.albumUsers || [];
     for (const userId of dto.sharedWithUserIds || []) {
+      albumUsers.push({ userId, role: AlbumUserRole.EDITOR });
+    }
+
+    for (const { userId } of albumUsers) {
       const exists = await this.userRepository.get(userId, {});
       if (!exists) {
         throw new BadRequestException('User not found');
@@ -128,7 +133,7 @@ export class AlbumService {
       ownerId: auth.user.id,
       albumName: dto.albumName,
       description: dto.description,
-      albumUsers: dto.sharedWithUserIds?.map((userId) => ({ user: { id: userId } }) as AlbumUserEntity) ?? [],
+      albumUsers: albumUsers.map((albumUser) => albumUser as AlbumUserEntity) ?? [],
       assets,
       albumThumbnailAssetId: assets[0]?.id || null,
     });