From c8d4669090dbe1185831ffdc97f659d0795d7ecc Mon Sep 17 00:00:00 2001
From: yummygyudon <bang2brew@gmail.com>
Date: Sun, 26 Nov 2023 07:10:49 +0900
Subject: [PATCH] =?UTF-8?q?HOT=20FIX=20:=20=ED=94=84=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EB=9E=A8=20=EC=83=81=EC=84=B8=EB=B7=B0=20=EB=B6=84=EA=B8=B0=20?=
 =?UTF-8?q?=EA=B8=B0=EC=A4=80=EA=B0=92=20DTO=20=EC=97=90=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../program/dto/response/ProgramDetailResponse.java  |  8 ++++++--
 .../program/dto/response/ProgramListResponse.java    |  3 ++-
 .../sopkerton/program/service/ProgramService.java    | 12 ++++++++----
 .../sopkerton/user/controller/UserController.java    |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java
index d4bdf3f..941ecb4 100644
--- a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java
+++ b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramDetailResponse.java
@@ -16,7 +16,9 @@ public record VolunteerDetail(
             @JsonProperty("hour")
             int hour,
             @JsonProperty("isApply")
-            boolean isApply
+            boolean isApply,
+            @JsonProperty("programType")
+            String type
     ) {
     }
 
@@ -32,7 +34,9 @@ public record EmploymentDetail(
             @JsonProperty("salary")
             int salary,
             @JsonProperty("isApply")
-            boolean isApply
+            boolean isApply,
+            @JsonProperty("programType")
+            String type
     ) {
     }
 }
diff --git a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java
index 1e43bdb..3d1e432 100644
--- a/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java
+++ b/src/main/java/org/sopt/sopkerton/program/dto/response/ProgramListResponse.java
@@ -10,7 +10,8 @@ public record ProgramListResponse(
         String registerAt,
         String imageUrl,
         String status,
-        String Region
+        String Region,
+        String type
 ) {
 
 }
diff --git a/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java b/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java
index dfbac68..cb437da 100644
--- a/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java
+++ b/src/main/java/org/sopt/sopkerton/program/service/ProgramService.java
@@ -36,7 +36,8 @@ public List<ProgramListResponse> getProgramListByProgramType(String programType)
                         formatToLocalDate(program.getRegisterAt()),
                         program.getImageUrl(),
                         program.getStatus().getValue(),
-                        program.getRegion()
+                        program.getRegion(),
+                        program.getType()
                 ))
                 .collect(Collectors.toList());
         return programListResponses;
@@ -52,7 +53,8 @@ public List<ProgramListResponse> getStatusDoneProgramList() {
                         formatToLocalDate(program.getRegisterAt()),
                         program.getImageUrl(),
                         program.getStatus().getValue(),
-                        program.getRegion()
+                        program.getRegion(),
+                        program.getType()
                 ))
                 .collect(Collectors.toList());
         return programListResponses;
@@ -70,7 +72,8 @@ public Object getProgramDetail(Long userId, Long programId) {
                     program.getOrganizationName(),
                     formatToLocalDate(program.getRegisterAt()),
                     program.getVolunteerHours(),
-                    isApply
+                    isApply,
+                    program.getType()
             );
         }
         if (program.getType().equals(EMPLOYMENT_TYPE)){
@@ -80,7 +83,8 @@ public Object getProgramDetail(Long userId, Long programId) {
                     program.getOrganizationName(),
                     formatToLocalDate(program.getRegisterAt()),
                     program.getSalary(),
-                    isApply
+                    isApply,
+                    program.getType()
             );
         }
         return null;
diff --git a/src/main/java/org/sopt/sopkerton/user/controller/UserController.java b/src/main/java/org/sopt/sopkerton/user/controller/UserController.java
index 799e846..1ce013f 100644
--- a/src/main/java/org/sopt/sopkerton/user/controller/UserController.java
+++ b/src/main/java/org/sopt/sopkerton/user/controller/UserController.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.sopt.sopkerton.common.response.ApiResponse;
-import org.sopt.sopkerton.user.domain.exception.UserSuccess;
+import org.sopt.sopkerton.user.domain.exception.user.UserSuccess;
 import org.sopt.sopkerton.user.dto.response.DetailView;
 import org.sopt.sopkerton.user.dto.response.MainView;
 import org.sopt.sopkerton.user.service.UserService;