Merge pull request #4 from ccaaffee/cafe

Cafe

Author: Kimcheolhui

prisma/migrations/20250205063806_modify_prefer_enum/migration.sql

@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to alter the column `status` on the `UserCafe` table. The data in that column could be lost. The data in that column will be cast from `Enum(EnumId(0))` to `Enum(EnumId(0))`.
+
+*/
+-- AlterTable
+ALTER TABLE `UserCafe` MODIFY `status` ENUM('LIKE', 'DISLIKE') NULL;

prisma/schema.prisma

@@ -39,13 +39,12 @@ model Cafe {
 enum PreferenceStatus {
   LIKE
   DISLIKE
-  HOLD
 }
 
 model UserCafe {
-  status    PreferenceStatus @default(HOLD)
-  createdAt DateTime         @default(now())
-  updatedAt DateTime         @updatedAt
+  status    PreferenceStatus?
+  createdAt DateTime          @default(now())
+  updatedAt DateTime          @updatedAt
 
   user     User   @relation(fields: [userUuid], references: [uuid], onDelete: Cascade)
   userUuid String

src/cafe/cafe.controller.ts

@@ -20,7 +20,7 @@ import { User } from '@prisma/client';
 import { CreateCafeDto } from './dto/req/createCafe.dto';
 import { UpdateCafeDto } from './dto/req/updateCafe.dto';
 import { GetNearCafeListDto } from './dto/req/getNearCafeList.dto';
-import { GeneralCafeDto } from './dto/res/generalCafe.dto';
+import { GeneralCafeResDto } from './dto/res/generalCafe.dto';
 import { SetCafePreferenceDto } from './dto/req/setCafePreference.dto';
 import {
   ApiBearerAuth,
@@ -30,6 +30,8 @@ import {
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
 import { PreferenceStatusDto } from './dto/res/preferenceStatus.dto';
+import { SwipeCafeListResDto } from './dto/res/switeCafeListRes.dto';
+import { GetSwipeCafeListDto } from './dto/req/getSwipeCafeList.dto';
 
 @Controller('cafe')
 export class CafeController {
@@ -39,7 +41,7 @@ export class CafeController {
     summary: 'get near cafe list',
   })
   @ApiOkResponse({
-    type: Array<GeneralCafeDto>,
+    type: Array<GeneralCafeResDto>,
     description: 'Near cafe list based on given gps',
   })
   @ApiInternalServerErrorResponse({
@@ -48,15 +50,15 @@ export class CafeController {
   @Get('near')
   async getNearCafeList(
     @Query() query: GetNearCafeListDto,
-  ): Promise<GeneralCafeDto[]> {
+  ): Promise<GeneralCafeResDto[]> {
     return await this.cafeService.getNearCafeList(query);
   }
 
   @ApiOperation({
     summary: 'get detailed cafe info',
   })
   @ApiOkResponse({
-    type: GeneralCafeDto,
+    type: GeneralCafeResDto,
     description: 'Detailed cafe information',
   })
   @ApiInternalServerErrorResponse({
@@ -72,7 +74,7 @@ export class CafeController {
     description: 'only available adminitrator or permitted person',
   })
   @ApiOkResponse({
-    type: GeneralCafeDto,
+    type: GeneralCafeResDto,
     description: 'Created cafe information',
   })
   @ApiUnauthorizedResponse({ description: 'Unauthorized' })
@@ -90,7 +92,7 @@ export class CafeController {
     summary: 'update cafe info',
   })
   @ApiOkResponse({
-    type: GeneralCafeDto,
+    type: GeneralCafeResDto,
     description: 'Updated cafe information with detail',
   })
   @ApiUnauthorizedResponse({ description: 'Unauthorized' })
@@ -174,4 +176,27 @@ export class CafeController {
   ): Promise<PreferenceStatusDto> {
     return await this.cafeService.getCafePreference(user.uuid, cafeId);
   }
+
+  @ApiOperation({
+    summary: 'get swiping near cafe list',
+    description:
+      '카페를 평가(스와이핑)하기 위해, 좌표를 기반으로 일정 거리 내에 있는 카페들을 반환합니다.',
+  })
+  @ApiOkResponse({
+    type: SwipeCafeListResDto,
+    description: 'Swiping target cafe list',
+  })
+  @ApiUnauthorizedResponse({ description: 'Unauthorized' })
+  @ApiInternalServerErrorResponse({
+    description: 'Internal Server Error',
+  })
+  @ApiBearerAuth('JWT')
+  @Get('swipe/search')
+  @UseGuards(JwtAuthGuard)
+  async getSwipeCafeList(
+    @GetUser() user: User,
+    @Query() query: GetSwipeCafeListDto,
+  ): Promise<SwipeCafeListResDto> {
+    return await this.cafeService.getSwipeCafeList(user, query);
+  }
 }

src/cafe/cafe.repository.ts

@@ -4,8 +4,9 @@ import { PrismaService } from 'src/prisma/prisma.service';
 import { CreateCafeDto } from './dto/req/createCafe.dto';
 import { UpdateCafeDto } from './dto/req/updateCafe.dto';
 import { GetNearCafeListDto } from './dto/req/getNearCafeList.dto';
-import { GeneralCafeDto } from './dto/res/generalCafe.dto';
 import { SetCafePreferenceDto } from './dto/req/setCafePreference.dto';
+import { GeneralCafeResDto } from './dto/res/generalCafe.dto';
+import { GetSwipeCafeListDto } from './dto/req/getSwipeCafeList.dto';
 
 @Injectable()
 export class CafeRepository {
@@ -43,10 +44,12 @@ export class CafeRepository {
   // TODO: SPATIAL INDEX 적용
   // TODO: 성능 안나온다 싶으면 MongoDB로 Migration도 고려
   // TODO: 물론, 관련 테스트는 무조건 할 것
-  async getNearCafeList(query: GetNearCafeListDto): Promise<GeneralCafeDto[]> {
+  async getNearCafeList(
+    query: GetNearCafeListDto,
+  ): Promise<GeneralCafeResDto[]> {
     console.time('getNearCafeList');
 
-    const result = await this.prismaService.$queryRaw<GeneralCafeDto[]>`
+    const result = await this.prismaService.$queryRaw<GeneralCafeResDto[]>`
       SELECT id, name, address, latitude, longitude, instagram, phone, createdAt 
       FROM Cafe
       WHERE ST_Distance_Sphere(
@@ -101,4 +104,49 @@ export class CafeRepository {
       },
     });
   }
+
+  async getSwipeCafeList(
+    userUuid: string,
+    query: GetSwipeCafeListDto,
+    page: number,
+    take = 20,
+  ): Promise<{ data: GeneralCafeResDto[]; hasNextPage: boolean }> {
+    const skip = (page - 1) * take;
+    const limit = take + 1; // +1 to check for the next page
+    const DISLIKE_EXPIRE_DAYS = 7;
+
+    const rawResult = await this.prismaService.$queryRaw<GeneralCafeResDto[]>`
+      SELECT c.id, c.name, c.address, c.latitude, c.longitude, c.instagram, c.phone, c.createdAt 
+      FROM Cafe as c
+      LEFT JOIN UserCafe as uc
+        ON c.id = uc.cafeId
+        AND uc.userUuid = ${userUuid}
+      WHERE ST_Distance_Sphere(
+        point(c.longitude, c.latitude),
+          point(${query.longitude}, ${query.latitude})
+        ) <= ${query.radiusInMeter}
+        AND (
+          uc.status IS NULL
+          OR
+          (
+            uc.status = 'DISLIKE' 
+            AND 
+            uc.updatedAt < DATE_SUB(NOW(), INTERVAL ${DISLIKE_EXPIRE_DAYS} DAY))
+        )
+      ORDER BY c.id
+      LIMIT ${limit} OFFSET ${skip}
+    `;
+
+    let hasNextPage = false;
+    if (rawResult.length > take) {
+      hasNextPage = true;
+      rawResult.pop(); // 마지막 1개는 실제 응답으로 내려주지 않음
+    }
+
+    return {
+      data: rawResult,
+
+      hasNextPage,
+    };
+  }
 }

src/cafe/cafe.service.ts

@@ -7,8 +7,11 @@ import { CafeRepository } from './cafe.repository';
 import { CreateCafeDto } from './dto/req/createCafe.dto';
 import { UpdateCafeDto } from './dto/req/updateCafe.dto';
 import { GetNearCafeListDto } from './dto/req/getNearCafeList.dto';
-import { GeneralCafeDto } from './dto/res/generalCafe.dto';
+import { GeneralCafeResDto } from './dto/res/generalCafe.dto';
 import { SetCafePreferenceDto } from './dto/req/setCafePreference.dto';
+import { User } from '@prisma/client';
+import { SwipeCafeListResDto } from './dto/res/switeCafeListRes.dto';
+import { GetSwipeCafeListDto } from './dto/req/getSwipeCafeList.dto';
 
 @Injectable()
 export class CafeService {
@@ -24,7 +27,9 @@ export class CafeService {
     return cafe;
   }
 
-  async getNearCafeList(query: GetNearCafeListDto): Promise<GeneralCafeDto[]> {
+  async getNearCafeList(
+    query: GetNearCafeListDto,
+  ): Promise<GeneralCafeResDto[]> {
     // 한국 내부 좌표인지 확인
     if (!this.isValidKoreanGPS(query.latitude, query.longitude)) {
       throw new BadRequestException(
@@ -97,4 +102,41 @@ export class CafeService {
 
     return preference;
   }
+
+  async getSwipeCafeList(
+    user: User,
+    query: GetSwipeCafeListDto,
+    page = 1,
+    take = 20,
+  ): Promise<SwipeCafeListResDto> {
+    if (!this.isValidKoreanGPS(query.latitude, query.longitude)) {
+      throw new BadRequestException(
+        'Wrong GPS coordinates (out of South Korea)',
+      );
+    }
+
+    const { data, hasNextPage } = await this.cafeRepository.getSwipeCafeList(
+      user.uuid,
+      query,
+      page,
+      take,
+    );
+
+    if (page < 1) {
+      throw new BadRequestException('Page must be greater than 0');
+    }
+
+    if (take < 1 || take > 20) {
+      throw new BadRequestException('Take must be between 1 and 20');
+    }
+
+    const result: SwipeCafeListResDto = {
+      data,
+      nextPage: page + 1,
+      cafeCount: data.length,
+      hasNextPage,
+    };
+
+    return result;
+  }
 }

src/cafe/dto/req/getNearCafeList.dto.ts

@@ -5,22 +5,22 @@ import { IsNotEmpty, IsNumber, Max, Min } from 'class-validator';
 export class GetNearCafeListDto {
   @ApiProperty({
     type: Number,
-    description: "Cafe's Latitude",
+    description: 'My Latitude',
     example: 37.485772,
   })
   @IsNumber()
   @IsNotEmpty()
-  // @Type(() => Number)
+  @Type(() => Number)
   latitude: number;
 
   @ApiProperty({
     type: Number,
-    description: "Cafe's Longitude",
+    description: 'My Longitude',
     example: 126.927983,
   })
   @IsNumber()
   @IsNotEmpty()
-  // @Type(() => Number)
+  @Type(() => Number)
   longitude: number;
 
   @ApiProperty({

src/cafe/dto/req/getSwipeCafeList.dto.ts

@@ -0,0 +1,26 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { GetNearCafeListDto } from './getNearCafeList.dto';
+import { IsNumber, IsOptional } from 'class-validator';
+import { Type } from 'class-transformer';
+
+export class GetSwipeCafeListDto extends GetNearCafeListDto {
+  @ApiProperty({
+    example: 1,
+    description: 'Request page number(default: 1)',
+    required: false,
+  })
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  page: number;
+
+  @ApiProperty({
+    example: 20,
+    description: 'Number of pages to get(default: 20)',
+    required: false,
+  })
+  @IsNumber()
+  @IsOptional()
+  @Type(() => Number)
+  take?: number = 20;
+}

src/cafe/dto/res/generalCafe.dto.ts

@@ -7,7 +7,7 @@ import {
   IsString,
 } from 'class-validator';
 
-export class GeneralCafeDto {
+export class GeneralCafeResDto {
   @ApiProperty({
     type: Number,
     description: 'ID of Cafe',

src/cafe/dto/res/switeCafeListRes.dto.ts

@@ -0,0 +1,16 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { GeneralCafeResDto } from './generalCafe.dto';
+
+export class SwipeCafeListResDto {
+  @ApiProperty({ type: [GeneralCafeResDto] })
+  data: GeneralCafeResDto[];
+
+  @ApiProperty()
+  nextPage: number;
+
+  @ApiProperty()
+  cafeCount: number;
+
+  @ApiProperty()
+  hasNextPage: boolean; // Indicates whether there is a next page
+}