Skip to content

Commit 3aeea06

Browse files
author
github-actions
committed
chore: Java 스타일 수정
1 parent d124043 commit 3aeea06

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

backend/src/main/java/io/f1/backend/domain/admin/api/AdminController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import io.f1.backend.domain.admin.app.AdminService;
44
import io.f1.backend.domain.admin.dto.UserPageResponse;
55
import io.f1.backend.global.validation.LimitPageSize;
6+
67
import lombok.RequiredArgsConstructor;
8+
79
import org.springframework.data.domain.Pageable;
810
import org.springframework.data.domain.Sort.Direction;
911
import org.springframework.data.web.PageableDefault;
@@ -22,8 +24,7 @@ public class AdminController {
2224
@GetMapping("/users")
2325
@LimitPageSize
2426
public ResponseEntity<UserPageResponse> getUsers(
25-
@PageableDefault(sort = "lastLogin", direction = Direction.DESC) Pageable pageable
26-
) {
27+
@PageableDefault(sort = "lastLogin", direction = Direction.DESC) Pageable pageable) {
2728
UserPageResponse response = adminService.getAllUsers(pageable);
2829
return ResponseEntity.ok().body(response);
2930
}

backend/src/main/java/io/f1/backend/domain/admin/app/AdminService.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import io.f1.backend.domain.admin.dto.UserPageResponse;
66
import io.f1.backend.domain.admin.dto.UserResponse;
77
import io.f1.backend.domain.user.dao.UserRepository;
8+
89
import lombok.RequiredArgsConstructor;
10+
911
import org.springframework.data.domain.Page;
1012
import org.springframework.data.domain.Pageable;
1113
import org.springframework.stereotype.Service;

backend/src/main/java/io/f1/backend/domain/admin/dto/UserPageResponse.java

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

33
import java.util.List;
44

5-
public record UserPageResponse(int totalPages, int currentPage, int totalElements, List<UserResponse> users) {
6-
7-
}
5+
public record UserPageResponse(
6+
int totalPages, int currentPage, int totalElements, List<UserResponse> users) {}

backend/src/main/java/io/f1/backend/domain/admin/dto/UserResponse.java

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

33
import java.time.LocalDateTime;
44

5-
public record UserResponse(Long id, String nickname, LocalDateTime lastLogin,
6-
LocalDateTime createdAt) {
7-
8-
}
5+
public record UserResponse(
6+
Long id, String nickname, LocalDateTime lastLogin, LocalDateTime createdAt) {}

backend/src/main/java/io/f1/backend/domain/admin/mapper/AdminMapper.java

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

33
import io.f1.backend.domain.admin.dto.UserPageResponse;
44
import io.f1.backend.domain.admin.dto.UserResponse;
5+
56
import org.springframework.data.domain.Page;
67

78
public class AdminMapper {
89

9-
private AdminMapper() {
10-
}
10+
private AdminMapper() {}
1111

1212
public static UserPageResponse toUserListPageResponse(Page<UserResponse> userPage) {
1313
int curPage = userPage.getNumber() + 1;
1414

1515
return new UserPageResponse(
16-
userPage.getTotalPages(),
17-
curPage,
18-
userPage.getNumberOfElements(),
19-
userPage.getContent()
20-
);
16+
userPage.getTotalPages(),
17+
curPage,
18+
userPage.getNumberOfElements(),
19+
userPage.getContent());
2120
}
2221
}

backend/src/main/java/io/f1/backend/domain/user/dao/UserRepository.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,15 @@
22

33
import io.f1.backend.domain.admin.dto.UserResponse;
44
import io.f1.backend.domain.user.entity.User;
5-
import java.util.Optional;
5+
66
import org.springframework.data.domain.Page;
77
import org.springframework.data.domain.Pageable;
88
import org.springframework.data.jpa.repository.JpaRepository;
99
import org.springframework.data.jpa.repository.Query;
1010
import org.springframework.stereotype.Repository;
1111

12+
import java.util.Optional;
13+
1214
@Repository
1315
public interface UserRepository extends JpaRepository<User, Long> {
1416

@@ -17,9 +19,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
1719
Boolean existsUserByNickname(String nickname);
1820

1921
@Query(
20-
"SELECT new io.f1.backend.domain.admin.dto.UserResponse(u.id, u.nickname, u.lastLogin, u.createdAt)" +
21-
"FROM User u " +
22-
"ORDER BY u.lastLogin DESC"
23-
)
22+
"SELECT new io.f1.backend.domain.admin.dto.UserResponse(u.id, u.nickname, u.lastLogin,"
23+
+ " u.createdAt)FROM User u ORDER BY u.lastLogin DESC")
2424
Page<UserResponse> findAllUsersWithPaging(Pageable pageable);
2525
}

backend/src/test/java/io/f1/backend/domain/admin/app/AdminServiceTests.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
66

77
import com.github.database.rider.core.api.dataset.DataSet;
8+
89
import io.f1.backend.global.template.BrowserTestTemplate;
10+
911
import org.junit.jupiter.api.DisplayName;
1012
import org.junit.jupiter.api.Test;
1113
import org.springframework.security.test.context.support.WithMockUser;
@@ -23,11 +25,11 @@ void totalUser() throws Exception {
2325

2426
// then
2527
result.andExpectAll(
26-
status().isOk(),
27-
jsonPath("$.totalPages").value(1),
28-
jsonPath("$.currentPage").value(1),
29-
jsonPath("$.totalElements").value(3),
30-
jsonPath("$.users.length()").value(3));
28+
status().isOk(),
29+
jsonPath("$.totalPages").value(1),
30+
jsonPath("$.currentPage").value(1),
31+
jsonPath("$.totalElements").value(3),
32+
jsonPath("$.users.length()").value(3));
3133
}
3234

3335
@Test
@@ -38,14 +40,13 @@ void getUsersSortedByLastLogin() throws Exception {
3840
ResultActions result = mockMvc.perform(get("/admin/users"));
3941
// then
4042
result.andExpectAll(
41-
status().isOk(),
42-
jsonPath("$.totalElements").value(3),
43-
// 가장 최근 로그인한 USER3이 첫 번째
44-
jsonPath("$.users[0].nickname").value("USER3"),
45-
// 중간 로그인한 USER2가 두 번째
46-
jsonPath("$.users[1].nickname").value("USER2"),
47-
// 가장 오래된 로그인한 USER1이 세 번째
48-
jsonPath("$.users[2].nickname").value("USER1")
49-
);
43+
status().isOk(),
44+
jsonPath("$.totalElements").value(3),
45+
// 가장 최근 로그인한 USER3이 첫 번째
46+
jsonPath("$.users[0].nickname").value("USER3"),
47+
// 중간 로그인한 USER2가 두 번째
48+
jsonPath("$.users[1].nickname").value("USER2"),
49+
// 가장 오래된 로그인한 USER1이 세 번째
50+
jsonPath("$.users[2].nickname").value("USER1"));
5051
}
5152
}

0 commit comments

Comments
 (0)