Merge pull request #68 from ChangSik88/feat/ALBA_60

[FEATURE] 리뷰 조회, 알바 검색 필터링 조건 추가

Author: codie0226

src/DTO/store_review_dto.ts

@@ -22,3 +22,7 @@ export interface StoreReviewResponseDto{
     createdAt:Date,
     updatedAt:Date
 }
+
+export interface StoreReviewDto {
+    reviews: StoreReviewResponseDto[]; 
+}

src/controller/search_alba_controller.ts

@@ -1,6 +1,8 @@
-import {Get,Route,SuccessResponse,Response, Tags, Controller, Queries} from 'tsoa'
+import {Get,Route,SuccessResponse,Response,Request,Security, Tags, Controller, Queries} from 'tsoa'
+import { Request as ExpressRequest } from 'express';
 import { SearchAlbaRequestDto,SearchAlbaResponseDto } from '../DTO/search_alba_dto';
 import { getFilteredAlba } from '../service/search_alba_service';
+import { uuidToBuffer } from '../util/uuid_util';
 
 
 /**
@@ -17,13 +19,19 @@ export class SearchAlbaController extends Controller{
      * @returns 조건에 맞는 알바 리스트
      */
     @Get('search')
+    @Security('jwt')
     @SuccessResponse('200','조회 성공')
     @Response('400','Bad Request')
     @Response('500','Internal Error')
     public async searchFilteredAlba(
+        @Request() req:ExpressRequest,
         @Queries() params:SearchAlbaRequestDto
     ): Promise<SearchAlbaResponseDto[]>{
-        const result = await getFilteredAlba(params)
+        //UUID 문자열 Buffer로 변환
+        const userId = (req.user as unknown as { id: string }).id;
+        const userBuffer=Buffer.from(uuidToBuffer(userId))
+
+        const result = await getFilteredAlba(params,userBuffer)
 
         return result
     }

src/controller/store_review_controller.ts

@@ -1,7 +1,7 @@
-import { Tags, Route,SuccessResponse,Response,Request, Post, Body, Controller, Security} from 'tsoa';
+import { Tags, Route,SuccessResponse,Response,Request,Path, Post, Body, Controller, Security, Get} from 'tsoa';
 import { Request as ExpressRequest } from 'express';
-import {StoreReviewRequestDto,StoreReviewResponseDto} from '../DTO/store_review_dto'
-import { addReview } from '../service/store_review_service';
+import {StoreReviewDto, StoreReviewRequestDto,StoreReviewResponseDto} from '../DTO/store_review_dto'
+import { addReview,getStoreReviewById } from '../service/store_review_service';
 import { uuidToBuffer } from '../util/uuid_util';
 
 /**
@@ -32,4 +32,23 @@ export class StoreReviewController extends Controller{
         this.setStatus(201);
         return result;
     }
+
+    /** 
+     * 근무지 평가 조회 API
+     * @param 쿼리 파라미터로 가게 Id
+     * @returns 리뷰 정보 + 가게,유저명 반환
+     */
+    @Get('/{storeId}')
+    @Security('jwt')
+    @SuccessResponse('200','조회 성공')
+    @Response('400','Bad Request')
+    @Response('500','Internal Server Error')
+    public async getStoreReview(
+        @Path() storeId: string,
+    ): Promise<StoreReviewDto>{
+
+        const result= await getStoreReviewById(storeId)
+        this.setStatus(201);
+        return result;
+    }
 }

src/repository/search_alba_repository.ts

@@ -3,17 +3,24 @@ import { SearchAlbaRequestDto, SearchAlbaResponseDto } from "../DTO/search_alba_
 import { bufferToUuid } from "../util/uuid_util";
 //id값으로 변경된 storeCategoryId 사용
 export interface SearchAlbaRepoParams extends SearchAlbaRequestDto{
-    storeCategoryId?:number
+    storeCategoryId?:number,
+    userBuffer?:Buffer
 }
 /**
  * 아르바이트 필터 명시 및 조회
  * @param data 
  * @returns 조건에 맞는 알바 리스트
  */
 export const findPostingByFilter = async(data:SearchAlbaRepoParams):Promise<SearchAlbaResponseDto[]>=>{
-    const {workDate,storeCategoryId,storeName,hourlyRate,} = data
+    const {workDate,storeCategoryId,storeName,hourlyRate,userBuffer} = data
     const result = await prisma.alba_posting.findMany({
         where:{
+            ...(userBuffer && {user_alba: {
+                    none: {
+                        user_id: new Uint8Array(userBuffer)
+                    }
+                }
+            }),
             ...(hourlyRate&&{hourly_rate:{gte:hourlyRate}}),
             store:{
                 ...(storeCategoryId&&{

src/repository/store_review_repository.ts

@@ -45,4 +45,14 @@ export const createStoreReview = async (userBuffer:Buffer,storeBuffer:Buffer,dat
     createdAt: result.created_at, //생성, 수정 시간 추가
     updatedAt: result.updated_at 
 }
-}
+}
+export const findReviewsByStoreId = async (storeId: Buffer) => {
+    return await prisma.store_review.findMany({
+        where: { store_id: new Uint8Array(storeId) },
+        include: {
+            user:true,
+            store:true
+        },
+        orderBy: { created_at: 'desc' } // 최신순 정렬
+    });
+};

src/service/search_alba_service.ts

@@ -7,7 +7,7 @@ import { formatDate,formatTime } from '../util/date_util';
  * @param params 
  * @returns 조건에 맞는 알바 리스트
  */
-export const getFilteredAlba = async (params:SearchAlbaRequestDto):Promise<SearchAlbaResponseDto[]>=>{
+export const getFilteredAlba = async (params:SearchAlbaRequestDto,userBuffer:Buffer):Promise<SearchAlbaResponseDto[]>=>{
     let storeCategoryId:number|undefined
     //문자로 받은 카테고리를 카테고리 id로 변환
     if(params.storeCategory){
@@ -20,7 +20,8 @@ export const getFilteredAlba = async (params:SearchAlbaRequestDto):Promise<Searc
 
     const posting = await findPostingByFilter({
         ...params,
-        storeCategoryId
+        storeCategoryId,
+        userBuffer
     })
     let result = posting
     //요청으로 들어온 시간과 공고 시간 비교

src/service/store_review_service.ts

@@ -1,5 +1,5 @@
-import { StoreReviewRequestDto, StoreReviewResponseDto } from "../DTO/store_review_dto";
-import { createStoreReview } from "../repository/store_review_repository";
+import { StoreReviewRequestDto, StoreReviewResponseDto,StoreReviewDto } from "../DTO/store_review_dto";
+import { createStoreReview,findReviewsByStoreId } from "../repository/store_review_repository";
 import { bufferToUuid, uuidToBuffer } from "../util/uuid_util";
 
 /**
@@ -18,4 +18,32 @@ export const addReview = async(userBuffer:Buffer,data:StoreReviewRequestDto):Pro
         storeId:bufferToUuid(sBuf),
         userId:bufferToUuid(uBuf)
     };
-}
+}
+    /**
+     * 특정 가게의 모든 리뷰를 조회하여 DTO 형태로 반환
+     */
+    export const getStoreReviewById= async(storeIdStr: string): Promise<StoreReviewDto>=>{
+        //UUID 문자열을 DB 조회를 위한 Buffer로 변환
+        const storeIdBuffer = Buffer.from(uuidToBuffer(storeIdStr));
+
+        // 레포지토리 호출
+        const reviews = await findReviewsByStoreId(storeIdBuffer);
+
+        return {
+            reviews: reviews.map(rev => ({
+            reviewId: bufferToUuid(rev.review_id),
+            userId: bufferToUuid(rev.user_id),
+            storeId: bufferToUuid(rev.store_id),
+            userName: rev.user.user_name,
+            storeName: rev.store.store_name,
+            totalScore: rev.total_score,
+            kindness: rev.kindness_rating,
+            communication: rev.communication_rating,
+            settlement: rev.settlement_rating,
+            rest: rev.break_time_rating,
+            review: rev.review, 
+            createdAt: rev.created_at,
+            updatedAt: rev.updated_at
+            }))
+        };
+    }