Skip to content

Commit

Permalink
Merge branch 'feature/#116' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
hysong4u committed Feb 17, 2024
2 parents 95a7d32 + 373df65 commit 04e30ef
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import org.sopt.sweet.domain.member.service.MemberService;
import org.sopt.sweet.global.common.SuccessResponse;
import org.sopt.sweet.global.config.auth.UserId;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;

Expand Down Expand Up @@ -58,5 +57,10 @@ public ResponseEntity<SuccessResponse<?>> getMyPage(@UserId Long userId) {
return SuccessResponse.ok(myPageResponseDto);
}

@GetMapping("/profile")
public ResponseEntity<SuccessResponse<?>> getProfile(@UserId Long userId) {
ProfileImageResponseDto profile = memberService.getProfile(userId);
return SuccessResponse.ok(profile);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package org.sopt.sweet.domain.member.dto.response;

public record ProfileImageResponseDto(
String profileImg
) {
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
package org.sopt.sweet.domain.member.service;

import lombok.RequiredArgsConstructor;
import org.sopt.sweet.domain.member.dto.response.ActiveRoomResponseDto;
import org.sopt.sweet.domain.member.dto.response.ClosedRoomResponseDto;
import org.sopt.sweet.domain.member.dto.response.MemberInfoDto;
import org.sopt.sweet.domain.member.dto.response.MemberTokenResponseDto;
import org.sopt.sweet.domain.member.dto.response.*;
import org.sopt.sweet.domain.member.entity.Member;
import org.sopt.sweet.domain.member.repository.MemberRepository;
import org.sopt.sweet.domain.room.constant.TournamentDuration;
Expand Down Expand Up @@ -141,4 +138,9 @@ public MemberInfoDto getMemberInfo(Long memberId) {
member.get().getProfileImg()
);
}

public ProfileImageResponseDto getProfile(Long memberId) {
Optional<Member> member = memberRepository.findById(memberId);
return new ProfileImageResponseDto(member.get().getProfileImg());
}
}

0 comments on commit 04e30ef

Please sign in to comment.