Skip to content

Commit

Permalink
Merge pull request #114 from Kusitms-28th-MeetUp-C/feature/101-mypage
Browse files Browse the repository at this point in the history
[fix]:Main #101 다른 사람 프로필 보기 api수정
  • Loading branch information
qogustj committed Nov 15, 2023
2 parents 1644b15 + df41672 commit 0f85cda
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ public ResponseEntity<SuccessResponse<?>> updateUser(@UserId Long userId, @Reque
final MyPageUserResponseDto myPageUserResponseDto = myPageService.updateUserInfo(userId,modifyUserProfileRequestDto);
return SuccessResponse.ok(myPageUserResponseDto);
}
@GetMapping("/another/roadmap")
public ResponseEntity<SuccessResponse<?>> getAnotherUserRoadmap(@RequestParam Long userId, @PageableDefault(size=12) Pageable pageable){
@GetMapping("/another/template")
public ResponseEntity<SuccessResponse<?>> getAnotherUserTemplate(@RequestParam Long userId, @PageableDefault(size=12) Pageable pageable){
final NotMyPageTemplateResponseDto notMyPageTemplateResponseDto = myPageService.getNotMyPageTemplateResponse(userId,pageable);
return SuccessResponse.ok(notMyPageTemplateResponseDto);

}
@GetMapping("/another/template")
public ResponseEntity<SuccessResponse<?>> getAnotherUserTemplate(@RequestParam Long userId, @PageableDefault(size=12) Pageable pageable){
final NotMyPageRoadmapResponseDto notMyPageRoadmapResponseDto = myPageService.getNotMyPageRoadmapRespons(userId, pageable);
@GetMapping("/another/roadmap")
public ResponseEntity<SuccessResponse<?>> getAnotherUserRoadmap(@RequestParam Long userId, @PageableDefault(size=12) Pageable pageable){
final NotMyPageRoadmapResponseDto notMyPageRoadmapResponseDto = myPageService.getNotMyPageRoadmapResponse(userId, pageable);
return SuccessResponse.ok(notMyPageRoadmapResponseDto);

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public NotMyPageTemplateResponseDto getNotMyPageTemplateResponse(Long userId, Pa
Page<SearchBaseTemplateResponseDto> searchBaseTemplateResponseDtoList = templateService.getTemplatesWithPaging(templatePage);
return NotMyPageTemplateResponseDto.of(detailUserResponseDto, searchBaseTemplateResponseDtoList);
}
public NotMyPageRoadmapResponseDto getNotMyPageRoadmapRespons(Long userId, Pageable pageable){
public NotMyPageRoadmapResponseDto getNotMyPageRoadmapResponse(Long userId, Pageable pageable){
User user = getUserByUserId(userId);
Page<Roadmap> roadmapPage = getRoadmapByUserId(userId,pageable);
DetailUserResponseDto detailUserResponseDto = createDetailUserResponseDto(user);
Expand Down

0 comments on commit 0f85cda

Please sign in to comment.