fix: 봉사시간 계산 테스트 날짜 수정

- 월요일이 주의 시작으로 계산되어 발생하는 테스트 에러 수정

Author: 7zrv

.github/workflows/CI.yml

@@ -15,7 +15,7 @@ jobs:
       DB_URL: ${{ secrets.DB_URL }}
       DB_USERNAME: ${{ secrets.DB_USERNAME }}
       DB_PASSWORD: ${{ secrets.DB_PASSWORD }}
-      REDIS_HOST: ${{ secrets.REDIS_HOST }}
+      REDIS_HOST: ${{ secrets.REDIS_HOST}}
       REDIS_PORT: ${{ secrets.REDIS_PORT }}
       NAVER_CLIENT_ID: ${{ secrets.NAVER_CLIENT_ID }}
       NAVER_CLIENT_SECRET: ${{ secrets.NAVER_CLIENT_SECRET }}
@@ -35,11 +35,12 @@ jobs:
       S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
       DEFAULT_IMG_URL: ${{ secrets.DEFAULT_IMG_URL }}
       APP_DEVELOP_MODE: ${{ secrets.APP_DEVELOP_MODE }}
-      ELASTIC_URI: ${{ secrets.ELASTIC_URI }}
+      ELASTIC_URI=localhost: ${{ secrets.ELASTIC_URI }}
       ELASTIC_USERNAME: ${{ secrets.ELASTIC_USERNAME }}
       ELASTIC_PASSWORD: ${{ secrets.ELASTIC_PASSWORD }}
       LOKI_URL: ${{ secrets.LOKI_URL }}
 
+      TESTCONTAINERS_REUSE_ENABLE: true
       TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE: /var/run/docker.sock
       DOCKER_HOST: unix:///var/run/docker.sock
 
@@ -49,25 +50,15 @@ jobs:
         ports:
           - 6379:6379
 
-      mysql:
-        image: mysql:8.0
-        env:
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_DATABASE: test
-        ports:
-          - 3306:3306
-        options: >-
-          --health-cmd="mysqladmin ping -h localhost"
-          --health-interval=10s
-          --health-timeout=5s
-          --health-retries=3
-
     steps:
       - name: Github Repository 파일 불러오기
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
       - name: JDK 21 버전 설치
         uses: actions/setup-java@v4
         with:
@@ -91,11 +82,6 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
-      - name: Docker 설정 확인
-        run: |
-          sudo chmod 666 /var/run/docker.sock
-          docker info
-
       - name: 빌드 권한 부여
         run: chmod +x ./gradlew
         shell: bash
@@ -112,7 +98,7 @@ jobs:
         uses: actions/github-script@v6
         with:
           github-token: ${{ github.TOKEN }}
-          script: |
+          script: | 
             const pull_number = ${{ github.event.pull_request.number }}
             const updated_title = `[BUILD FAIL] ${{ github.event.pull_request.title }}`
             await github.rest.pulls.createReview({

src/test/java/com/somemore/domains/volunteerrecord/repository/VolunteerRecordRepositoryTest.java

@@ -8,7 +8,9 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
 import java.util.List;
 import java.util.UUID;
 
@@ -51,7 +53,7 @@ void findTotalTopRankingWithTies() {
     void findVolunteerWeeklyRanking() {
 
         // given
-        LocalDate currentDate = LocalDate.now();
+        LocalDate currentDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY));
 
         // 이번 주 데이터
         volunteerRecordrepository.save(VolunteerRecord.create(UUID.randomUUID(), "이번주 봉사1", currentDate, 100));
@@ -85,7 +87,7 @@ void findVolunteerWeeklyRanking() {
     void fineVolunteerMonthlyRanking() {
 
         // given
-        LocalDate currentDate = LocalDate.now();
+        LocalDate currentDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY));
 
         // 이번 달 데이터
         volunteerRecordrepository.save(VolunteerRecord.create(UUID.randomUUID(), "이번달 봉사1", currentDate, 100));

src/test/java/com/somemore/domains/volunteerrecord/service/CalculateRankingServiceTest.java

@@ -9,7 +9,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -56,7 +58,7 @@ void calculateTotalVolunteerRanking() {
     void calculateWeeklyVolunteerRanking() {
 
         // given
-        LocalDate currentDate = LocalDate.now();
+        LocalDate currentDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY));
 
         // 이번 주 데이터
         volunteerRecordRepository.save(VolunteerRecord.create(UUID.randomUUID(), "이번주봉사1", currentDate, 100));
@@ -89,7 +91,7 @@ void calculateWeeklyVolunteerRanking() {
     void calculateMonthlyVolunteerRanking() {
 
         // given
-        LocalDate currentDate = LocalDate.now();
+        LocalDate currentDate = LocalDate.now().with(TemporalAdjusters.previousOrSame(DayOfWeek.SUNDAY));
 
         // 이번 달 데이터
         volunteerRecordRepository.save(VolunteerRecord.create(UUID.randomUUID(), "이번달봉사1", currentDate, 100));

src/test/java/com/somemore/support/TestContainerSupport.java

@@ -10,32 +10,31 @@
 public abstract class TestContainerSupport {
 
     private static final String REDIS_IMAGE = "redis:latest";
-    private static final int REDIS_PORT = 6379;
+//    private static final int REDIS_PORT = 6379;
     private static final String MYSQL_IMAGE = "mysql:8";
 
-    private static final GenericContainer REDIS;
+//    private static final GenericContainer REDIS;
     private static final JdbcDatabaseContainer MYSQL;
 
     static {
-        REDIS = new GenericContainer(DockerImageName.parse(REDIS_IMAGE))
-                .withExposedPorts(REDIS_PORT)
-                .withReuse(true);
+//        REDIS = new GenericContainer(DockerImageName.parse(REDIS_IMAGE))
+//                .withExposedPorts(REDIS_PORT)
+//                .withReuse(true);
         MYSQL = new MySQLContainer(MYSQL_IMAGE);
 
-        REDIS.start();
+//        REDIS.start();
         MYSQL.start();
     }
 
     @DynamicPropertySource
     public static void overrideProps(DynamicPropertyRegistry registry){
-        registry.add("spring.data.redis.host", REDIS::getHost);
-        registry.add("spring.data.redis.port", () -> String.valueOf(REDIS.getMappedPort(REDIS_PORT)));
-    }
-    @DynamicPropertySource
-    public static void overrideProps2(DynamicPropertyRegistry registry){
+//        registry.add("spring.data.redis.host", REDIS::getHost);
+//        registry.add("spring.data.redis.port", () -> String.valueOf(REDIS.getMappedPort(REDIS_PORT)));
+
         registry.add("spring.datasource.driver-class-name", MYSQL::getDriverClassName);
         registry.add("spring.datasource.url", MYSQL::getJdbcUrl);
         registry.add("spring.datasource.~username", MYSQL::getUsername);
         registry.add("spring.datasource.password", MYSQL::getPassword);
     }
+
 }