Skip to content

Commit f41b2e2

Browse files
committed
Merge remote-tracking branch 'origin/feat/12' into feat/12
# Conflicts: # backend/src/main/java/io/f1/backend/domain/game/api/RoomController.java # backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java # backend/src/main/java/io/f1/backend/domain/game/dto/request/RoomCreateRequest.java # backend/src/main/java/io/f1/backend/domain/game/store/RoomRepository.java # backend/src/test/java/io/f1/backend/domain/game/store/RoomRepositoryTests.java
2 parents 797ed65 + 5697d6f commit f41b2e2

File tree

5 files changed

+7
-14
lines changed

5 files changed

+7
-14
lines changed

backend/src/main/java/io/f1/backend/domain/game/api/RoomController.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import io.f1.backend.domain.game.app.RoomService;
44
import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
5-
import io.f1.backend.domain.game.dto.response.RoomCreateResponse;
65
import jakarta.validation.Valid;
76
import java.util.HashMap;
87
import java.util.Map;

backend/src/main/java/io/f1/backend/domain/game/mapper/RoomMapper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
public class RoomMapper {
77

88
public static RoomSetting toRoomSetting(RoomCreateRequest request) {
9-
return new RoomSetting(request.roomName(), request.maxUserCount(),
10-
request.locked(), request.password());
9+
return new RoomSetting(
10+
request.roomName(), request.maxUserCount(), request.locked(), request.password());
1111
}
12-
1312
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ public class Player {
1515

1616
private int correctCount = 0;
1717

18-
1918
public Player(Long id, String nickname) {
2019
this.id = id;
2120
this.nickname = nickname;

backend/src/main/java/io/f1/backend/domain/game/model/Room.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package io.f1.backend.domain.game.model;
22

33
import io.f1.backend.domain.question.entity.Question;
4+
5+
import lombok.Getter;
6+
47
import java.time.LocalDateTime;
58
import java.util.ArrayList;
69
import java.util.List;
710
import java.util.Map;
811
import java.util.concurrent.ConcurrentHashMap;
9-
import lombok.Getter;
1012

1113
@Getter
1214
public class Room {
@@ -27,14 +29,10 @@ public class Room {
2729

2830
private final LocalDateTime createdAt = LocalDateTime.now();
2931

30-
31-
public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting,
32-
Player host) {
32+
public Room(Long id, RoomSetting roomSetting, GameSetting gameSetting, Player host) {
3333
this.id = id;
3434
this.roomSetting = roomSetting;
3535
this.gameSetting = gameSetting;
3636
this.host = host;
3737
}
38-
39-
4038
}
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
package io.f1.backend.domain.game.model;
22

3-
public record RoomSetting(String roomName, int maxUserCount, boolean locked, String password) {
4-
5-
}
3+
public record RoomSetting(String roomName, int maxUserCount, boolean locked, String password) {}

0 commit comments

Comments
 (0)