Merge pull request #72 from boostcampwm-2022/feat/recruit

feat: hCode 및 전체 목록 조회 API 수정사항 반영
boostcampwm-2022 · Nov 24, 2022 · 21d83f5 · 21d83f5
2 parents 6b75e35 + 0ce2df9
commit 21d83f5
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/server/src/common/type/raw-recruit-data.ts b/server/src/common/type/raw-recruit-data.ts
@@ -4,11 +4,13 @@ export interface RawRecruitData {
     course_img: string;
     course_path: string;
     course_pathLength: number;
-    course_hCode: string;
+    course_name: string;
     course_createdAt: Date;
     id: number;
     title: string;
     startTime: Date;
     maxPpl: number;
     currentPpl: string;
+    userId: number;
+    createdAt: Date;
 }
diff --git a/server/src/entities/recruit.entity.ts b/server/src/entities/recruit.entity.ts
@@ -30,7 +30,7 @@ export class Recruit {
     pace: number;
 
     @Column({ type: "varchar", length: 10 })
-    hCode: string;
+    name: string;
 
     @CreateDateColumn()
     createdAt: Date;
@@ -69,7 +69,7 @@ export class Recruit {
         recruit.startTime = startTime;
         recruit.maxPpl = maxPpl;
         recruit.pace = pace;
-        recruit.hCode = hCode;
+        recruit.name = hCode;
         recruit.userId = userId;
         recruit.courseId = courseId;
         return recruit;

diff --git a/server/src/recruit/recruit.repository.ts b/server/src/recruit/recruit.repository.ts
@@ -13,11 +13,14 @@ export class RecruitRepository extends Repository<Recruit> {
         return this.createQueryBuilder("recruit")
             .innerJoinAndSelect("recruit.course", "course")
             .leftJoinAndSelect("recruit.userRecruits", "user_recruit")
+            .innerJoinAndSelect("recruit.user", "user")
             .select([
                 "recruit.id AS id",
                 "recruit.title AS title",
                 "recruit.startTime AS startTime",
                 "recruit.maxPpl AS maxPpl",
+                "recruit.createdAt AS createdAt",
+                "user.userId AS userId",
                 "COUNT(user_recruit.id) AS currentPpl",
                 "course.id",
                 "course.title",

diff --git a/server/src/recruit/recruit.service.ts b/server/src/recruit/recruit.service.ts
@@ -21,12 +21,14 @@ export class RecruitService {
                 startTime,
                 maxPpl,
                 currentPpl,
+                createdAt,
+                userId,
                 course_id,
                 course_title,
                 course_img,
                 course_path,
                 course_pathLength,
-                course_hCode,
+                course_name,
                 course_createdAt,
             }) => {
                 return {
@@ -35,13 +37,17 @@ export class RecruitService {
                     startTime,
                     maxPpl,
                     currentPpl: parseInt(currentPpl),
+                    userId,
+                    createdAt,
                     course: {
                         id: course_id,
                         title: course_title,
                         img: course_img,
                         path: JSON.parse(course_path),
                         pathLength: course_pathLength,
-                        hCode: course_hCode,
+                        hDong: {
+                            course_name,
+                        },
                         createdAt: course_createdAt,
                     },
                 };