Merge pull request #134 from GoormOnlyOne/develop

[deploy] 자동 정산 기능 / 테스트 코드 추가

Author: gkdudans

.github/workflows/github-actions.yml

@@ -10,11 +10,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 17
+          java-version: 21
 
       - name: Make application-prod.yml
         run: |

.gitignore

@@ -41,9 +41,12 @@ src/main/resources/firebase/service-account.json
 application.yml
 src/main/resources/application.yml
 src/main/resources/application-prod.yml
+src/main/resources/application-test.yml
 src/main/resources/firebase/
 
 .DS_Store
-
-src/main/resources/application-prod.yml
 CLAUDE.md
+spy.log
+src/test/resources/application-test.yml
+src/test/resources/data.sql
+src/main/resources/ValidationMessages.properties

Dockerfile

@@ -1,5 +1,5 @@
 # 사용할 base 이미지 선택
-FROM openjdk:17
+FROM openjdk:21
 
 # build/libs/ 에 있는 jar 파일을 JAR_FILE 변수에 저장
 ARG JAR_FILE=build/libs/*.jar

build.gradle

@@ -2,14 +2,15 @@ plugins {
     id 'java'
     id 'org.springframework.boot' version '3.5.4'
     id 'io.spring.dependency-management' version '1.1.7'
+    id 'jacoco'
 }
 
 group = 'com.example'
 version = '0.0.1-SNAPSHOT'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
 
@@ -24,6 +25,7 @@ ext {
 dependencyManagement {
     imports {
         mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+        mavenBom "org.testcontainers:testcontainers-bom:1.20.2"
     }
 }
 
@@ -38,6 +40,7 @@ dependencies {
     compileOnly 'org.projectlombok:lombok'
     developmentOnly 'org.springframework.boot:spring-boot-devtools'
     runtimeOnly 'com.mysql:mysql-connector-j'
+    runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.security:spring-security-test'
@@ -65,8 +68,90 @@ dependencies {
     implementation 'software.amazon.awssdk:s3:2.32.11'
     // Redis
     implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+    testImplementation 'org.testcontainers:junit-jupiter'
+    testImplementation 'org.testcontainers:testcontainers'
+    // jpa 쿼리 확인
+    implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
 }
 
 tasks.named('test') {
     useJUnitPlatform()
+    finalizedBy jacocoTestReport
+
+    // notification 관련 테스트 임시 제외
+    exclude '**/AppNotificationControllerTest.class'
+    exclude '**/FcmServiceTest.class'
+    exclude '**/SseEmittersServiceTest.class'
+    exclude '**/AppNotificationTypeRepositoryTest.class'
+    exclude '**/search/**'
+    exclude '**/club/repository/**'
+}
+
+jacoco {
+    toolVersion = "0.8.13"
+}
+
+jacocoTestReport {
+    dependsOn test
+    reports {
+        html.required = true
+        xml.required = true
+        csv.required = false
+        html.outputLocation = layout.buildDirectory.dir('jacocoHtml')
+        xml.outputLocation = layout.buildDirectory.file('jacoco/jacoco.xml')
+    }
+    
+    // 제외할 패키지/클래스 설정
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: [
+                // 설정 클래스들
+                '**/config/**',
+                '**/configuration/**',
+                
+                // DTO/Entity/Enum 클래스들 (비즈니스 로직 없음)
+                '**/dto/**',
+                '**/entity/**',
+                '**/domain/**/entity/**',
+                
+                // Application 시작 클래스
+                '**/*Application*',
+                
+                // Exception 클래스들
+                '**/exception/**',
+                '**/global/exception/**',
+                
+                // 기타 유틸리티
+                '**/util/**',
+                '**/common/**',
+
+                '**/search/**',
+                '**/club/repository/**'
+            ])
+        }))
+    }
+}
+
+// 테스트 커버리지 최소 기준 설정
+jacocoTestCoverageVerification {
+    dependsOn jacocoTestReport
+    violationRules {
+        rule {
+            limit {
+                minimum = 0.80  // 80% 커버리지 요구
+            }
+        }
+        
+        rule {
+            enabled = true
+            element = 'CLASS'
+            includes = ['com.example.onlyone.domain.*.service.*']
+            
+            limit {
+                counter = 'LINE'
+                value = 'COVEREDRATIO'
+                minimum = 0.75  // Service 클래스는 75% 이상
+            }
+        }
+    }
 }

src/main/java/com/example/onlyone/domain/chat/entity/UserChatRoom.java

@@ -5,6 +5,7 @@
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.*;
+import org.hibernate.annotations.Cascade;
 
 @Entity
 @Table(name = "user_chat_room")
@@ -19,7 +20,7 @@ public class UserChatRoom extends BaseTimeEntity {
     @Column(name = "user_chat_room_id", updatable = false, nullable = false)
     private Long userChatRoomId;
 
-    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.PERSIST)
     @JoinColumn(name = "chat_room_id", updatable = false)
     private ChatRoom chatRoom;
 

src/main/java/com/example/onlyone/domain/club/controller/ClubController.java

@@ -2,7 +2,6 @@
 
 import com.example.onlyone.domain.club.dto.request.ClubRequestDto;
 import com.example.onlyone.domain.club.dto.response.ClubDetailResponseDto;
-import com.example.onlyone.domain.club.dto.response.ClubNameResponseDto;
 import com.example.onlyone.domain.club.service.ClubService;
 import com.example.onlyone.global.common.CommonResponse;
 import io.swagger.v3.oas.annotations.Operation;

src/main/java/com/example/onlyone/domain/club/dto/request/ClubRequestDto.java

@@ -2,19 +2,21 @@
 
 import com.example.onlyone.domain.club.entity.Club;
 import com.example.onlyone.domain.interest.entity.Interest;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import jakarta.validation.constraints.*;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
+@AllArgsConstructor
 public class ClubRequestDto {
     @NotBlank
     @Size(max = 20, message = "모임명은 20자 이내여야 합니다.")
     private String name;
-    @NotNull
+    @Min(value = 1, message = "정원은 1명 이상이어야 합니다.")
+    @Max(value = 100, message = "정원은 100명 이하여야 합니다.")
     private int userLimit;
     @Size(max = 50, message = "모임 설명은 50자 이내여야 합니다.")
+    @NotBlank
     private String description;
     private String clubImage;
     @NotBlank

src/main/java/com/example/onlyone/domain/club/dto/response/ClubNameResponseDto.java

@@ -54,12 +54,15 @@ public class Club extends BaseTimeEntity {
     private Interest interest;
 
     @OneToMany(mappedBy = "club", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
     private List<ChatRoom> chatRooms = new ArrayList<>();
 
     @OneToMany(mappedBy = "club", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
     private List<Feed> feeds = new ArrayList<>();
 
     @OneToMany(mappedBy = "club", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
     private List<Schedule> schedules = new ArrayList<>();
 
     public void update(String name,
@@ -77,4 +80,8 @@ public void update(String name,
         this.district = district;
         this.interest = interest;
     }
+
+    public void addSchedule(Schedule schedule) {
+        schedules.add(schedule);
+    }
 }

src/main/java/com/example/onlyone/domain/club/entity/Club.java

@@ -14,14 +14,16 @@ public interface ClubRepository extends JpaRepository<Club, Long> {
     @Query("SELECT c, COUNT(uc) FROM Club c " +
             "LEFT JOIN UserClub uc ON c.clubId = uc.club.clubId " +
             "WHERE c.interest.interestId = :interestId " +
-            "GROUP BY c.clubId")
+            "GROUP BY c.clubId " +
+            "ORDER BY COUNT(uc) DESC")
     List<Object[]> searchByInterest(@Param("interestId") Long interestId, Pageable pageable);
 
     // 모임 검색 (지역)
     @Query("SELECT c, COUNT(uc) FROM Club c " +
             "LEFT JOIN UserClub uc ON c.clubId = uc.club.clubId " +
             "WHERE c.city = :city and c.district = :district " +
-            "GROUP BY c.clubId")
+            "GROUP BY c.clubId " +
+            "ORDER BY COUNT(uc) DESC")
     List<Object[]> searchByLocation(@Param("city") String city,
                                     @Param("district") String district,
                                     Pageable pageable);
@@ -109,5 +111,5 @@ ORDER BY COUNT(uc) DESC, c.createdAt DESC
     """)
     List<Object[]> findClubsByTeammates(@Param("userId") Long userId, Pageable pageable);
 
-    Club findByClubId(Long clubId);
+    Club findByClubId(long l);
 }