fix: 충돌 해결

Author: whale22

.DS_Store

@@ -47,6 +47,10 @@ dependencies {
 
 	//redis
 	implementation("org.springframework.boot:spring-boot-starter-data-redis")
+	implementation("org.springframework.session:spring-session-data-redis")
+
+	// actuator
+	implementation("org.springframework.boot:spring-boot-starter-actuator")
 
 	// Security
 	implementation("org.springframework.boot:spring-boot-starter-security")

build.gradle.kts

@@ -69,8 +69,15 @@ def _is_service_up(self, port: int) -> bool:
             response = requests.get(url, timeout=5)  # 5초 이내 응답 없으면 예외 발생
             if response.status_code == 200 and response.json().get('status') == 'UP':
                 return True
-        except requests.RequestException:
-            pass
+        except requests.RequestException as e:
+                print(f"Request failed: {e}")
+                # `response` 객체가 존재한다면 응답 본문 출력
+                if 'response' in locals():
+                    print(f"Invalid JSON response: {response.text}")
+                else:
+                    print("No response received.")
+        except ValueError as e:
+            print(f"JSON parsing failed: {e}")
         return False
 
     # 서비스를 업데이트하는 함수

infraScript/zero_downtime_deploy.py

@@ -0,0 +1,95 @@
+package cmf.commitField.domain.commit.sinceCommit.controller;
+
+import cmf.commitField.domain.commit.sinceCommit.dto.SinceCommitResponseDto;
+import cmf.commitField.domain.commit.sinceCommit.service.SinceCommitService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+import java.time.temporal.TemporalAdjusters;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class SinceCommitController {
+    private final SinceCommitService sinceCommitService;
+
+    @GetMapping("/api/github/commits-since")
+    public ResponseEntity<List<SinceCommitResponseDto>> getCommits(
+            @RequestParam String owner,
+            @RequestParam String repo,
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime since,
+            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime until
+            ) {
+        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+
+    // 시즌 별 커밋 수 불러오기
+
+    // 봄 시즌
+    @GetMapping("/api/github/commits-spring")
+    public ResponseEntity<List<SinceCommitResponseDto>> getSpringSeasonCommits(
+            @RequestParam String owner,
+            @RequestParam String repo
+    ) {
+        int currentYear = LocalDateTime.now().getYear();
+        LocalDateTime since = LocalDateTime.of(2024, 3, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(2024, 5, 31, 23, 59, 59);
+
+        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+
+    // 여름 시즌
+    @GetMapping("/api/github/commits-summer")
+    public ResponseEntity<List<SinceCommitResponseDto>> getSummerSeasonCommits(
+            @RequestParam String owner,
+            @RequestParam String repo
+    ) {
+        int currentYear = LocalDateTime.now().getYear();
+        LocalDateTime since = LocalDateTime.of(currentYear, 6, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(currentYear, 8, 31, 23, 59, 59);
+
+        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+
+    // 가을 시즌
+    @GetMapping("/api/github/commits-fall")
+    public ResponseEntity<List<SinceCommitResponseDto>> getFallSeasonCommits(
+            @RequestParam String owner,
+            @RequestParam String repo
+    ) {
+        int currentYear = LocalDateTime.now().getYear();
+        LocalDateTime since = LocalDateTime.of(currentYear, 9, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(currentYear, 11, 30, 23, 59, 59);
+
+        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+
+    // 겨울 시즌
+    @GetMapping("/api/github/commits-winter")
+    public ResponseEntity<List<SinceCommitResponseDto>> getWinterSeasonCommits(
+            @RequestParam String owner,
+            @RequestParam String repo
+    ) {
+        int currentYear = LocalDateTime.now().getYear();
+        LocalDateTime since = LocalDateTime.of(currentYear, 12, 1, 0, 0);
+        LocalDateTime until = LocalDateTime.of(currentYear + 1, 2, 1, 23, 59, 59)
+                .with(TemporalAdjusters.lastDayOfMonth()); // 윤년 고려
+
+        List<SinceCommitResponseDto> sinceCommits = sinceCommitService.getSinceCommits(owner, repo, since, until);
+
+        return ResponseEntity.ok(sinceCommits);
+    }
+}