Skip to content

Commit 161ab08

Browse files
committed
feat: USER Tier ์„ค์ •
1 parent 02c18e8 commit 161ab08

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

โ€Žsrc/main/java/cmf/commitField/domain/user/entity/CustomOAuth2User.javaโ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public Map<String, Object> getAttributes() {
2323
return oauth2User.getAttributes();
2424
}
2525

26+
//TODO: ๊ด€๋ฆฌ์ž ๊ถŒํ•œ ์ถ”๊ฐ€์‹œ ํ•ด๋‹น ๊ธฐ๋Šฅ ์ถ”๊ฐ€ ์ฒ˜๋ฆฌ ํ•„์š”, ๋‹น์žฅ์€ ๊ด€๋ฆฌ์ž ๊ถŒํ•œ ํ•„์š” ์—†์Œ.
2627
@Override
2728
public Collection<? extends GrantedAuthority> getAuthorities() {
2829
return List.of(new SimpleGrantedAuthority("ROLE_" + user.getRole().name()));

โ€Žsrc/main/java/cmf/commitField/domain/user/entity/User.javaโ€Ž

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,25 @@ public class User extends BaseEntity {
3232
private LocalDateTime lastCommitted; // ๋งˆ์ง€๋ง‰ ์ปค๋ฐ‹ ์‹œ๊ฐ„
3333
private long commitCount;
3434

35-
@Enumerated(EnumType.STRING) // DB์— ์ €์žฅ๋  ๋•Œ String ํ˜•ํƒœ๋กœ ์ €์žฅ๋จ
35+
@Enumerated(EnumType.STRING) // ๊ถŒํ•œ
3636
private Role role;
3737

3838
public enum Role {
3939
USER, ADMIN
4040
}
4141

42+
@Enumerated(EnumType.STRING) // DB์— ์ €์žฅ๋  ๋•Œ String ํ˜•ํƒœ๋กœ ์ €์žฅ๋จ
43+
private Tier tier;
44+
45+
public enum Tier {
46+
SEED, // ์”จ์•—
47+
SPROUT, // ์ƒˆ์‹น
48+
FLOWER, // ๊ฝƒ
49+
FRUIT, // ์—ด๋งค
50+
TREE // ๋‚˜๋ฌด
51+
}
52+
53+
4254
@OneToMany(mappedBy = "user", fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
4355
private List<ChatRoom> chatRooms = new ArrayList<>();
4456

@@ -61,6 +73,7 @@ public User(String username, String email, String nickname, String avatarUrl, Bo
6173
this.avatarUrl=avatarUrl;
6274
this.status= status;
6375
this.role = Role.USER;
76+
this.tier = Tier.SEED;
6477
this.chatRooms = cr;
6578
this.userChatRooms = ucr;
6679
this.chatMsgs = cmsg;
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package cmf.commitField.global.websocket;
2+
3+
public class CommitWebSockerHandler {
4+
}

โ€Žsrc/main/java/cmf/commitField/global/websocket/WebSocketConfig.javaโ€Ž

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
1414

1515
@Override
1616
public void registerStompEndpoints(StompEndpointRegistry registry) {
17-
// ํด๋ผ์ด์–ธํŠธ๊ฐ€ ์—ฐ๊ฒฐํ•  WebSocket ์—”๋“œํฌ์ธํŠธ
18-
registry.addEndpoint("/ws-stomp")
17+
// commit์ˆ˜ ๋ฐ˜์˜์„ ์œ„ํ•œ ์›น์†Œ์ผ“
18+
registry.addEndpoint("/ws/commit")
1919
.setAllowedOriginPatterns("*") // setAllowedOriginPatterns ์‚ฌ์šฉ
2020
// SockJS ์‚ฌ์šฉ (WebSocket ๋ฏธ์ง€์› ๋ธŒ๋ผ์šฐ์ € ๋Œ€์‘)
2121
.withSockJS();
2222

23+
// ์ฑ„ํŒ… ์›น์†Œ์ผ“
2324
registry.addEndpoint("/ws")
2425
.setAllowedOriginPatterns("*") // setAllowedOriginPatterns ์‚ฌ์šฉ
2526
.withSockJS();
@@ -33,4 +34,5 @@ public void configureMessageBroker(MessageBrokerRegistry registry) {
3334
// ๋ฉ”์‹œ์ง€๋ฅผ ๊ตฌ๋…ํ•˜๋Š” ๊ฒฝ๋กœ(prefix)
3435
registry.enableSimpleBroker("/sub", "/topic", "/queue");
3536
}
37+
3638
}

0 commit comments

Comments
ย (0)