Refactor to use Issue.Smart.latestEvent

2 files changed, 13 insertions, 2 deletions

diff --git a/src/main/scala/com/getbootstrap/no_carrier/github/FancyIssue.scala b/src/main/scala/com/getbootstrap/no_carrier/github/FancyIssue.scala
index 83fbcb3..426dbe4 100644
--- a/src/main/scala/com/getbootstrap/no_carrier/github/FancyIssue.scala
+++ b/src/main/scala/com/getbootstrap/no_carrier/github/FancyIssue.scala
@@ -9,7 +9,7 @@ import InstantOrdering._
 class FancyIssue(val issue: Issue, val label: String, val timeout: Duration)(implicit clock: Clock) {
   lazy val lastLabelledAt: Instant = issue.lastLabelledWithAt(label).get
   lazy val lastCommentedOnAt: Option[Instant] = issue.smartComments.lastOption.map{ _.createdAt.toInstant }
-  lazy val lastClosedAt: Option[Instant] = issue.smartEvents.filter{ _.isClosed }.lastOption.map{ _.createdAt.toInstant }
+  lazy val lastClosedAt: Option[Instant] = issue.smart.lastClosure.map{ _.smart.createdAt.toInstant }
   lazy val hasSubsequentComment: Boolean = lastCommentedOnAt match {
     case None => false
     case Some(commentedAt) => lastLabelledAt < commentedAt
diff --git a/src/main/scala/com/getbootstrap/no_carrier/github/util/package.scala b/src/main/scala/com/getbootstrap/no_carrier/github/util/package.scala
index 3012bf8..5e0a5d8 100644
--- a/src/main/scala/com/getbootstrap/no_carrier/github/util/package.scala
+++ b/src/main/scala/com/getbootstrap/no_carrier/github/util/package.scala
@@ -32,9 +32,20 @@ package object util {
     }
   }
 
+  implicit class RichSmartIssue(issue: SmartIssue) {
+    def lastClosure: Option[IssueEvent] = {
+      Try{ Some(issue.latestEvent(IssueEvent.CLOSED)) }.recover{
+        case _:IllegalStateException => None
+      }.get
+    }
+  }
+
+  implicit class RichIssueEvent(event: IssueEvent) {
+    def smart: SmartIssueEvent = new SmartIssueEvent(event)
+  }
+
   implicit class RichSmartIssueEvent(event: SmartIssueEvent) {
     def isLabeled: Boolean = event.`type` == IssueEvent.LABELED
-    def isClosed: Boolean = event.`type` == IssueEvent.CLOSED
 
     def label: Option[String] = {
       Try {Option[JsonObject](event.json.getJsonObject("label")).map {_.getString("name")}}.recoverWith {