Skip to content

Commit 5697d6f

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent 6eb0942 commit 5697d6f

File tree

9 files changed

+43
-40
lines changed

9 files changed

+43
-40
lines changed

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

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

33
import io.f1.backend.domain.game.app.RoomService;
44
import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
5+
56
import jakarta.validation.Valid;
6-
import java.util.HashMap;
7-
import java.util.Map;
7+
88
import lombok.RequiredArgsConstructor;
9+
910
import org.springframework.http.HttpStatus;
1011
import org.springframework.web.bind.annotation.PostMapping;
1112
import org.springframework.web.bind.annotation.RequestBody;
1213
import org.springframework.web.bind.annotation.RequestMapping;
1314
import org.springframework.web.bind.annotation.ResponseStatus;
1415
import org.springframework.web.bind.annotation.RestController;
1516

17+
import java.util.HashMap;
18+
import java.util.Map;
1619

1720
@RestController
1821
@RequestMapping("/rooms")
@@ -31,5 +34,4 @@ public Long saveRoom(@RequestBody @Valid RoomCreateRequest request) {
3134

3235
return roomService.saveRoom(request, loginUser);
3336
}
34-
3537
}

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
import io.f1.backend.domain.game.model.Player;
88
import io.f1.backend.domain.game.model.RoomSetting;
99
import io.f1.backend.domain.game.store.RoomRepository;
10-
import java.util.Map;
10+
1111
import lombok.RequiredArgsConstructor;
12+
1213
import org.springframework.stereotype.Service;
1314

15+
import java.util.Map;
16+
1417
@Service
1518
@RequiredArgsConstructor
1619
public class RoomService {
@@ -19,13 +22,12 @@ public class RoomService {
1922

2023
public Long saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
2124

22-
//todo 제일 작은 index quizId 가져와서 gameSetting
25+
// todo 제일 작은 index quizId 가져와서 gameSetting
2326
GameSetting gameSetting = new GameSetting(1L, 10, 60);
24-
//todo security에서 가져오는걸로 변경
27+
// todo security에서 가져오는걸로 변경
2528
Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
2629
RoomSetting roomSetting = toRoomSetting(request);
2730

2831
return roomRepository.saveRoom(gameSetting, host, roomSetting);
2932
}
30-
3133
}

backend/src/main/java/io/f1/backend/domain/game/dto/request/RoomCreateRequest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import jakarta.validation.constraints.Min;
44
import jakarta.validation.constraints.NotNull;
55

6-
public record RoomCreateRequest(@NotNull(message = "방 제목은 필수입니다.") String roomName,
7-
@NotNull(message = "인원 수 입력은 필수입니다.") @Min(value = 2, message = "방 인원 수는 최소 2명 이상이어야합니다.") Integer maxUserCount,
8-
String password,
9-
boolean locked) {
10-
11-
}
6+
public record RoomCreateRequest(
7+
@NotNull(message = "방 제목은 필수입니다.") String roomName,
8+
@NotNull(message = "인원 수 입력은 필수입니다.") @Min(value = 2, message = "방 인원 수는 최소 2명 이상이어야합니다.")
9+
Integer maxUserCount,
10+
String password,
11+
boolean locked) {}

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) {}

backend/src/main/java/io/f1/backend/domain/game/store/RoomRepository.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
import io.f1.backend.domain.game.model.Player;
55
import io.f1.backend.domain.game.model.Room;
66
import io.f1.backend.domain.game.model.RoomSetting;
7+
8+
import org.springframework.stereotype.Repository;
9+
710
import java.util.Map;
811
import java.util.concurrent.ConcurrentHashMap;
912
import java.util.concurrent.atomic.AtomicLong;
10-
import org.springframework.stereotype.Repository;
1113

1214
@Repository
1315
public class RoomRepository {
@@ -18,14 +20,13 @@ public class RoomRepository {
1820
public Long saveRoom(GameSetting gameSetting, Player host, RoomSetting roomSetting) {
1921
Long newId = roomIdGenerator.incrementAndGet();
2022

21-
rooms.put(newId, new Room(newId,roomSetting,gameSetting,host));
23+
rooms.put(newId, new Room(newId, roomSetting, gameSetting, host));
2224

2325
return newId;
2426
}
2527

26-
//테스트 전용 메소드
28+
// 테스트 전용 메소드
2729
public Room getRoomForTest(Long roomId) {
2830
return rooms.get(roomId);
2931
}
30-
31-
}
32+
}

backend/src/test/java/io/f1/backend/domain/game/store/RoomRepositoryTests.java

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5+
import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
56
import io.f1.backend.domain.game.model.GameSetting;
67
import io.f1.backend.domain.game.model.Player;
78
import io.f1.backend.domain.game.model.Room;
8-
import io.f1.backend.domain.game.dto.request.RoomCreateRequest;
99
import io.f1.backend.domain.game.model.RoomSetting;
10-
import java.util.HashMap;
11-
import java.util.Map;
10+
1211
import org.junit.jupiter.api.BeforeEach;
1312
import org.junit.jupiter.api.DisplayName;
1413
import org.junit.jupiter.api.Test;
1514

15+
import java.util.HashMap;
16+
import java.util.Map;
17+
1618
class RoomRepositoryTests {
1719

1820
RoomRepository roomRepository;
@@ -32,15 +34,18 @@ void saveRoom_test() {
3234
loginUser.put("id", 1L);
3335
loginUser.put("nickname", "빵야빵야");
3436

35-
3637
GameSetting gameSetting = new GameSetting(1L, 10, 60);
3738

3839
Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
3940

40-
RoomSetting roomSetting = new RoomSetting(request.roomName(), request.maxUserCount(),
41-
request.locked(), request.password());
41+
RoomSetting roomSetting =
42+
new RoomSetting(
43+
request.roomName(),
44+
request.maxUserCount(),
45+
request.locked(),
46+
request.password());
4247

43-
Long savedId = roomRepository.saveRoom(gameSetting,host,roomSetting);
48+
Long savedId = roomRepository.saveRoom(gameSetting, host, roomSetting);
4449

4550
Room savedRoom = roomRepository.getRoomForTest(savedId);
4651

@@ -52,5 +57,4 @@ void saveRoom_test() {
5257
assertThat(savedRoom.getRoomSetting().locked()).isEqualTo(request.locked());
5358
assertThat(savedRoom.getRoomSetting().password()).isEqualTo(request.password());
5459
}
55-
56-
}
60+
}

0 commit comments

Comments
 (0)