Merge branch 'main' into feat/ALBA_56

Author: Jinacker

.github/workflows/deploy.yml

@@ -48,6 +48,7 @@ jobs:
           GOOGLE_CLIENT_SECRET=$GOOGLE_CLIENT_SECRET
           JWT_ACCESS_SECRET=$JWT_ACCESS_SECRET
           JWT_REFRESH_SECRET=$JWT_REFRESH_SECRET
+          KAKAO_REST_API_KEY=$KAKAO_REST_API_KEY
           END"
 
           ssh albalog "cat > /app/.mysql_env << END
@@ -61,6 +62,7 @@ jobs:
           GOOGLE_CLIENT_SECRET: ${{secrets.GOOGLE_CLIENT_SECRET}}
           JWT_ACCESS_SECRET: ${{secrets.JWT_ACCESS_SECRET}}
           JWT_REFRESH_SECRET: ${{secrets.JWT_REFRESH_SECRET}}
+          KAKAO_REST_API_KEY: ${{secrets.KAKAO_REST_API_KEY}}
 
       - name: Compose Docker
         run: |

package-lock.json

@@ -0,0 +1,15 @@
+-- CreateTable: user_preferred_region (user-region 다대다 관계)
+CREATE TABLE `user_preferred_region` (
+    `user_id` BINARY(16) NOT NULL,
+    `region_id` BINARY(16) NOT NULL,
+    `created_at` TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    INDEX `FK_region_TO_preferred_region`(`region_id`),
+    PRIMARY KEY (`user_id`, `region_id`)
+) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
+
+-- AddForeignKey
+ALTER TABLE `user_preferred_region` ADD CONSTRAINT `FK_user_TO_preferred_region` FOREIGN KEY (`user_id`) REFERENCES `user`(`user_id`) ON DELETE CASCADE ON UPDATE NO ACTION;
+
+-- AddForeignKey
+ALTER TABLE `user_preferred_region` ADD CONSTRAINT `FK_region_TO_preferred_region` FOREIGN KEY (`region_id`) REFERENCES `region`(`region_id`) ON DELETE CASCADE ON UPDATE NO ACTION;

prisma/migrations/20250129000000_add_user_preferred_region/migration.sql

@@ -195,7 +195,7 @@ model user_preferred_region {
   region_id  Int
   created_at DateTime @default(now()) @db.DateTime(0)
   region     region   @relation(fields: [region_id], references: [region_id], onDelete: Cascade, map: "user_preferred_region_region_region_id_fk")
-  user       user     @relation(fields: [user_id], references: [user_id], onDelete: Cascade, map: "user_preferred_region_user_user_id_fk")
+  user       user     @relation(fields: [user_id], references: [user_id], onDelete: Cascade, map: "FK_user_TO_preferred_region")
 
   @@id([region_id, user_id])
   @@index([region_id], map: "user_preferred_region_region_id_index")

prisma/schema.prisma

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

src/DTO/alba_application_dto.ts

@@ -20,3 +20,9 @@ export class InvalidTokenError extends CustomError {
     super('INVALID_TOKEN', 401, message, data);
   }
 }
+
+export class UserRegionError extends CustomError {
+  constructor(message: string = 'User Region Error', data: any = null) {
+    super('USER_REGION_ERROR', 400, message, data);
+  }
+}

src/DTO/error_dto.ts

@@ -0,0 +1,5 @@
+export interface RegionInterface {
+  region_id: number;
+  city: string;
+  district: string;
+}

src/DTO/region_dto.ts

@@ -0,0 +1,18 @@
+export interface SearchAlbaRequestDto{
+    //Todo:거리 기준 필터링 추가
+    workDate?:string,
+    storeCategory?:string,
+    storeName?:string,
+    workTime?:string,
+    hourlyRate?:number
+}
+export interface SearchAlbaResponseDto{
+    albaId:string,
+    storeId:string,
+    storeName:string,
+    startTime:Date,
+    endTime:Date,
+    dayOfWeek:string,
+    hourlyRate:number
+    //Todo: 위치 기반 거리 계산, 가게 카테고리 반영
+}

src/DTO/search_alba_dto.ts

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

src/DTO/store_review_dto.ts

@@ -1,10 +1,56 @@
+import { binToUuid } from '../util/uuid';
+
 export interface UserCreationParams {
-    email: string;
-    password: string;
-    user_name: string;
+  email: string;
+  password: string;
+  user_name: string;
 }
 
 export interface UserLoginParams {
-    email: string;
-    password: string;
+  email: string;
+  password: string;
+}
+
+export interface UserRegisterParams {
+  email: string;
+  nickname: string;
+  birthdate: Date;
+  gender: 'male' | 'female';
+}
+
+export interface DefaultUserInterface {
+  user_id: string;
+  user_name?: string;
+  user_birth?: Date;
+  gender?: 'male' | 'female';
+  profile_image?: string;
+  income_goal?: number;
+  email?: string;
+}
+
+export class ResponseFromUser implements DefaultUserInterface {
+  user_id: string;
+  user_name?: string;
+  user_birth?: Date;
+  gender?: 'male' | 'female';
+  profile_image?: string;
+  income_goal?: number;
+  email?: string;
+
+  constructor(userId: Uint8Array<ArrayBufferLike>, userInfo: Partial<DefaultUserInterface>) {
+    this.user_id = binToUuid(userId);
+    this.user_name = userInfo.user_name;
+    this.user_birth = userInfo.user_birth;
+    this.gender = userInfo.gender;
+    this.profile_image = userInfo.profile_image;
+    this.income_goal = userInfo.income_goal;
+    this.email = userInfo.email;
+  }
+}
+
+export class ResponseFromInitialRegion {
+  region_id: number[];
+  constructor(data: { user_id: Uint8Array<ArrayBufferLike>; region_id: number }[]) {
+    this.region_id = data.map((item) => item.region_id);
+  }
 }