Merge pull request #119 from Capstone-OpenStep/feature/#111-issue-detail-by-url

Refactor: Task status 조회시 MERGED 상태 조회 오류 수정

Author: ParkJh38

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

@@ -54,11 +54,21 @@ 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")) {
+        } else if (Objects.equals(pr.state(), "closed") && pr.mergedAt() == null) {
             newStatus = TaskStatus.REJECTED;
         } else if (gitHubRestService.hasReview(owner, repo, pr.number(), githubToken)) {
             newStatus = TaskStatus.REVIEW;