Skip to content

Commit 14f0e0f

Browse files
authored
✨ feat: 웹소켓 config 파일 생성
* ✨ 웹소켓 config 파일 생성 * chore: Java 스타일 수정 * ♻️ refactor:sockJS 제거 --------- Co-authored-by: github-actions <>
1 parent 162c62c commit 14f0e0f

File tree

21 files changed

+146
-120
lines changed

21 files changed

+146
-120
lines changed

backend/src/main/java/io/f1/backend/BackendApplication.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
@SpringBootApplication
99
public class BackendApplication {
1010

11-
public static void main(String[] args) {
12-
SpringApplication.run(BackendApplication.class, args);
13-
}
14-
11+
public static void main(String[] args) {
12+
SpringApplication.run(BackendApplication.class, args);
13+
}
1514
}
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
package io.f1.backend.domain.admin.entity;
22

33
import io.f1.backend.global.entity.BaseEntity;
4+
45
import jakarta.persistence.Column;
56
import jakarta.persistence.Entity;
67
import jakarta.persistence.GeneratedValue;
78
import jakarta.persistence.GenerationType;
89
import jakarta.persistence.Id;
10+
911
import java.time.LocalDateTime;
1012

1113
@Entity
1214
public class Admin extends BaseEntity {
1315

14-
@Id
15-
@GeneratedValue(strategy = GenerationType.IDENTITY)
16-
private Long id;
17-
18-
@Column(nullable = false)
19-
private String username;
16+
@Id
17+
@GeneratedValue(strategy = GenerationType.IDENTITY)
18+
private Long id;
2019

21-
@Column(nullable = false)
22-
private String password;
20+
@Column(nullable = false)
21+
private String username;
2322

24-
@Column(nullable = false)
25-
private LocalDateTime lastLogin;
23+
@Column(nullable = false)
24+
private String password;
2625

26+
@Column(nullable = false)
27+
private LocalDateTime lastLogin;
2728
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.f1.backend.domain.game;
22

33
public enum ConnectionState {
4-
DISCONNECTED, CONNECTED
4+
DISCONNECTED,
5+
CONNECTED
56
}

backend/src/main/java/io/f1/backend/domain/game/GameSetting.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
public class GameSetting {
44

5-
private Long quizId;
6-
private Integer round; // 게임 변경 시 해당 게임의 총 문제 수로 설정
7-
private int timeLimit = 60;
5+
private Long quizId;
6+
private Integer round; // 게임 변경 시 해당 게임의 총 문제 수로 설정
7+
private int timeLimit = 60;
88
}

backend/src/main/java/io/f1/backend/domain/game/Player.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
public class Player {
44

5-
public String nickname;
5+
public String nickname;
66

7-
private boolean isReady = false;
7+
private boolean isReady = false;
88

9-
private ConnectionState state;
9+
private ConnectionState state;
1010

11-
private int correctCount = 0;
11+
private int correctCount = 0;
1212
}
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
package io.f1.backend.domain.game;
22

33
import io.f1.backend.domain.question.entity.Question;
4+
5+
import lombok.AllArgsConstructor;
6+
47
import java.time.LocalDateTime;
58
import java.util.List;
69
import java.util.Map;
7-
import lombok.AllArgsConstructor;
810

911
@AllArgsConstructor
1012
public class Room {
1113

12-
private final Long id;
13-
14-
private final RoomSetting roomSetting;
15-
private GameSetting gameSetting;
16-
private RoomState state = RoomState.WAITING;
14+
private final Long id;
1715

18-
private Player host;
16+
private final RoomSetting roomSetting;
17+
private GameSetting gameSetting;
18+
private RoomState state = RoomState.WAITING;
1919

20-
private List<Question> questions;
20+
private Player host;
2121

22-
private Map<String, Player> playerSessionMap;
22+
private List<Question> questions;
2323

24-
private final LocalDateTime createdAt = LocalDateTime.now();
24+
private Map<String, Player> playerSessionMap;
2525

26+
private final LocalDateTime createdAt = LocalDateTime.now();
2627
}

backend/src/main/java/io/f1/backend/domain/game/RoomManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
import java.util.concurrent.ConcurrentHashMap;
55

66
public class RoomManager {
7-
private final Map<Long, Room> rooms = new ConcurrentHashMap<>();
7+
private final Map<Long, Room> rooms = new ConcurrentHashMap<>();
88
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
package io.f1.backend.domain.game;
22

3-
public record RoomSetting (String title, int maxUserCount, String password){ }
3+
public record RoomSetting(String title, int maxUserCount, String password) {}
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.f1.backend.domain.game;
22

33
public enum RoomState {
4-
WAITING, PLAYING, FINISHED
5-
}
4+
WAITING,
5+
PLAYING,
6+
FINISHED
7+
}

backend/src/main/java/io/f1/backend/domain/question/entity/Question.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import io.f1.backend.domain.quiz.entity.Quiz;
44
import io.f1.backend.global.entity.BaseEntity;
5+
56
import jakarta.persistence.CascadeType;
67
import jakarta.persistence.Column;
78
import jakarta.persistence.Entity;
@@ -16,18 +17,17 @@
1617
@Entity
1718
public class Question extends BaseEntity {
1819

19-
@Id
20-
@GeneratedValue(strategy = GenerationType.IDENTITY)
21-
private Long id;
22-
23-
@ManyToOne(fetch = FetchType.LAZY)
24-
@JoinColumn(name="quiz_id", nullable = false)
25-
private Quiz quiz;
20+
@Id
21+
@GeneratedValue(strategy = GenerationType.IDENTITY)
22+
private Long id;
2623

27-
@Column(nullable=false)
28-
private String answer;
24+
@ManyToOne(fetch = FetchType.LAZY)
25+
@JoinColumn(name = "quiz_id", nullable = false)
26+
private Quiz quiz;
2927

30-
@OneToOne(mappedBy = "question", cascade = CascadeType.REMOVE)
31-
private TextQuestion textQuestion;
28+
@Column(nullable = false)
29+
private String answer;
3230

31+
@OneToOne(mappedBy = "question", cascade = CascadeType.REMOVE)
32+
private TextQuestion textQuestion;
3333
}

0 commit comments

Comments
 (0)