Merge branch 'main' of github.com:UMC-AlbaLog/Node.JS

Author: codie0226

src/DTO/alba_application_dto.ts

@@ -18,8 +18,7 @@ export interface AlbaDetailResponseDto{
 }
 
 export interface AlbaApplyRequestDto{
-    albaId:string,
-    userId:string
+    albaId:string
 }
 export interface AlbaApplyResponseDto{
     albaId:string,

src/DTO/store_review_dto.ts

@@ -1,5 +1,4 @@
 export interface StoreReviewRequestDto{
-    userId:string,
     storeId:string,
     kindness:number,
     communication:number,

src/controller/alba_application_controller.ts

@@ -1,6 +1,8 @@
-import { Tags, Route,SuccessResponse,Response, Get, Path, Controller, Post, Body} from 'tsoa';
+import { Tags, Route,SuccessResponse,Response, Get, Path, Controller, Post, Body, Security,Request} from 'tsoa';
+import { Request as ExpressRequest } from 'express';
 import { AlbaApplyRequestDto, AlbaApplyResponseDto, AlbaDetailResponseDto } from '../DTO/alba_application_dto';
 import { getAlbaDetail,postAlbaApplication } from '../service/alba_application_service';
+import { uuidToBuffer } from '../util/uuid_util';
 
 @Route('api/alba/application')
 @Tags('Alba Application')
@@ -9,10 +11,11 @@ export class AlbaApplicationController extends Controller{
      * 대타 아르바이트 정보 상세 조회 API
      * @params albaId
      */
+    @Get('{albaId}')
     @SuccessResponse('200','조회 성공')
     @Response('404','Not Found')
     @Response('500','Internal Server Error')
-    @Get('{albaId}')
+    
 
     public async fetchAlbaDetail(
         @Path() albaId:string
@@ -27,15 +30,26 @@ export class AlbaApplicationController extends Controller{
      * @param requestBody (albaId,userId)
      * @returns 지원 정보와 정산 상태, 승인 여부(초기에는 전부 waiting으로 설정)
      */
+    @Post('')
+    @Security('jwt')
     @SuccessResponse('201','생성 성공')
+    @Response('401','Unauthorized')
     @Response('404','Not Found')
     @Response('500','Internal Server Error')
-    @Post('')
+    
     public async applyAlba(
+        @Request() req:ExpressRequest,
         @Body() requestBody:AlbaApplyRequestDto
     ):Promise<AlbaApplyResponseDto>{
+        //UUID 문자열 Buffer로 변환
+        const userId = (req.user as unknown as { id: string }).id;
+        const userBuffer=Buffer.from(uuidToBuffer(userId))
+
+        const albaBuffer=Buffer.from(uuidToBuffer(requestBody.albaId))
+
+
         //대타 아르바이트 지원
-        const result = await postAlbaApplication(requestBody)
+        const result = await postAlbaApplication(userBuffer,albaBuffer)
         this.setStatus(201)
         return result
 

src/controller/alba_status_controller.ts

@@ -1,27 +1,32 @@
-import {Get, Tags, Route, Query,SuccessResponse,Response, Path} from 'tsoa';
+import {Get, Tags, Route, Query,SuccessResponse,Response, Request, Security} from 'tsoa';
+import { Request as ExpressRequest } from 'express';
 import { fetchAlbaStatus } from '../service/alba_status_service';
 import { AlbaStatusDTO } from '../DTO/alba_status_dto';
 import { TsoaSuccessResponse } from '../config/response_interface';
-@Route('api/alba_status')
+import { uuidToBuffer } from '../util/uuid_util';
+@Route('api/alba')
 @Tags('Alba Status')
 export class AlbaController{
     /** 
      * 아르바이트지원 현황 조회 API
      * @param type 전체(all), 진행중(active), 모집완료(closed)
      * @returns 지원 현황 리스트 응답
      */
-    @Get('{userId}')
+    @Get('/status')
+    @Security('jwt')
     @SuccessResponse('200','리스트 조회 성공')
-    @Response('404','User Not Found')
-    @Response('500','Interval Server Error')
+    @Response('401','Unauthorized')
+    @Response('500','Internal Server Error')
 
     public async getAlbaStatus(
-        @Path() userId:string,
+        @Request() req:ExpressRequest,
         @Query() type: 'all'|'active'|'closed'='all'
     ): Promise<TsoaSuccessResponse<AlbaStatusDTO[]>>
     {
         //UUID 문자열 Buffer로 변환
-        const userBuffer=Buffer.from(userId.replace(/-/g,''),'hex')
+        const userId = (req.user as unknown as { id: string }).id;
+        const userBuffer=Buffer.from(uuidToBuffer(userId))
+
         const result=await fetchAlbaStatus(userBuffer,type);
         return new TsoaSuccessResponse(result);
     }

src/controller/store_review_controller.ts

@@ -1,6 +1,8 @@
-import { Tags, Route,SuccessResponse,Response, Post, Body, Controller} from 'tsoa';
+import { Tags, Route,SuccessResponse,Response,Request, Post, Body, Controller, Security} from 'tsoa';
+import { Request as ExpressRequest } from 'express';
 import {StoreReviewRequestDto,StoreReviewResponseDto} from '../DTO/store_review_dto'
 import { addReview } from '../service/store_review_service';
+import { uuidToBuffer } from '../util/uuid_util';
 
 /**
  * 사용자가 평가하는 가게 리뷰 API
@@ -14,14 +16,19 @@ export class StoreReviewController extends Controller{
      * @returns 생성된 리뷰 정보 + 가게,유저명 반환
      */
     @Post()
+    @Security('jwt')
     @SuccessResponse('201','Created')
     @Response('400','Bad Request')
     @Response('500','Internal Server Error')
 
     public async createStoreReview(
+        @Request() req: ExpressRequest,
         @Body() requestBody:StoreReviewRequestDto
     ): Promise<StoreReviewResponseDto>{
-        const result = await addReview(requestBody);
+        const userId = (req.user as unknown as { id: string }).id;
+        const userBuffer=Buffer.from(uuidToBuffer(userId))
+        
+        const result = await addReview(userBuffer,requestBody);
         this.setStatus(201);
         return result;
     }

src/repository/alba_application_repository.ts

@@ -60,17 +60,14 @@ export const findAlbaDetail = async (albaId:string)=>{
 
 /**
  * 대타 아르바이트 지원 기능
- * @param data(albaId,userId)
+ * @param data(albaBuffer,userBuffer)
  */
-export const applyAlba= async(albaId:string,userId:string) =>{
-    //Id Buffer로 변환
-    const userBuffer=Buffer.from(userId.replace(/-/g,""),'hex');
-    const albaBuffer = Buffer.from(albaId.replace(/-/g,""),'hex');
+export const applyAlba= async(userBuffer:Buffer,albaBuffer:Buffer) =>{
 
     const result = await prisma.user_alba.create({
         data:{
-            user_id:userBuffer,
-            alba_id:albaBuffer,
+            user_id:new Uint8Array(userBuffer),
+            alba_id:new Uint8Array(albaBuffer),
             //승인이 아니므로 초기에는 waiting으로 설정
             process_status:'waiting',
             settlement_status:'waiting'

src/repository/store_review_repository.ts

@@ -6,18 +6,16 @@ import { StoreReviewRequestDto } from "../DTO/store_review_dto";
  * @param data
  * @returns 리뷰 상세 정보 및 연관 데이터
  */
-export const createStoreReview = async (data:StoreReviewRequestDto) =>{
-    const {userId,storeId,communication,settlement,rest,kindness,review} =data;
-    //UUID 문자열 Buffer로 변환
-    const userBuffer=Buffer.from(userId.replace(/-/g, ""), 'hex');
-    const storeBuffer=Buffer.from(storeId.replace(/-/g, ""), 'hex');
+export const createStoreReview = async (userBuffer:Buffer,storeBuffer:Buffer,data:StoreReviewRequestDto) =>{
+    const {communication,settlement,rest,kindness,review} =data;
+    
     //4가지 평가지표의 평균. 표현은 소수점 첫째자리까지
     const totalScore = Number(((communication+kindness+settlement+rest)/4).toFixed(1));
 
     const result = await prisma.store_review.create({
         data:{
-            user_id:userBuffer,
-            store_id:storeBuffer,
+            user_id:new Uint8Array(userBuffer),
+            store_id:new Uint8Array(storeBuffer),
             kindness_rating:kindness,
             settlement_rating:settlement,
             communication_rating:communication,
@@ -33,9 +31,9 @@ export const createStoreReview = async (data:StoreReviewRequestDto) =>{
     });
 
     return {
-    reviewId:Buffer.from(result.review_id).toString('hex'),
-    userId,
-    storeId,
+    reviewId:result.review_id,
+    userBuffer,
+    storeBuffer,
     userName:result.user.user_name,
     storeName:result.store.store_name,
     totalScore,

src/service/alba_application_service.ts

@@ -1,5 +1,6 @@
 import { findAlbaDetail,applyAlba} from "../repository/alba_application_repository";
-import { AlbaApplyRequestDto, AlbaApplyResponseDto, AlbaDetailResponseDto } from "../DTO/alba_application_dto";
+import { AlbaApplyResponseDto, AlbaDetailResponseDto } from "../DTO/alba_application_dto";
+import { bufferToUuid } from "../util/uuid_util";
 
 /**
  * 대타 아르바이트 정보 상세 조회 서비스
@@ -14,17 +15,18 @@ export const getAlbaDetail = async (albaId:string):Promise<AlbaDetailResponseDto
 
 /**
  * 대타 아르바이트 지원 서비스
- * @param albaId 
- * @param userId 
+ * @param albaBuffer 
+ * @param userBuffer
  * @returns 알바, 유저Id와 정산여부, 진행과정
  */
-export const postAlbaApplication = async(data:AlbaApplyRequestDto):Promise<AlbaApplyResponseDto>=>{
-    const {albaId,userId} = data
-    const result = await applyAlba(albaId,userId);
+export const postAlbaApplication = async(userBuffer:Buffer,albaBuffer:Buffer):Promise<AlbaApplyResponseDto>=>{
+    
+    const result = await applyAlba(userBuffer,albaBuffer);
+
 
     return {
-        albaId,
-        userId,
+        albaId:bufferToUuid(albaBuffer),
+        userId:bufferToUuid(userBuffer),
         processStatus:result.process_status,
         settlementStatus:result.settlement_status
     }

src/service/store_review_service.ts

@@ -1,12 +1,21 @@
 import { StoreReviewRequestDto, StoreReviewResponseDto } from "../DTO/store_review_dto";
 import { createStoreReview } from "../repository/store_review_repository";
+import { bufferToUuid, uuidToBuffer } from "../util/uuid_util";
 
 /**
  * 리뷰 생성 서비스 로직
  * @param data(리뷰 데이터)
  * @returns 생성된 리뷰 데이터와 생성시각, 합산된 총점
  */
-export const addReview = async(data:StoreReviewRequestDto):Promise<StoreReviewResponseDto>=>{
-    const review = await createStoreReview(data);
-    return review;
+export const addReview = async(userBuffer:Buffer,data:StoreReviewRequestDto):Promise<StoreReviewResponseDto>=>{
+    const storeBuffer = Buffer.from(uuidToBuffer(data.storeId))
+    
+    const review = await createStoreReview(userBuffer,storeBuffer,data);
+    const {reviewId, userBuffer: uBuf, storeBuffer: sBuf, ...rest} = review
+    return {
+        ...rest,
+        reviewId:bufferToUuid(reviewId),
+        storeId:bufferToUuid(sBuf),
+        userId:bufferToUuid(uBuf)
+    };
 }