Merge pull request #120 from Capstone-OpenStep/hotfix/pr-status-update

fix: 깃허브에서 create, merge를 제대로 가져오지 못하는 문제 해결

Author: Miging

src/main/java/com/chungang/capstone/openstep/domain/Github/dto/PullRequestResponse.java

@@ -2,13 +2,20 @@
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class PullRequestResponse {
 	public record PullRequestRes(
 		String title,
 		int number,
 		String state,
+
 		String url,
+
+		@JsonProperty("created_at")
 		String createdAt,
+
+		@JsonProperty("merged_at")
 		String mergedAt,
 		Repository repository,
 		ClosingIssueWrapper closingIssuesReferences
@@ -23,12 +30,6 @@ public record RelatedIssueDto(
 		String authorAvatarUrl,
 		LabelWrapper labels
 	) {
-		public List<String> flatLabelNames() {
-			if (labels == null || labels.nodes() == null) return List.of();
-			return labels.nodes().stream()
-				.map(LabelNode::name)
-				.toList();
-		}
 	}
 	record Author(String login) {}
 	record LabelWrapper(

src/main/java/com/chungang/capstone/openstep/domain/Github/service/GitHubStatusResolverServiceImpl.java

@@ -54,21 +54,11 @@ public TaskStatus resolveStatus(Task task, Member member) {
             return newStatus;
         }
 
-//        TaskStatus newStatus;
-//        if (pr.mergedAt() != null) {
-//            newStatus = TaskStatus.MERGED;
-//        } else if (Objects.equals(pr.state(), "closed")) {
-//            newStatus = TaskStatus.REJECTED;
-//        } else if (gitHubRestService.hasReview(owner, repo, pr.number(), githubToken)) {
-//            newStatus = TaskStatus.REVIEW;
-//        } else {
-//            newStatus = TaskStatus.PR; // PR 생성만 된 상태
-//        }
         // 머지 or 반려 여부
         TaskStatus newStatus;
         if (pr.mergedAt() != null) {
             newStatus = TaskStatus.MERGED;
-        } else if (Objects.equals(pr.state(), "closed") && pr.mergedAt() == null) {
+        } else if (Objects.equals(pr.state(), "closed")) {
             newStatus = TaskStatus.REJECTED;
         } else if (gitHubRestService.hasReview(owner, repo, pr.number(), githubToken)) {
             newStatus = TaskStatus.REVIEW;