Skip to content

Commit

Permalink
Merge pull request #127 from My-Own-Weapon/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
rlawogkr authored Jul 23, 2024
2 parents acc4a56 + aa6f59c commit 327740d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ public ResponseEntity<MemberInfoResponse> getMemberInfo(HttpSession session) {
* 프로필 이미지, 프로필 이름 반환
* Method: GET
* url: /member/{username}/profile
*
* TODO: memberId, imageUrl, username, name
*/
@GetMapping("/member/{username}/profile")
@Operation(summary = "프로필 이미지, 프로필 이름(username) 반환")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@

@Data
public class MemberProfileResponse {
private Long memberId; // 사용자의 진짜 id
private String imageUrl; // 프로필 이미지 url
private String username; // 사용자 id
private String username; // 사용자 별명
private String name; // 사용자 아룸

public MemberProfileResponse(String imageUrl, String username, String name) {
public MemberProfileResponse( Long memberId, String imageUrl, String username, String name) {
this.memberId = memberId;
this.imageUrl = imageUrl;
this.username = username;
this.name = name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public MemberProfileResponse getMemberProfile(String username) {
imageUrl = findMemberImage.get().getUrl();
}

return new MemberProfileResponse(imageUrl, member.getUsername(), member.getName());
return new MemberProfileResponse(member.getId(), imageUrl, member.getUsername(), member.getName());
}

// 생방송 중이면 종료, 종료 중이면 시작
Expand Down

0 comments on commit 327740d

Please sign in to comment.