Skip to content

Commit af613a4

Browse files
1117mg1117mg
authored
Merge pull request #55 from Nexters/feat/54-add-gymlevel-description
feat: add level description and test data
2 parents b637559 + c958068 commit af613a4

File tree

5 files changed

+34
-36
lines changed

5 files changed

+34
-36
lines changed

‎src/main/java/com/climbup/climbup/gym/dto/response/GymLevelResponse.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,17 @@ public class GymLevelResponse {
1919
@Schema(description = "브랜드명", example = "더클라임")
2020
private String brandName;
2121

22+
@Schema(description = "암장별 레벨명", example = "ORANGE")
23+
private String gymLevelName;
24+
2225
@Schema(description = "기본 레벨 ID", example = "1")
2326
private Long levelId;
2427

25-
@Schema(description = "기본 레벨명", example = "V0")
28+
@Schema(description = "기본 레벨명", example = "입문자 단계")
2629
private String levelName;
2730

28-
@Schema(description = "브랜드별 표시명", example = "ORANGE")
29-
private String displayName;
31+
@Schema(description = "레벨 설명", example = "클라이밍이 처음이라면 가볍게 시작해보세요!")
32+
private String description;
3033

3134
@Schema(description = "최소 SR", example = "600")
3235
private Integer srMin;
@@ -45,9 +48,10 @@ public static GymLevelResponse fromEntity(GymLevel gymLevel) {
4548
.id(gymLevel.getId())
4649
.brandId(gymLevel.getBrand().getId())
4750
.brandName(gymLevel.getBrand().getName())
51+
.gymLevelName(gymLevel.getName())
4852
.levelId(gymLevel.getLevel().getId())
4953
.levelName(gymLevel.getLevel().getName())
50-
.displayName(gymLevel.getDisplayName())
54+
.description(gymLevel.getLevel().getDescription())
5155
.srMin(gymLevel.getSrMin())
5256
.srMax(gymLevel.getSrMax())
5357
.sortOrder(gymLevel.getSortOrder())

‎src/main/java/com/climbup/climbup/gym/entity/GymLevel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ public class GymLevel extends BaseEntity {
3030
@JoinColumn(name = "level_id", nullable = false)
3131
private Level level;
3232

33-
@Column(name = "display_name", nullable = false, length = 50)
34-
private String displayName;
33+
@Column(name = "name", nullable = false, length = 50)
34+
private String name;
3535

3636
@Column(name = "sr_min", nullable = false)
3737
private Integer srMin;

‎src/main/java/com/climbup/climbup/test/controller/TestController.java‎

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -86,48 +86,44 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
8686
if (levelRepository.count() == 0) {
8787
List<Level> levels = levelRepository.saveAll(List.of(
8888
Level.builder()
89-
.name("V0")
90-
.description("입문자용 가장 쉬운 난이도")
89+
.name("입문자 단계")
90+
.description("클라이밍이 처음이라면 가볍게 시작해보세요!")
9191
.sortOrder(0)
9292
.build(),
9393
Level.builder()
94-
.name("V1")
95-
.description("초급자용 난이도")
94+
.name("기본기를 익히는 단계")
95+
.description("규칙도 익히고, 슬슬 재미가 붙은 단계네요!")
9696
.sortOrder(1)
9797
.build(),
9898
Level.builder()
9999
.name("V2")
100-
.description("초급자 상급 난이도")
101100
.sortOrder(2)
102101
.build(),
103102
Level.builder()
104-
.name("V3")
105-
.description("중급자 입문 난이도")
103+
.name("도전의 재미가 시작되는 단계")
104+
.description("도전의 재미가 본격적으로 느껴지실 거예요.")
106105
.sortOrder(3)
107106
.build(),
108107
Level.builder()
109-
.name("V4")
110-
.description("중급자 난이도")
108+
.name("고난이도 루트에 도전하는 단계")
109+
.description("이제 다양한 루트도 거뜬하죠? 멋져요!")
111110
.sortOrder(4)
112111
.build(),
113112
Level.builder()
114113
.name("V5")
115-
.description("중급자 상급 난이도")
116114
.sortOrder(5)
117115
.build(),
118116
Level.builder()
119-
.name("V6")
120-
.description("고급자 입문 난이도")
117+
.name("어디서든 인정받는 단계")
118+
.description("누구나 인정할 실력자시군요. 정말 대단해요!")
121119
.sortOrder(6)
122120
.build(),
123121
Level.builder()
124122
.name("V7")
125-
.description("고급자 난이도")
126123
.sortOrder(7)
127124
.build(),
128125
Level.builder()
129126
.name("V8")
130-
.description("고급자 상급 난이도")
131127
.sortOrder(8)
132128
.build(),
133129
Level.builder()
@@ -181,24 +177,22 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
181177
Brand climbingPark = brandRepository.findByName("클라이밍파크").orElseThrow();
182178

183179
Level v0 = levelRepository.findAll().stream()
184-
.filter(l -> l.getName().equals("V0")).findFirst().orElseThrow();
180+
.filter(l -> l.getName().equals("입문자 단계")).findFirst().orElseThrow();
185181
Level v1 = levelRepository.findAll().stream()
186-
.filter(l -> l.getName().equals("V1")).findFirst().orElseThrow();
182+
.filter(l -> l.getName().equals("기본기를 익히는 단계")).findFirst().orElseThrow();
187183
Level v3 = levelRepository.findAll().stream()
188-
.filter(l -> l.getName().equals("V3")).findFirst().orElseThrow();
184+
.filter(l -> l.getName().equals("도전의 재미가 시작되는 단계")).findFirst().orElseThrow();
189185
Level v4 = levelRepository.findAll().stream()
190-
.filter(l -> l.getName().equals("V4")).findFirst().orElseThrow();
186+
.filter(l -> l.getName().equals("고난이도 루트에 도전하는 단계")).findFirst().orElseThrow();
191187
Level v6 = levelRepository.findAll().stream()
192-
.filter(l -> l.getName().equals("V6")).findFirst().orElseThrow();
193-
Level v8 = levelRepository.findAll().stream()
194-
.filter(l -> l.getName().equals("V8")).findFirst().orElseThrow();
188+
.filter(l -> l.getName().equals("어디서든 인정받는 단계")).findFirst().orElseThrow();
195189

196190
// 더클라임 레벨 체계
197191
List<GymLevel> theClimbLevels = List.of(
198192
GymLevel.builder()
199193
.brand(theClimb)
200194
.level(v0)
201-
.displayName("ORANGE")
195+
.name("ORANGE")
202196
.srMin(600)
203197
.srMax(649)
204198
.sortOrder(1)
@@ -207,7 +201,7 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
207201
GymLevel.builder()
208202
.brand(theClimb)
209203
.level(v1)
210-
.displayName("GREEN")
204+
.name("GREEN")
211205
.srMin(650)
212206
.srMax(999)
213207
.sortOrder(2)
@@ -216,7 +210,7 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
216210
GymLevel.builder()
217211
.brand(theClimb)
218212
.level(v3)
219-
.displayName("BLUE")
213+
.name("BLUE")
220214
.srMin(1000)
221215
.srMax(1999)
222216
.sortOrder(3)
@@ -225,7 +219,7 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
225219
GymLevel.builder()
226220
.brand(theClimb)
227221
.level(v4)
228-
.displayName("RED")
222+
.name("RED")
229223
.srMin(2000)
230224
.srMax(2999)
231225
.sortOrder(4)
@@ -234,7 +228,7 @@ public ResponseEntity<ApiResult<Map<String, Object>>> initTestData() {
234228
GymLevel.builder()
235229
.brand(theClimb)
236230
.level(v6)
237-
.displayName("PURPLE")
231+
.name("PURPLE")
238232
.srMin(3000)
239233
.srMax(null)
240234
.sortOrder(5)

‎src/main/java/com/climbup/climbup/user/dto/response/UserStatusResponse.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ public static class GymLevelInfo {
4848
@Schema(description = "기본 레벨명", example = "V0")
4949
private String levelName;
5050

51-
@Schema(description = "브랜드별 표시명", example = "ORANGE")
52-
private String displayName;
51+
@Schema(description = "암장별 레벨명", example = "ORANGE")
52+
private String gymLevelName;
5353

5454
@Schema(description = "최소 SR", example = "600")
5555
private Integer srMin;
@@ -103,7 +103,7 @@ public static UserStatusResponse fromEntity(User user) {
103103
.id(user.getGymLevel().getId())
104104
.brandName(user.getGymLevel().getBrand().getName())
105105
.levelName(user.getGymLevel().getLevel().getName())
106-
.displayName(user.getGymLevel().getDisplayName())
106+
.gymLevelName(user.getGymLevel().getName())
107107
.srMin(user.getGymLevel().getSrMin())
108108
.srMax(user.getGymLevel().getSrMax())
109109
.sortOrder(user.getGymLevel().getSortOrder())

‎src/main/resources/application.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spring:
1616

1717
jpa:
1818
hibernate:
19-
ddl-auto: update
19+
ddl-auto: create
2020
show-sql: true
2121

2222
flyway:

0 commit comments

Comments
 (0)