refactor: 라인 포맷팅

BCSDLab · Jun 25, 2024 · 55a7650 · 55a7650
1 parent b92add0
commit 55a7650
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 68 deletions.
diff --git a/src/main/java/in/koreatech/koin/admin/land/controller/AdminLandApi.java b/src/main/java/in/koreatech/koin/admin/land/controller/AdminLandApi.java
@@ -89,8 +89,8 @@ ResponseEntity<Void> deleteLand(
     @SecurityRequirement(name = "Jwt Authentication")
     @GetMapping("/admin/lands/{id}")
     ResponseEntity<AdminLandResponse> getLand(
-        @PathVariable("id") Integer id
-        //@Auth(permit = {ADMIN}) Integer adminId
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
     );
 
     @ApiResponses(
@@ -106,8 +106,8 @@ ResponseEntity<AdminLandResponse> getLand(
     @PutMapping("/admin/lands/{id}")
     ResponseEntity<Void> updateLand(
         @PathVariable("id") Integer id,
-        @RequestBody @Valid AdminLandRequest request
-        //@Auth(permit = {ADMIN}) Integer adminId
+        @RequestBody @Valid AdminLandRequest request,
+        @Auth(permit = {ADMIN}) Integer adminId
     );
 
     @ApiResponses(
@@ -122,7 +122,7 @@ ResponseEntity<Void> updateLand(
     @SecurityRequirement(name = "Jwt Authentication")
     @PostMapping("/admin/lands/{id}/undelete")
     ResponseEntity<Void> undeleteLand(
-        @PathVariable("id") Integer id
-        //@Auth(permit = {ADMIN}) Integer adminId
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
     );
 }
diff --git a/src/main/java/in/koreatech/koin/admin/land/controller/AdminLandController.java b/src/main/java/in/koreatech/koin/admin/land/controller/AdminLandController.java
@@ -57,26 +57,26 @@ public ResponseEntity<Void> deleteLand(
 
     @GetMapping("/admin/lands/{id}")
     public ResponseEntity<AdminLandResponse> getLand(
-        @PathVariable("id") Integer id
-        //@Auth(permit = {ADMIN}) Integer adminId
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
     ) {
         return ResponseEntity.ok().body(adminLandService.getLand(id));
     }
 
     @PutMapping("/admin/lands/{id}")
     public ResponseEntity<Void> updateLand(
         @PathVariable("id") Integer id,
-        @RequestBody @Valid AdminLandRequest request
-        //@Auth(permit = {ADMIN}) Integer adminId
+        @RequestBody @Valid AdminLandRequest request,
+        @Auth(permit = {ADMIN}) Integer adminId
     ) {
         adminLandService.updateLand(id, request);
         return ResponseEntity.ok().build();
     }
 
     @PostMapping("/admin/lands/{id}/undelete")
     public ResponseEntity<Void> undeleteLand(
-        @PathVariable("id") Integer id
-        //@Auth(permit = {ADMIN}) Integer adminId
+        @PathVariable("id") Integer id,
+        @Auth(permit = {ADMIN}) Integer adminId
     ) {
         adminLandService.undeleteLand(id);
         return ResponseEntity.ok().build();

diff --git a/src/main/java/in/koreatech/koin/admin/land/dto/AdminLandRequest.java b/src/main/java/in/koreatech/koin/admin/land/dto/AdminLandRequest.java
@@ -1,6 +1,5 @@
 package in.koreatech.koin.admin.land.dto;
 
-
 import java.util.List;
 
 import static com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;

diff --git a/src/test/java/in/koreatech/koin/admin/acceptance/AdminLandApiTest.java b/src/test/java/in/koreatech/koin/admin/acceptance/AdminLandApiTest.java
@@ -78,32 +78,32 @@ void getLands() {
     @DisplayName("관리자 권한으로 복덕방을 추가한다.")
     void postLands() {
         String jsonBody = """
-    {
-        "name": "금실타운",
-        "internal_name": "금실타운",
-        "size": "9.0",
-        "room_type": "원룸",
-        "latitude": "37.555",
-        "longitude": "126.555",
-        "phone": "041-111-1111",
-        "image_urls": ["http://image1.com", "http://image2.com"],
-        "address": "충청남도 천안시 동남구 병천면",
-        "description": "1년 계약시 20만원 할인",
-        "floor": 4,
-        "deposit": "30",
-        "monthly_fee": "200만원 (6개월)",
-        "charter_fee": "3500",
-        "management_fee": "21(1인 기준)",
-        "opt_closet": true,
-        "opt_tv": true,
-        "opt_microwave": true,
-        "opt_gas_range": false,
-        "opt_induction": true,
-        "opt_water_purifier": true,
-        "opt_air_conditioner": true,
-        "opt_washer": true
-    }
-    """;
+            {
+                "name": "금실타운",
+                "internal_name": "금실타운",
+                "size": "9.0",
+                "room_type": "원룸",
+                "latitude": "37.555",
+                "longitude": "126.555",
+                "phone": "041-111-1111",
+                "image_urls": ["http://image1.com", "http://image2.com"],
+                "address": "충청남도 천안시 동남구 병천면",
+                "description": "1년 계약시 20만원 할인",
+                "floor": 4,
+                "deposit": "30",
+                "monthly_fee": "200만원 (6개월)",
+                "charter_fee": "3500",
+                "management_fee": "21(1인 기준)",
+                "opt_closet": true,
+                "opt_tv": true,
+                "opt_microwave": true,
+                "opt_gas_range": false,
+                "opt_induction": true,
+                "opt_water_purifier": true,
+                "opt_air_conditioner": true,
+                "opt_washer": true
+            }
+            """;
 
         User adminUser = userFixture.코인_운영자();
         String token = userFixture.getToken(adminUser);
@@ -201,34 +201,34 @@ void getLand() {
 
         JsonAssertions.assertThat(response.asPrettyString())
             .isEqualTo(String.format("""
-            {
-                "id": %d,
-                "name": "금실타운",
-                "internal_name": "금실타운",
-                "size": null,
-                "room_type": "원룸",
-                "latitude": "37.555",
-                "longitude": "126.555",
-                "phone": null,
-                "image_urls": [],
-                "address": "가전리 123",
-                "description": "테스트용 복덕방",
-                "floor": null,
-                "deposit": null,
-                "monthly_fee": "100",
-                "charter_fee": "1000",
-                "management_fee": null,
-                "opt_closet": false,
-                "opt_tv": false,
-                "opt_microwave": false,
-                "opt_gas_range": false,
-                "opt_induction": false,
-                "opt_water_purifier": false,
-                "opt_air_conditioner": false,
-                "opt_washer": false,
-                "is_deleted": false
-            }
-            """, landId));
+                {
+                    "id": %d,
+                    "name": "금실타운",
+                    "internal_name": "금실타운",
+                    "size": null,
+                    "room_type": "원룸",
+                    "latitude": "37.555",
+                    "longitude": "126.555",
+                    "phone": null,
+                    "image_urls": [],
+                    "address": "가전리 123",
+                    "description": "테스트용 복덕방",
+                    "floor": null,
+                    "deposit": null,
+                    "monthly_fee": "100",
+                    "charter_fee": "1000",
+                    "management_fee": null,
+                    "opt_closet": false,
+                    "opt_tv": false,
+                    "opt_microwave": false,
+                    "opt_gas_range": false,
+                    "opt_induction": false,
+                    "opt_water_purifier": false,
+                    "opt_air_conditioner": false,
+                    "opt_washer": false,
+                    "is_deleted": false
+                }
+                """, landId));
     }
 
     @Test
@@ -336,5 +336,4 @@ void undeleteLand() {
         });
     }
 
-
 }