Develop

.github/workflows/aws.yml

@@ -30,21 +30,17 @@ jobs:
 
       - name: Build JAR
         run: |
+          ./gradlew spotlessCheck
+
           if [ "${{ github.ref }}" == "refs/heads/main" ]; then
             ./gradlew clean build -x test -Dspring.profiles.active=production
           else
             ./gradlew clean build -x test -Dspring.profiles.active=dev
           fi
 
-      - name: Debug build/libs
-        run: ls -al ./build/libs
-
       - name: Copy JAR to Docker context
         run: cp ./build/libs/Kindergarten-0.0.1-SNAPSHOT.jar ./docker/app/app.jar
 
-      - name: Debug docker/app
-        run: ls -al ./docker/app
-
       - name: Build and Push Docker image
         uses: docker/build-push-action@v5
         with:
@@ -96,13 +92,6 @@ jobs:
             sudo docker compose pull
             sudo docker compose up -d --remove-orphans
 
-      - name: Debug upload paths
-        run: |
-          set -e
-          ls -al docker/app/docker-compose.yml
-          ls -al docker/loki/config/config.yml
-          ls -al docker/promtail/config/config.yml      
-
       - name: Upload stack files (dev)
         if: github.ref == 'refs/heads/develop'
         uses: appleboy/scp-action@v1

build.gradle

@@ -2,6 +2,7 @@ plugins {
 	id 'java'
 	id 'org.springframework.boot' version '3.2.2'
 	id 'io.spring.dependency-management' version '1.1.7'
+	id 'com.diffplug.spotless' version '6.25.0'
 }
 
 group = 'com.onebyone'
@@ -15,6 +16,28 @@ java {
 
 repositories {
 	mavenCentral()
+	gradlePluginPortal()
+}
+
+spotless {
+	java {
+		importOrder(
+				'java|javax|jakarta',
+				'org.springframework',
+				'lombok',
+				'',
+				'org.junit|org.mockito',
+				'\\#',
+				'\\#org.junit'
+		)
+
+		googleJavaFormat()
+
+		formatAnnotations()
+		removeUnusedImports()
+		trimTrailingWhitespace()
+		endWithNewline()
+	}
 }
 
 ext {

src/main/java/com/onebyone/kindergarten/KindergartenApplication.java

@@ -12,8 +12,7 @@
 @EnableScheduling
 public class KindergartenApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(KindergartenApplication.class, args);
-	}
-
+  public static void main(String[] args) {
+    SpringApplication.run(KindergartenApplication.class, args);
+  }
 }

src/main/java/com/onebyone/kindergarten/domain/address/controller/AddressController.java

@@ -4,6 +4,7 @@
 import com.onebyone.kindergarten.domain.address.service.AddressService;
 import com.onebyone.kindergarten.global.facade.AddressFacade;
 import io.swagger.v3.oas.annotations.Operation;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.security.core.userdetails.UserDetails;
@@ -12,34 +13,28 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/address")
 public class AddressController {
-    private final AddressFacade addressFacade;
-    private final AddressService addressService;
+  private final AddressFacade addressFacade;
+  private final AddressService addressService;
 
-    @PostMapping("/batch/region")
-    @Operation(summary = "행정구역 등록 배치", description = "kindergarten 테이블의 region 컬럼에 데이터를 매핑시킵니다")
-    public void kindergartenRegionBatch(
-            @AuthenticationPrincipal UserDetails userDetails
-    ) {
-        addressFacade.regionBatch(userDetails.getUsername());
-    }
+  @PostMapping("/batch/region")
+  @Operation(summary = "행정구역 등록 배치", description = "kindergarten 테이블의 region 컬럼에 데이터를 매핑시킵니다")
+  public void kindergartenRegionBatch(@AuthenticationPrincipal UserDetails userDetails) {
+    addressFacade.regionBatch(Long.valueOf(userDetails.getUsername()));
+  }
 
-    @PostMapping("/batch/sub-region")
-    @Operation(summary = "시군구 등록 배치", description = "kindergarten 테이블의 subRegion 컬럼에 데이터를 매핑시킵니다")
-    public void kindergartenSubRegionBatch(
-            @AuthenticationPrincipal UserDetails userDetails
-    ) {
-        addressFacade.subRegionBatch(userDetails.getUsername());
-    }
+  @PostMapping("/batch/sub-region")
+  @Operation(summary = "시군구 등록 배치", description = "kindergarten 테이블의 subRegion 컬럼에 데이터를 매핑시킵니다")
+  public void kindergartenSubRegionBatch(@AuthenticationPrincipal UserDetails userDetails) {
+    addressFacade.subRegionBatch(Long.valueOf(userDetails.getUsername()));
+  }
 
-    @GetMapping
-    @Operation(summary = "주소 조회", description = "주소 정보를 조회합니다.")
-    public List<AddressResponseDTO> getAddress() {
-        return addressService.getAddress();
-    }
+  @GetMapping
+  @Operation(summary = "주소 조회", description = "주소 정보를 조회합니다.")
+  public List<AddressResponseDTO> getAddress() {
+    return addressService.getAddress();
+  }
 }

src/main/java/com/onebyone/kindergarten/domain/address/dto/AddressResponseDTO.java

@@ -1,12 +1,11 @@
 package com.onebyone.kindergarten.domain.address.dto;
 
-import lombok.Data;
-
 import java.util.List;
+import lombok.Data;
 
 @Data
 public class AddressResponseDTO {
-    private Long regionId;
-    private String regionName;
-    private List<SubRegionResponseDTO> subRegions;
-}
+  private Long regionId;
+  private String regionName;
+  private List<SubRegionResponseDTO> subRegions;
+}

src/main/java/com/onebyone/kindergarten/domain/address/dto/RegionDTO.java

@@ -4,6 +4,6 @@
 
 @Data
 public class RegionDTO {
-    private Long id;
-    private String name;
+  private Long id;
+  private String name;
 }

src/main/java/com/onebyone/kindergarten/domain/address/dto/SubRegionDTO.java

@@ -1,15 +1,14 @@
 package com.onebyone.kindergarten.domain.address.dto;
 
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Data;
 
 @Data
 public class SubRegionDTO {
-    private Long subRegionId;
-    private Long regionId;
-    private String name;
-    private Long parentId;
-    private List<SubRegionDTO> children = new ArrayList<>();
+  private Long subRegionId;
+  private Long regionId;
+  private String name;
+  private Long parentId;
+  private List<SubRegionDTO> children = new ArrayList<>();
 }

src/main/java/com/onebyone/kindergarten/domain/address/dto/SubRegionResponseDTO.java

@@ -1,13 +1,12 @@
 package com.onebyone.kindergarten.domain.address.dto;
 
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Data;
 
 @Data
 public class SubRegionResponseDTO {
-    private Long subRegionId;
-    private String name;
-    private List<SubRegionResponseDTO> children = new ArrayList<>();
+  private Long subRegionId;
+  private String name;
+  private List<SubRegionResponseDTO> children = new ArrayList<>();
 }

src/main/java/com/onebyone/kindergarten/domain/address/entity/Region.java

@@ -2,30 +2,29 @@
 
 import com.onebyone.kindergarten.domain.address.dto.RegionDTO;
 import jakarta.persistence.*;
-import lombok.Getter;
-
 import java.util.ArrayList;
 import java.util.List;
+import lombok.Getter;
 
 @Entity
 @Getter
 @Table(name = "region")
 public class Region {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "region_id")
-    private Long regionId;
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "region_id")
+  private Long regionId;
 
-    private String name;
+  private String name;
 
-    @OneToMany(mappedBy = "region", fetch = FetchType.LAZY)
-    private List<SubRegion> subRegions = new ArrayList<>();
+  @OneToMany(mappedBy = "region", fetch = FetchType.LAZY)
+  private List<SubRegion> subRegions = new ArrayList<>();
 
-    public static RegionDTO toDto(Region region) {
-        RegionDTO regionDTO = new RegionDTO();
-        regionDTO.setId(region.getRegionId());
-        regionDTO.setName(region.getName());
+  public static RegionDTO toDto(Region region) {
+    RegionDTO regionDTO = new RegionDTO();
+    regionDTO.setId(region.getRegionId());
+    regionDTO.setName(region.getName());
 
-        return regionDTO;
-    }
+    return regionDTO;
+  }
 }

src/main/java/com/onebyone/kindergarten/domain/address/entity/SubRegion.java

@@ -8,32 +8,32 @@
 @Getter
 @Table(name = "sub_region")
 public class SubRegion {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "sub_region_id")
-    private Long subRegionId;
-
-    private String name; // 수원시, 장안구
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "region_id")
-    private Region region; // 경기도
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parent_id")
-    private SubRegion parent; // 장안구 parent (수원시)
-
-    public Long getRegionId() {
-        return region != null ? region.getRegionId() : null;
-    }
-
-    public static SubRegionDTO toDTO(SubRegion subRegion) {
-        SubRegionDTO dto = new SubRegionDTO();
-        dto.setSubRegionId(subRegion.getSubRegionId());
-        dto.setRegionId(subRegion.getRegionId());
-        dto.setName(subRegion.getName());
-        dto.setParentId(subRegion.getParent() != null ? subRegion.getParent().getSubRegionId() : null);
-
-        return dto;
-    }
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "sub_region_id")
+  private Long subRegionId;
+
+  private String name; // 수원시, 장안구
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "region_id")
+  private Region region; // 경기도
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "parent_id")
+  private SubRegion parent; // 장안구 parent (수원시)
+
+  public Long getRegionId() {
+    return region != null ? region.getRegionId() : null;
+  }
+
+  public static SubRegionDTO toDTO(SubRegion subRegion) {
+    SubRegionDTO dto = new SubRegionDTO();
+    dto.setSubRegionId(subRegion.getSubRegionId());
+    dto.setRegionId(subRegion.getRegionId());
+    dto.setName(subRegion.getName());
+    dto.setParentId(subRegion.getParent() != null ? subRegion.getParent().getSubRegionId() : null);
+
+    return dto;
+  }
 }

src/main/java/com/onebyone/kindergarten/domain/address/repository/RegionRepository.java

@@ -5,5 +5,4 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface RegionRepository extends JpaRepository<Region, Long> {
-}
+public interface RegionRepository extends JpaRepository<Region, Long> {}

src/main/java/com/onebyone/kindergarten/domain/address/repository/SubRegionRepository.java

@@ -5,6 +5,6 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface SubRegionRepository extends JpaRepository<SubRegion,Long> {
-    SubRegion findBySubRegionId(Long subRegionId);
+public interface SubRegionRepository extends JpaRepository<SubRegion, Long> {
+  SubRegion findBySubRegionId(Long subRegionId);
 }