Merge pull request #109 from Sinchone/develop

v1.0.2
Sinchone · Jun 26, 2023 · 4124773 · 4124773
2 parents eea7c38 + 7c88626
commit 4124773
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/api-server/src/main/java/com/lastone/apiserver/controller/MyPageController.java b/api-server/src/main/java/com/lastone/apiserver/controller/MyPageController.java
@@ -26,7 +26,7 @@ public class MyPageController {
     private final MyPageService myPageService;
 
     @GetMapping("/nickname-check")
-    public ResponseEntity<Object> isDuplicatedNickname(String nickname) {
+    public ResponseEntity<Object> isDuplicatedNickname(@RequestParam String nickname) {
         NicknameCheckDto result = myPageService.isDuplicatedNickname(nickname);
         return ResponseEntity.ok().body(CommonResponse.success(result, SuccessCode.VALIDATE_NICKNAME.getMessage()));
     }

diff --git a/...erver/src/main/java/com/lastone/apiserver/service/recruitment/RecruitmentServiceImpl.java b/...erver/src/main/java/com/lastone/apiserver/service/recruitment/RecruitmentServiceImpl.java
@@ -65,7 +65,8 @@ public Slice<RecruitmentListDto> getList(RecruitmentSearchCondition searchCondit
 
     @Override
     public RecruitmentDetailDto getDetail(Long recruitmentId) {
-        RecruitmentDetailDto recruitmentDetailDto = recruitmentRepository.getDetailDto(recruitmentId).orElseThrow(RecruitmentNotFoundException::new);
+        Recruitment recruitment = recruitmentRepository.getDetail(recruitmentId).orElseThrow(RecruitmentNotFoundException::new);
+        RecruitmentDetailDto recruitmentDetailDto = RecruitmentDetailDto.toDto(recruitment);
         recruitmentDetailDto.setSbdDto(sbdRepository.findLatestRecordByMemberId(recruitmentDetailDto.getMemberId()));
         return recruitmentDetailDto;
     }

diff --git a/core/src/main/java/com/lastone/core/dto/recruitment/RecruitmentIdDto.java b/core/src/main/java/com/lastone/core/dto/recruitment/RecruitmentIdDto.java
@@ -1,5 +1,8 @@
 package com.lastone.core.dto.recruitment;
 
+import lombok.Getter;
+
+@Getter
 public class RecruitmentIdDto {
 
     private final Long id;

diff --git a/core/src/main/java/com/lastone/core/repository/recruitment/RecruitmentRepositoryCustom.java b/core/src/main/java/com/lastone/core/repository/recruitment/RecruitmentRepositoryCustom.java
@@ -1,7 +1,6 @@
 package com.lastone.core.repository.recruitment;
 
 import com.lastone.core.domain.recruitment.Recruitment;
-import com.lastone.core.dto.recruitment.RecruitmentDetailDto;
 import com.lastone.core.dto.recruitment.RecruitmentListDto;
 import com.lastone.core.dto.recruitment.RecruitmentSearchCondition;
 import org.springframework.data.domain.Slice;
@@ -12,7 +11,7 @@ public interface RecruitmentRepositoryCustom {
 
     Slice<RecruitmentListDto> getListDto(RecruitmentSearchCondition searchCondition);
 
-    Optional<RecruitmentDetailDto> getDetailDto(Long recruitmentId);
+    Optional<Recruitment> getDetail(Long recruitmentId);
 
     List<RecruitmentListDto> getListDtoInMainPage();
 

diff --git a/core/src/main/java/com/lastone/core/repository/recruitment/RecruitmentRepositoryImpl.java b/core/src/main/java/com/lastone/core/repository/recruitment/RecruitmentRepositoryImpl.java
@@ -35,7 +35,7 @@ public class RecruitmentRepositoryImpl implements RecruitmentRepositoryCustom{
     private static final int DEFAULT_MAIN_PAGE_SIZE = 9;
 
     @Override
-    public Optional<RecruitmentDetailDto> getDetailDto(Long recruitmentId) {
+    public Optional<Recruitment> getDetail(Long recruitmentId) {
 
         Recruitment findRecruitment = queryFactory
                 .selectFrom(recruitment)
@@ -48,7 +48,7 @@ public Optional<RecruitmentDetailDto> getDetailDto(Long recruitmentId) {
                 )
                 .fetchOne();
 
-        return Optional.of(RecruitmentDetailDto.toDto(findRecruitment));
+        return Optional.ofNullable(findRecruitment);
     }
 
     @Override