Skip to content

#77 Refactor: 로그인 토큰으로 변경해서 적용 #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MinYeongPark merged 3 commits into from
Feb 6, 2024
Merged

#77 Refactor: 로그인 토큰으로 변경해서 적용 #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de120f4
#77 Feat : 로그인 토큰으로 변경 적용
ls-rain Feb 5, 2024
8a880b9
#77 Refactor: RequestHeader atk 추가
MinYeongPark Feb 6, 2024
cd3cbd6
#77 Refactor: RequestHeader atk 추가
MinYeongPark Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/java/friend/spring/web/controller/AlarmRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import friend.spring.converter.AlarmConverter;
import friend.spring.domain.Alarm;
import friend.spring.service.AlarmService;
import friend.spring.service.JwtTokenService;
import friend.spring.web.dto.AlarmResponseDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -15,12 +16,15 @@
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;

@RestController
@RequiredArgsConstructor
@RequestMapping("/user")
public class AlarmRestController {

private final AlarmService alarmService;
private final JwtTokenService jwtTokenService;
//알림 조회
@GetMapping("/alarm")
@Operation(summary = "사용자 알림 조회 API",description = "사용자의 알림 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요")
Expand All @@ -33,8 +37,10 @@ public class AlarmRestController {
@Parameter(name = "page", description = "query string(RequestParam) - 몇번째 페이지인지 가리키는 page 변수 (0부터 시작)")
})
private ApiResponse<AlarmResponseDTO.AlarmListResDTO> getAlarm(
@RequestHeader(name = "id") Long userId,
@RequestHeader(name = "atk") String atk,
HttpServletRequest request,
Copy link
Member

@MinYeongPark MinYeongPark Feb 6, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

앗 swagger에서 RequestHeader에 atk 가 떠야 해서, HttpServletRequest request, 위쪽 줄에
@RequestHeader(name = "atk") String atk,
도 같이 추가해주시면 좋을 것 같아요!

@RequestParam(name = "page") Integer page){
Long userId=jwtTokenService.JwtToId(request);
Page<Alarm> alarmList = alarmService.getAlarmList(userId, page);
return ApiResponse.onSuccess(AlarmConverter.toAlarmListResDTO(alarmList));
}
Expand Down
37 changes: 28 additions & 9 deletions src/main/java/friend/spring/web/controller/UserRestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@
import friend.spring.domain.Post;
import friend.spring.domain.User;
import friend.spring.repository.UserRepository;
import friend.spring.service.CommentService;
import friend.spring.service.EmailService;
import friend.spring.service.PostService;
import friend.spring.service.UserService;
import friend.spring.service.UserServiceImpl;
import friend.spring.service.*;
import friend.spring.web.dto.AlarmResponseDTO;
import friend.spring.web.dto.TokenDTO;
import friend.spring.web.dto.UserRequestDTO;
Expand All @@ -22,6 +18,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.annotations.Api;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.web.bind.annotation.*;
Expand All @@ -41,11 +38,13 @@ public class UserRestController {
private final EmailService mailService;
private final PostService postService;
private final CommentService commentService;

private final JwtTokenService jwtTokenService;
//마이 페이지 조회
@GetMapping("/my-page")
public ApiResponse<UserResponseDTO.MyPageResDTO> getMyPage(
@RequestHeader(name = "id") Long userId) {
@RequestHeader(name = "atk") String atk,
HttpServletRequest request) {
Long userId=jwtTokenService.JwtToId(request);
User myPage = userService.findMyPage(userId);
return ApiResponse.onSuccess(UserConverter.toMypageResDTO(myPage));
}
Expand All @@ -67,9 +66,19 @@ public ApiResponse<Void> mailauthCheck(@RequestBody @Valid UserRequestDTO.EmailS

//나의 Q&A 질문 조회
@GetMapping("/my-page/profile/question")
@Operation(summary = "나의 Q&A 질문 조회 API",description = "사용자의 나의 Q&A 질문 조회 API 이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "POST4001",description = "NOT_FOUND, 글을 찾을 수 없습니다."),

})
@Parameters({
@Parameter(name = "page", description = "query string(RequestParam) - 몇번째 페이지인지 가리키는 page 변수 (0부터 시작)")
})
public ApiResponse<UserResponseDTO.QuestionResDTO> getQuestion(
@RequestHeader(name = "id") Long userId,
HttpServletRequest request,
@RequestParam(name = "page") Integer page){
Long userId=jwtTokenService.JwtToId(request);
User myPage = userService.findMyPage(userId);
Level nxtLevel = userService.nextLevel(userId);
Page<Post> myPostList = postService.getMyPostList(userId, page);
Expand All @@ -79,9 +88,19 @@ public ApiResponse<UserResponseDTO.QuestionResDTO> getQuestion(

//나의 Q&A 답변 조회
@GetMapping("/my-page/profile/answer")
@Operation(summary = "나의 Q&A 답변 조회 API",description = "사용자의 Q&A 답변 조회 API 이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요")
@ApiResponses({
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"),
@io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMENT4001",description = "NOT_FOUND, 댓글을 찾을 수 없습니다."),

})
@Parameters({
@Parameter(name = "page", description = "query string(RequestParam) - 몇번째 페이지인지 가리키는 page 변수 (0부터 시작)")
})
public ApiResponse<UserResponseDTO.AnswerResDTO> getAnswer(
@RequestHeader(name = "id") Long userId,
HttpServletRequest request,
@RequestParam(name = "page") Integer page){
Long userId=jwtTokenService.JwtToId(request);
User myPage = userService.findMyPage(userId);
Level nxtLevel = userService.nextLevel(userId);
Page<Comment> myCommentList = commentService.getMyCommentList(userId, page);
Expand Down