Skip to content

Commit

Permalink
Merge pull request #44 from TogetherWithOcean-TWO/SCRUM-116-mypage
Browse files Browse the repository at this point in the history
사용자 mypage 정보 조회
  • Loading branch information
KSJ0128 authored Jul 24, 2024
2 parents dd2177b + 93f431e commit 9d6813d
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,14 @@ public ResponseEntity<String> deleteMember(Authentication principal) {
return ResponseEntity.status(HttpStatus.OK).body(nickname + "님의 회원 탈퇴에 실패했습니다.");

}

@GetMapping("/mypage-info")
public ResponseEntity<MyPageRes> viewMypage(Authentication principal) {
if (principal == null)
return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
MyPageRes myPageInfo = memberService.getMyPageInfo(principal.getName());
return ResponseEntity.status(HttpStatus.OK).body(myPageInfo);
}
// @GetMapping("/test")
// public ResponseEntity<String> testToken() { return ResponseEntity.status(HttpStatus.OK).body(SecurityUtil.getCurrentEmail()); }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.togetherwithocean.TWO.Member.DTO;

import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

@Data
@NoArgsConstructor
public class MyPageRes {
String nickname;
Long score;
Long point;

@Builder
public MyPageRes(String nickname, Long score, Long point) {
this.nickname = nickname;
this.score = score;
this.point = point;
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,16 @@ public void deleteMember(Member member) {
memberRepository.deleteById(member.getMemberNumber());
}

public MyPageRes getMyPageInfo(String email) {
Member member = memberRepository.findMemberByEmail(email);

MyPageRes myPageRes = MyPageRes.builder()
.nickname(member.getNickname())
.point(member.getPoint())
.score(member.getRanking().getScore())
.build();
return myPageRes;

public void checkAttend(String email) {
Member member = memberRepository.findMemberByEmail(email);
Stat todayStat = statRepository.findStatByMemberAndDate(member, LocalDate.now());
Expand Down

0 comments on commit 9d6813d

Please sign in to comment.