Skip to content

Commit 07f6413

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent f41b2e2 commit 07f6413

File tree

6 files changed

+39
-31
lines changed

6 files changed

+39
-31
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 RoomCreateResponse 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: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
import io.f1.backend.domain.game.model.Room;
1010
import io.f1.backend.domain.game.model.RoomSetting;
1111
import io.f1.backend.domain.game.store.RoomRepository;
12-
import java.util.Map;
13-
import java.util.concurrent.atomic.AtomicLong;
12+
1413
import lombok.RequiredArgsConstructor;
14+
1515
import org.springframework.stereotype.Service;
1616

17+
import java.util.Map;
18+
import java.util.concurrent.atomic.AtomicLong;
19+
1720
@Service
1821
@RequiredArgsConstructor
1922
public class RoomService {
@@ -23,17 +26,16 @@ public class RoomService {
2326

2427
public RoomCreateResponse saveRoom(RoomCreateRequest request, Map<String, Object> loginUser) {
2528

26-
//todo 제일 작은 index quizId 가져와서 gameSetting(round 설정)
29+
// todo 제일 작은 index quizId 가져와서 gameSetting(round 설정)
2730
GameSetting gameSetting = new GameSetting(1L, 10, 60);
28-
//todo security에서 가져오는걸로 변경
31+
// todo security에서 가져오는걸로 변경
2932
Player host = new Player((Long) loginUser.get("id"), loginUser.get("nickname").toString());
3033
RoomSetting roomSetting = toRoomSetting(request);
3134

3235
Long newId = roomIdGenerator.incrementAndGet();
3336

34-
roomRepository.saveRoom(new Room(newId,roomSetting,gameSetting,host));
37+
roomRepository.saveRoom(new Room(newId, roomSetting, gameSetting, host));
3538

3639
return new RoomCreateResponse(newId);
3740
}
38-
3941
}

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

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import jakarta.validation.constraints.NotBlank;
66
import jakarta.validation.constraints.NotNull;
77

8-
public record RoomCreateRequest(@NotBlank(message = "방 제목은 필수입니다.") String roomName,
9-
@NotNull(message = "인원 수 입력은 필수입니다.") @Min(value = 2, message = "방 인원 수는 최소 2명입니다.") @Max(value = 8, message = "방 인원 수는 최대 8명 입니다.") Integer maxUserCount,
10-
@NotNull String password,
11-
@NotNull boolean locked) {
12-
13-
}
8+
public record RoomCreateRequest(
9+
@NotBlank(message = "방 제목은 필수입니다.") String roomName,
10+
@NotNull(message = "인원 수 입력은 필수입니다.")
11+
@Min(value = 2, message = "방 인원 수는 최소 2명입니다.")
12+
@Max(value = 8, message = "방 인원 수는 최대 8명 입니다.")
13+
Integer maxUserCount,
14+
@NotNull String password,
15+
@NotNull boolean locked) {}
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
package io.f1.backend.domain.game.dto.response;
22

3-
public record RoomCreateResponse(Long roomId) {
4-
5-
}
6-
3+
public record RoomCreateResponse(Long roomId) {}
Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package io.f1.backend.domain.game.store;
22

33
import io.f1.backend.domain.game.model.Room;
4+
5+
import org.springframework.stereotype.Repository;
6+
47
import java.util.Map;
58
import java.util.concurrent.ConcurrentHashMap;
6-
import org.springframework.stereotype.Repository;
79

810
@Repository
911
public class RoomRepositoryImpl implements RoomRepository {
@@ -15,9 +17,8 @@ public void saveRoom(Room room) {
1517
roomMap.put(room.getId(), room);
1618
}
1719

18-
//테스트 전용 메소드
20+
// 테스트 전용 메소드
1921
public Room getRoomForTest(Long roomId) {
2022
return roomMap.get(roomId);
2123
}
22-
23-
}
24+
}

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

Lines changed: 12 additions & 8 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
RoomRepositoryImpl roomRepository;
@@ -32,13 +34,16 @@ 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

4348
Long newId = 1L;
4449

@@ -56,5 +61,4 @@ void saveRoom_test() {
5661
assertThat(savedRoom.getRoomSetting().locked()).isEqualTo(request.locked());
5762
assertThat(savedRoom.getRoomSetting().password()).isEqualTo(request.password());
5863
}
59-
60-
}
64+
}

0 commit comments

Comments
 (0)