Skip to content

Commit

Permalink
[NO_JIRA] Member 응원 팀을 nullable로 변경 (#102)
Browse files Browse the repository at this point in the history
* feat: Member 응원 팀을 nullable로 변경

* fix: 프로필 수정 메서드 nullable 반영

* refactor : 회원 가입 시 team_id nullable, 범위 1 ~ 10까지로 수정

---------

Co-authored-by: junwon <wjdwnsdnjs13@naver.com>
  • Loading branch information
EunjiShin and wjdwnsdnjs13 authored Aug 3, 2024
1 parent c865069 commit 15a9247
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@ public record RegisterReq(
regexp = "^[a-zA-Z0-9가-힣]*$",
message = "닉네임은 알파벳 대소문자, 숫자, 한글만 허용하며, 공백은 불가능합니다.")
String nickname,
@NotNull(message = "응원 팀 선택은 필수입니다.")
@Schema(description = "응원 팀 pk")
@Range(min = 1, max = 11, message = "응원 팀은 1번(두산 베어스)부터 11번(없음)까지 입니다.")
@Schema(description = "응원 팀 pk")
@Range(
min = 1,
max = 10,
message = "응원 팀은 null(모두 응원), 1번(두산 베어스)부터 10번(NC 다이노스)까지 입니다.")
Long teamId) {

public Member toDomain() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public class MemberEntity extends BaseEntity {
@Column(name = "id_token", nullable = false, unique = true, length = 255)
private String idToken;

@Column(name = "team_id", nullable = false, length = 10)
@Column(name = "team_id", length = 10)
private Long teamId;

@Column(name = "role", nullable = false)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@ class MemberInfo {
private String teamImageUrl;
private final Long teamId;

public static MemberInfo from(Member member) {
return MemberInfo.builder()
.nickname(member.getNickname())
.profileImageUrl(member.getProfileImage())
.level(member.getLevel().getValue())
.levelTitle(member.getLevel().getTitle())
.teamImageUrl(null)
.teamId(null)
.build();
}

public static MemberInfo of(Member member, BaseballTeam baseballTeam) {
return MemberInfo.builder()
.nickname(member.getNickname())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,10 @@ public boolean deleteMember(String accessToken) {
@Override
public MemberInfo findMemberInfo(Long memberId) {
Member member = readMemberUsecase.findById(memberId);
if (member.getTeamId() == null) {
return MemberInfo.from(member);
}
BaseballTeam baseballTeam = readBaseballTeamUsecase.findById(member.getTeamId());

return MemberInfo.of(member, baseballTeam);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@ public class UpdateMemberService implements UpdateMemberUsecase {
@Override
public Member updateProfile(final Long memberId, UpdateProfileCommand command) {
Member member = readMemberUsecase.findById(memberId);
readBaseballTeamUsecase.areAllTeamIdsExist(Set.of(command.teamId()));
Member updateMember =
member.updateProfile(command.profileImage(), command.nickname(), command.teamId());
Member updateMember = getUpdateMember(member, command);
return memberRepository.updateProfile(updateMember);
}

private Member getUpdateMember(Member member, UpdateProfileCommand command) {
Long teamId = command.teamId();
if (teamId != null) {
readBaseballTeamUsecase.areAllTeamIdsExist(Set.of(teamId));
}
return member.updateProfile(command.profileImage(), command.nickname(), teamId);
}

@Override
public Member updateLevel(Member member, long reviewCnt) {
final int newLevelValue = Level.calculateLevel(reviewCnt);
Expand Down

0 comments on commit 15a9247

Please sign in to comment.