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

프로필 검사 추가

Author: Conut-1

nestjs-BE/server/src/auth/auth.service.ts

@@ -61,7 +61,7 @@ export class AuthService {
           'Refresh token expired. Please log in again.',
         );
       }
-      const accessToken = await this.createAccessToken(token.user_id);
+      const accessToken = await this.createAccessToken(token.userUuid);
       return accessToken;
     } catch (error) {
       throw new UnauthorizedException(

nestjs-BE/server/src/profile-space/profile-space.controller.ts

@@ -96,7 +96,7 @@ export class ProfileSpaceController {
         profile.uuid,
       );
     const spaceUuids = profileSpaces.map(
-      (profileSpace) => profileSpace.space_uuid,
+      (profileSpace) => profileSpace.spaceUuid,
     );
     const spaces = await this.spacesService.findSpaces(spaceUuids);
     return { statusCode: 200, message: 'Success', data: spaces };
@@ -118,7 +118,7 @@ export class ProfileSpaceController {
     const profileSpaces =
       await this.profileSpaceService.findProfileSpacesBySpaceUuid(space.uuid);
     const profileUuids = profileSpaces.map(
-      (profileSpace) => profileSpace.profile_uuid,
+      (profileSpace) => profileSpace.profileUuid,
     );
     const profiles = await this.profilesService.findProfiles(profileUuids);
     return { statusCode: 200, message: 'Success', data: profiles };

nestjs-BE/server/src/profile-space/profile-space.service.ts

@@ -1,34 +1,43 @@
 import { Injectable } from '@nestjs/common';
 import { PrismaService } from '../prisma/prisma.service';
-import { Prisma, Profile_space } from '@prisma/client';
+import { Prisma, ProfileSpace } from '@prisma/client';
 
 @Injectable()
 export class ProfileSpaceService {
   constructor(private readonly prisma: PrismaService) {}
 
   async findProfileSpacesByProfileUuid(
     profileUuid: string,
-  ): Promise<Profile_space[]> {
-    return this.prisma.profile_space.findMany({
-      where: { profile_uuid: profileUuid },
+  ): Promise<ProfileSpace[]> {
+    return this.prisma.profileSpace.findMany({
+      where: { profileUuid: profileUuid },
     });
   }
 
   async findProfileSpacesBySpaceUuid(
     spaceUuid: string,
-  ): Promise<Profile_space[]> {
-    return this.prisma.profile_space.findMany({
-      where: { space_uuid: spaceUuid },
+  ): Promise<ProfileSpace[]> {
+    return this.prisma.profileSpace.findMany({
+      where: { spaceUuid: spaceUuid },
+    });
+  }
+
+  async findProfileSpaceByBothUuid(
+    profileUuid: string,
+    spaceUuid: string,
+  ): Promise<ProfileSpace | null> {
+    return this.prisma.profileSpace.findUnique({
+      where: { spaceUuid_profileUuid: { spaceUuid, profileUuid } },
     });
   }
 
   async joinSpace(
     profileUuid: string,
     spaceUuid: string,
-  ): Promise<Profile_space | null> {
+  ): Promise<ProfileSpace | null> {
     try {
-      return await this.prisma.profile_space.create({
-        data: { space_uuid: spaceUuid, profile_uuid: profileUuid },
+      return await this.prisma.profileSpace.create({
+        data: { spaceUuid: spaceUuid, profileUuid: profileUuid },
       });
     } catch (err) {
       if (err instanceof Prisma.PrismaClientKnownRequestError) {
@@ -42,13 +51,13 @@ export class ProfileSpaceService {
   async leaveSpace(
     profileUuid: string,
     spaceUuid: string,
-  ): Promise<Profile_space | null> {
+  ): Promise<ProfileSpace | null> {
     try {
-      return await this.prisma.profile_space.delete({
+      return await this.prisma.profileSpace.delete({
         where: {
-          space_uuid_profile_uuid: {
-            space_uuid: spaceUuid,
-            profile_uuid: profileUuid,
+          spaceUuid_profileUuid: {
+            spaceUuid: spaceUuid,
+            profileUuid: profileUuid,
           },
         },
       });
@@ -62,9 +71,9 @@ export class ProfileSpaceService {
   }
 
   async isSpaceEmpty(spaceUuid: string) {
-    const first = await this.prisma.profile_space.findFirst({
+    const first = await this.prisma.profileSpace.findFirst({
       where: {
-        space_uuid: spaceUuid,
+        spaceUuid: spaceUuid,
       },
     });
     return first ? false : true;

nestjs-BE/server/src/profiles/profiles.service.ts

@@ -10,7 +10,11 @@ export class ProfilesService {
   constructor(private prisma: PrismaService) {}
 
   async findProfile(userUuid: string): Promise<Profile | null> {
-    return this.prisma.profile.findUnique({ where: { userId: userUuid } });
+    return this.prisma.profile.findUnique({ where: { userUuid } });
+  }
+
+  async findProfileByProfileUuid(uuid: string): Promise<Profile | null> {
+    return this.prisma.profile.findUnique({ where: { uuid } });
   }
 
   async findProfiles(profileUuids: string[]): Promise<Profile[]> {
@@ -21,11 +25,11 @@ export class ProfilesService {
 
   async getOrCreateProfile(data: CreateProfileDto): Promise<Profile> {
     return this.prisma.profile.upsert({
-      where: { userId: data.user_id },
+      where: { userUuid: data.user_id },
       update: {},
       create: {
         uuid: generateUuid(),
-        userId: data.user_id,
+        userUuid: data.user_id,
         image: data.image,
         nickname: data.nickname,
       },
@@ -38,7 +42,7 @@ export class ProfilesService {
   ): Promise<Profile | null> {
     try {
       return await this.prisma.profile.update({
-        where: { userId: userUuid },
+        where: { userUuid },
         data: { ...updateProfileDto },
       });
     } catch (err) {

nestjs-BE/server/src/spaces/dto/create-space.dto.ts

@@ -1,8 +1,30 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsNotEmpty, IsString, MaxLength } from 'class-validator';
 import { MAX_NAME_LENGTH } from '../../config/magic-number';
+import { Expose } from 'class-transformer';
+import { v4 as uuid } from 'uuid';
 
-export class CreateSpaceDto {
+export class CreateSpaceRequestV2Dto {
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(MAX_NAME_LENGTH)
+  @ApiProperty({ example: 'Sample Space', description: 'Name of the space' })
+  name: string;
+
+  @IsString()
+  @IsNotEmpty()
+  @Expose({ name: 'profile_uuid' })
+  @ApiProperty({ example: uuid(), description: 'Profile uuid' })
+  profileUuid: string;
+
+  @ApiProperty({
+    example: 'space-icon.png',
+    description: 'Profile icon for the space',
+  })
+  icon: string;
+}
+
+export class CreateSpaceRequestDto {
   @IsString()
   @IsNotEmpty()
   @MaxLength(MAX_NAME_LENGTH)
@@ -15,3 +37,8 @@ export class CreateSpaceDto {
   })
   icon: string;
 }
+
+export class CreateSpacePrismaDto {
+  name: string;
+  icon: string;
+}

nestjs-BE/server/src/spaces/dto/update-space.dto.ts

@@ -1,8 +1,9 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IsNotEmpty, IsString, MaxLength } from 'class-validator';
+import { IsNotEmpty, IsOptional, IsString, MaxLength } from 'class-validator';
 import { MAX_NAME_LENGTH } from '../../config/magic-number';
 
-export class UpdateSpaceDto {
+export class UpdateSpaceRequestV2Dto {
+  @IsOptional()
   @IsString()
   @IsNotEmpty()
   @MaxLength(MAX_NAME_LENGTH)
@@ -13,10 +14,35 @@ export class UpdateSpaceDto {
   })
   name: string;
 
+  @IsOptional()
   @ApiProperty({
     example: 'new image',
     description: 'Updated space icon',
     required: false,
   })
   icon: string;
 }
+
+export class UpdateSpaceRequestDto {
+  @IsString()
+  @IsNotEmpty()
+  @MaxLength(MAX_NAME_LENGTH)
+  @ApiProperty({
+    example: 'new space',
+    description: 'Updated space name',
+    required: false,
+  })
+  name: string;
+
+  @ApiProperty({
+    example: 'new image',
+    description: 'Updated space icon',
+    required: false,
+  })
+  icon: string;
+}
+
+export class UpdateSpacePrismaDto {
+  name: string;
+  icon: string;
+}