Merge pull request #375 from boostcampwm2023/BE-feature/spaces

테스트 블록화, 타입 수정
boostcampwm2023 · Dec 30, 2024 · c3e5a4c · c3e5a4c
2 parents 5bdf581 + aebc8c4
commit c3e5a4c
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 133 deletions.
diff --git a/nestjs-BE/server/src/auth/guards/is-profile-in-space.guard.ts b/nestjs-BE/server/src/auth/guards/is-profile-in-space.guard.ts
@@ -13,7 +13,10 @@ export class IsProfileInSpaceGuard implements CanActivate {
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
-    const profileUuid = request.body.profile_uuid || request.query.profile_uuid;
+    const profileUuid =
+      request.body.profile_uuid ||
+      request.query.profile_uuid ||
+      request.params.profile_uuid;
     const spaceUuid = request.params.space_uuid;
     if (!profileUuid || !spaceUuid) throw new BadRequestException();
     const isProfileInSpace = await this.profileSpaceService.isProfileInSpace(

diff --git a/nestjs-BE/server/src/auth/guards/match-user-profile.guard.ts b/nestjs-BE/server/src/auth/guards/match-user-profile.guard.ts
@@ -14,7 +14,10 @@ export class MatchUserProfileGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
     const userUuid = request.user.uuid;
-    const profileUuid = request.body.profile_uuid || request.query.profile_uuid;
+    const profileUuid =
+      request.body.profile_uuid ||
+      request.query.profile_uuid ||
+      request.params.profile_uuid;
     if (!profileUuid || !userUuid) throw new BadRequestException();
     const profile =
       await this.profilesService.findProfileByProfileUuid(profileUuid);

diff --git a/nestjs-BE/server/src/spaces/dto/create-space.dto.ts b/nestjs-BE/server/src/spaces/dto/create-space.dto.ts
@@ -24,6 +24,7 @@ export class CreateSpaceDto {
   @ApiProperty({
     example: 'space-icon.png',
     description: 'Profile icon for the space',
+    required: false,
   })
-  icon: string;
+  icon: Express.Multer.File;
 }
diff --git a/nestjs-BE/server/src/spaces/dto/update-space.dto.ts b/nestjs-BE/server/src/spaces/dto/update-space.dto.ts
@@ -26,11 +26,10 @@ export class UpdateSpaceDto {
   })
   name: string;
 
-  @IsOptional()
   @ApiProperty({
-    example: 'new image',
-    description: 'Updated space icon',
+    example: 'space-icon.png',
+    description: 'New space icon to change',
     required: false,
   })
-  icon: string;
+  icon: Express.Multer.File;
 }
diff --git a/nestjs-BE/server/src/spaces/spaces.service.ts b/nestjs-BE/server/src/spaces/spaces.service.ts
@@ -59,10 +59,8 @@ export class SpacesService {
     icon: Express.Multer.File,
     updateSpaceDto: UpdateSpaceDto,
   ): Promise<Space> {
-    const updateData: Partial<UpdateSpaceDto> = omit(updateSpaceDto, [
-      'icon',
-      'profileUuid',
-    ]);
+    const updateData: Partial<Pick<UpdateSpaceDto, 'name'> & { icon: string }> =
+      omit(updateSpaceDto, ['icon', 'profileUuid']);
     if (icon) {
       updateData.icon = await this.uploadService.uploadFile(icon);
     }