Add IssueStateFilter separate from IssueState

* src/main/scala/codecheck/github/models/Issue.scala (IssueStateFilter):
Add new type for filtering separate from IssueState.
(IssueListOption, IssueListOption4Repository, IssueInput):
Use new type, IssueStateFilter.

* src/main/scala/codecheck/github/app/commands/IssueCommand.scala:
Use IssueStateFilter instead of IssueState.

* src/main/scala/codecheck/github/models/PullRequest.scala
(PullRequestListOption, PullRequestRef): Use IssueStateFilter.

* src/test/scala/IssueOpSpec.scala: Use IssueStateFilter.

Author: ashawley

Diff for: src/main/scala/codecheck/github/app/commands/IssueCommand.scala

@@ -9,7 +9,7 @@ import codecheck.github.app.CommandSetting
 import codecheck.github.app.Repo
 import codecheck.github.models.IssueListOption
 import codecheck.github.models.IssueFilter
-import codecheck.github.models.IssueState
+import codecheck.github.models.IssueStateFilter
 import codecheck.github.models.IssueSort
 import codecheck.github.models.SortDirection
 import codecheck.github.utils.PrintList
@@ -32,7 +32,7 @@ class IssueCommand(val api: GitHubAPI) extends Command {
 
     def listOption = IssueListOption(
       IssueFilter.fromString(filter),
-      IssueState.fromString(state),
+      IssueStateFilter.fromString(state),
       labels,
       IssueSort.fromString(sort),
       SortDirection.fromString(direction),

Diff for: src/main/scala/codecheck/github/models/Issue.scala

@@ -19,7 +19,20 @@ sealed abstract class IssueState(val name: String) {
 object IssueState {
   case object open extends IssueState("open")
   case object closed extends IssueState("closed")
-  case object all extends IssueState("all")
+
+  val values = Array(open, closed)
+
+  def fromString(str: String) = values.filter(_.name == str).head
+}
+
+sealed abstract class IssueStateFilter(val name: String) {
+  override def toString = name
+}
+
+object IssueStateFilter {
+  case object open extends IssueStateFilter("open")
+  case object closed extends IssueStateFilter("closed")
+  case object all extends IssueStateFilter("all")
 
   val values = Array(open, closed, all)
 
@@ -70,7 +83,7 @@ object MilestoneSearchOption {
 
 case class IssueListOption(
   filter: IssueFilter = IssueFilter.assigned,
-  state: IssueState = IssueState.open,
+  state: IssueStateFilter = IssueStateFilter.open,
   labels: Seq[String] = Nil,
   sort: IssueSort = IssueSort.created,
   direction: SortDirection = SortDirection.desc,
@@ -83,7 +96,7 @@ case class IssueListOption(
 
 case class IssueListOption4Repository(
   milestone: Option[MilestoneSearchOption] = None,
-  state: IssueState = IssueState.open,
+  state: IssueStateFilter = IssueStateFilter.open,
   assignee: Option[String] = None,
   creator: Option[String] = None,
   mentioned: Option[String] = None,
@@ -107,7 +120,7 @@ case class IssueInput(
   assignee: Option[String] = None,
   milestone: Option[Int] = None,
   labels: Seq[String] = Nil,
-  state: Option[IssueState] = None
+  state: Option[IssueStateFilter] = None
 ) extends AbstractInput {
   override val value: JValue = {
     val a = assignee.map { s =>

Diff for: src/main/scala/codecheck/github/models/PullRequest.scala

@@ -39,7 +39,7 @@ object PullRequestAction {
 }
 
 case class PullRequestListOption(
-  state: IssueState = IssueState.open,
+  state: IssueStateFilter = IssueStateFilter.open,
   head: Option[String] = None,
   base: Option[String] = None,
   sort: IssueSort = IssueSort.created,

Diff for: src/test/scala/IssueOpSpec.scala

@@ -7,7 +7,7 @@ import org.joda.time.DateTimeZone
 import codecheck.github.models.IssueListOption
 import codecheck.github.models.IssueFilter
 import codecheck.github.models.IssueListOption4Repository
-import codecheck.github.models.IssueState
+import codecheck.github.models.IssueStateFilter
 import codecheck.github.models.Issue
 import codecheck.github.models.IssueInput
 import codecheck.github.models.MilestoneSearchOption
@@ -116,7 +116,7 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
     }
 
     it("shold return only two issues when using options.") {
-      val option = IssueListOption(IssueFilter.created, IssueState.open, Seq("question"), since=Some(nTime))
+      val option = IssueListOption(IssueFilter.created, IssueStateFilter.open, Seq("question"), since=Some(nTime))
       val result = Await.result(api.listAllIssues(option), TIMEOUT)
       assert(result.length > 0)
       assert(result.head.title == "test issue")
@@ -130,7 +130,7 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
     }
 
     it("shold return only one issues when using options.") {
-      val option = IssueListOption(IssueFilter.created, IssueState.open, Seq("question"), since=Some(nTime))
+      val option = IssueListOption(IssueFilter.created, IssueStateFilter.open, Seq("question"), since=Some(nTime))
       val result = Await.result(api.listUserIssues(option), TIMEOUT)
       assert(result.length > 0)
       assert(result.head.title == "test issue")
@@ -149,23 +149,23 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
     }
 
     it("should return only one issue from user's own repo when using options.") {
-      val option = new IssueListOption4Repository(Some(MilestoneSearchOption(1)), IssueState.open, Some(user), Some(user), labels=Seq("question"), since=Some(nTime))
+      val option = new IssueListOption4Repository(Some(MilestoneSearchOption(1)), IssueStateFilter.open, Some(user), Some(user), labels=Seq("question"), since=Some(nTime))
       val result = Await.result(api.listRepositoryIssues(user, userRepo, option), TIMEOUT)
       //showResponse(option.q)
       assert(result.length == 1)
       assert(result.head.title == "test issue")
     }
 
     it("should return only one issue from organization's repo when using options.") {
-      val option = new IssueListOption4Repository(None, IssueState.open, None, Some(user), labels=Nil, since=Some(nTime))
+      val option = new IssueListOption4Repository(None, IssueStateFilter.open, None, Some(user), labels=Nil, since=Some(nTime))
       val result = Await.result(api.listRepositoryIssues(organization, tRepo, option), TIMEOUT)
       assert(result.length == 1)
       assert(result.head.title == "test issue")
     }
   }
 
   describe("editIssue(owner, repo, number, input)") {
-    val input = IssueInput(Some("test issue edited"), Some("testing again"), Some(user), None, Seq("question", "bug"), Some(IssueState.closed))
+    val input = IssueInput(Some("test issue edited"), Some("testing again"), Some(user), None, Seq("question", "bug"), Some(IssueStateFilter.closed))
 
     it("should edit the issue in user's own repo.") {
       val result = Await.result(api.editIssue(user, userRepo, nUser, input), TIMEOUT)