diff --git a/src/main/java/com/onnoff/onnoff/domain/user/converter/UserConverter.java b/src/main/java/com/onnoff/onnoff/domain/user/converter/UserConverter.java index d08d49f..fb19c71 100644 --- a/src/main/java/com/onnoff/onnoff/domain/user/converter/UserConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/user/converter/UserConverter.java @@ -70,14 +70,15 @@ public static UserResponseDTO.UserDetailDTO toUserDetailDTO(User user){ public static UserResponseDTO.UserInformationResponseDTO toUserInformationResponseDTO(User user){ return UserResponseDTO.UserInformationResponseDTO.builder() .nickname(user.getNickname()) - .experienceYear(user.getExperienceYear()) - .fieldOfWork(user.getFieldOfWork()) + .experienceYear(user.getExperienceYear().getMypageValue()) + .fieldOfWork(user.getFieldOfWork().getValue()) + .job(user.getJob()) .build(); } public static UserResponseDTO.UserModificationResponseDTO toUserModificationResponseDTO(User user){ return UserResponseDTO.UserModificationResponseDTO.builder() .nickname(user.getNickname()) - .experienceYear(user.getExperienceYear().getValue()) + .experienceYear(user.getExperienceYear().getMypageValue()) .fieldOfWork(user.getFieldOfWork().getValue()) .job(user.getJob()) .build(); diff --git a/src/main/java/com/onnoff/onnoff/domain/user/dto/EnumInquiryResponseDTO.java b/src/main/java/com/onnoff/onnoff/domain/user/dto/EnumInquiryResponseDTO.java index 362cd11..170ef07 100644 --- a/src/main/java/com/onnoff/onnoff/domain/user/dto/EnumInquiryResponseDTO.java +++ b/src/main/java/com/onnoff/onnoff/domain/user/dto/EnumInquiryResponseDTO.java @@ -19,7 +19,7 @@ public static List getAllField() { public static class ExperienceYearResponseDTO{ public static List getAllExperience() { return Arrays.stream(ExperienceYear.values()) - .map(ExperienceYear::getValue) + .map(ExperienceYear::getSignupValue) .collect(Collectors.toList()); } } diff --git a/src/main/java/com/onnoff/onnoff/domain/user/dto/UserResponseDTO.java b/src/main/java/com/onnoff/onnoff/domain/user/dto/UserResponseDTO.java index 603de89..9e283de 100644 --- a/src/main/java/com/onnoff/onnoff/domain/user/dto/UserResponseDTO.java +++ b/src/main/java/com/onnoff/onnoff/domain/user/dto/UserResponseDTO.java @@ -49,8 +49,9 @@ public static class UserDetailDTO{ @AllArgsConstructor public static class UserInformationResponseDTO { private String nickname; - private FieldOfWork fieldOfWork; - private ExperienceYear experienceYear; + private String fieldOfWork; + private String experienceYear; + private String job; } @Builder @Getter diff --git a/src/main/java/com/onnoff/onnoff/domain/user/enums/ExperienceYear.java b/src/main/java/com/onnoff/onnoff/domain/user/enums/ExperienceYear.java index a887f67..df757cb 100644 --- a/src/main/java/com/onnoff/onnoff/domain/user/enums/ExperienceYear.java +++ b/src/main/java/com/onnoff/onnoff/domain/user/enums/ExperienceYear.java @@ -10,18 +10,19 @@ @Getter public enum ExperienceYear { - THE_NEW("신입"), - THE_FIRST_YEAR("1년 이상 2년 미만"), - THE_SECOND_YEAR("2년 이상 3년 미만"), - THE_THIRD_YEAR("3년 이상 4년 미만"), - THE_FOURTH_YEAR("4년 이상 5년 미만"), - THE_FIFTH_YEAR_OR_MORE("5년 이상"), - THE_SENIOR("시니어"); - private final String value; + THE_NEW("신입", "신입"), + THE_FIRST_YEAR("1년 이상 2년 미만", "1년차"), + THE_SECOND_YEAR("2년 이상 3년 미만", "2년차"), + THE_THIRD_YEAR("3년 이상 4년 미만", "3년차"), + THE_FOURTH_YEAR("4년 이상 5년 미만", "4년차"), + THE_FIFTH_YEAR_OR_MORE("5년 이상", "5년차"), + THE_SENIOR("시니어", "시니어"); + private final String signupValue; + private final String mypageValue; public static ExperienceYear fromValue(String value) { for (ExperienceYear experienceYear : ExperienceYear.values()) { - if (experienceYear.getValue().equals(value)) { + if (experienceYear.getSignupValue().equals(value)) { return experienceYear; } }