Skip to content

Commit

Permalink
🐛 [STMT-146] 멤버 레벨을 표현하기 위한 rank 칼럼의 DB 예약어로 인한 insert 쿼리 실패 버그 해결 (#95
Browse files Browse the repository at this point in the history
)

* 🐛 [STMT-146] 멤버 레벨을 표현하기 위한 rank 칼럼의 DB 예약어로 인한 insert 쿼리 실패 버그 해결

* 🐛 [STMT-146] rank -> tier 누락된 부분 수정
  • Loading branch information
zxcv9203 authored Mar 11, 2024
1 parent 8f6e1d1 commit 70016c2
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public record MemberProfileResponse(
String nickname,
String region,
String profession,
String rank,
String tier,
double experience
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.stumeet.server.common.model.BaseTimeEntity;
import com.stumeet.server.member.domain.AuthType;
import com.stumeet.server.member.domain.MemberRank;
import com.stumeet.server.member.domain.MemberTier;
import com.stumeet.server.member.domain.UserRole;
import com.stumeet.server.profession.adapter.out.persistence.ProfessionJpaEntity;
import jakarta.persistence.*;
Expand Down Expand Up @@ -37,10 +37,10 @@ public class MemberJpaEntity extends BaseTimeEntity {
@Comment("멤버 이미지 URL")
private String image;

@Column(name = "rank", length = 50, nullable = false)
@Column(name = "tier", length = 50, nullable = false)
@Enumerated(EnumType.STRING)
@Comment("등급")
private MemberRank rank;
private MemberTier tier;

@Column(name = "experience", nullable = false)
@Comment("경험치")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public MemberJpaEntity toEntity(Member domain) {
.id(domain.getId())
.name(domain.getName())
.image(domain.getImage())
.rank(domain.getLevel().getRank())
.tier(domain.getLevel().getTier())
.experience(domain.getLevel().getExperience())
.region(domain.getRegion())
.profession(professionPersistenceMapper.toEntity(domain.getProfession()))
Expand All @@ -28,7 +28,7 @@ public MemberJpaEntity toEntity(Member domain) {

public Member toDomain(MemberJpaEntity entity) {
MemberLevel level = MemberLevel.builder()
.rank(entity.getRank())
.tier(entity.getTier())
.experience(entity.getExperience())
.build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public MemberProfileResponse toProfileResponse(Member member) {
.nickname(member.getName())
.region(member.getRegion())
.profession(member.getProfession().getName())
.rank(member.getLevel().getRank().getName())
.tier(member.getLevel().getTier().getName())
.experience(member.getLevel().getExperience())
.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Member getMemberOrCreate(OAuthUserProfileResponse response, String provid
member = memberQueryPort.getByOAuthProviderId(response.id(), oAuthProvider);
} else {
MemberLevel initialLevel = MemberLevel.builder()
.rank(MemberRank.SEED)
.tier(MemberTier.SEED)
.experience(0.0)
.build();
member = memberCommandPort.save(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
@Builder
public class MemberLevel {

private MemberRank rank;
private MemberTier tier;
private double experience;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

@RequiredArgsConstructor
@Getter
public enum MemberRank {
public enum MemberTier {
SEED("씨앗"),
SPROUT("새싹"),
LEAF("잎"),
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ALTER TABLE member RENAME COLUMN `rank` TO `tier`
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void successTest() throws Exception {
fieldWithPath("data.nickname").description("닉네임"),
fieldWithPath("data.region").description("지역"),
fieldWithPath("data.profession").description("분야 이름"),
fieldWithPath("data.rank").description("회원 레벨 - 랭크"),
fieldWithPath("data.tier").description("회원 레벨 - 랭크"),
fieldWithPath("data.experience").description("회원 레벨 - 경험치")
)));
}
Expand Down
8 changes: 4 additions & 4 deletions src/test/java/com/stumeet/server/stub/MemberStub.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static MemberJpaEntity getMemberEntity() {
.profession(ProfessionStub.getProfessionEntity())
.role(UserRole.FIRST_LOGIN)
.authType(AuthType.OAUTH)
.rank(MemberRank.SEED)
.tier(MemberTier.SEED)
.experience(0.0)
.build();
}
Expand All @@ -45,7 +45,7 @@ public static MemberSignupCommand getMemberSignupCommand() {

public static Member getMember(WithMockMember annotation) {
MemberLevel level = MemberLevel.builder()
.rank(MemberRank.SEED)
.tier(MemberTier.SEED)
.experience(0.0)
.build();

Expand All @@ -63,7 +63,7 @@ public static Member getMember(WithMockMember annotation) {

public static Member getMember() {
MemberLevel level = MemberLevel.builder()
.rank(MemberRank.SEED)
.tier(MemberTier.SEED)
.experience(0.0)
.build();
return Member.builder()
Expand Down Expand Up @@ -95,7 +95,7 @@ public static MemberProfileResponse getMemberProfileResponse(Member member) {
.nickname(member.getName())
.region(member.getRegion())
.profession(member.getProfession().getName())
.rank(member.getLevel().getRank().getName())
.tier(member.getLevel().getTier().getName())
.experience(member.getLevel().getExperience())
.build();
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/resources/db/setup.sql
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
INSERT INTO member (id, name, image, region, profession_id, role, auth_type, rank, experience, is_deleted, deleted_at)
INSERT INTO member (id, name, image, region, profession_id, role, auth_type, tier, experience, is_deleted, deleted_at)
VALUES (1, 'test', 'http://localhost:4572/user/1/profile/2024030416531039839905-b7e8-4ad3-9552-7d9cbc01cb14-test.jpg',
'서울', 1, 'FIRST_LOGIN', 'OAUTH', 'SEED', 0.0, false, null);

0 comments on commit 70016c2

Please sign in to comment.