Skip to content

45 timezone #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 27, 2015
Merged

45 timezone #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74791f1
Bugfix of Timezone issue
shunjikonishi May 26, 2015
90f0196
Rewrite Option#get
shunjikonishi May 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions src/main/scala/codecheck/github/models/Issue.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.json4s.JInt
import org.json4s.JArray
import org.json4s.JsonDSL._
import org.joda.time.DateTime
import org.joda.time.DateTimeZone

import codecheck.github.utils.ToDo

Expand Down Expand Up @@ -77,7 +78,7 @@ case class IssueListOption(
) {
def q = s"?filter=$filter&state=$state&sort=$sort&direction=$direction" +
(if (!labels.isEmpty) "&labels=" + labels.mkString(",") else "") +
(if (!since.isEmpty) (since map ("&since=" + _.toString("yyyy-MM-dd'T'HH:mm:ss'Z'"))).get else "")
since.map("&since=" + _.toDateTime(DateTimeZone.UTC).toString("yyyy-MM-dd'T'HH:mm:ss'Z'")).getOrElse("")
}

case class IssueListOption4Repository(
Expand All @@ -91,15 +92,13 @@ case class IssueListOption4Repository(
direction: SortDirection = SortDirection.desc,
since: Option[DateTime] = None
) {
def q = "?" + (if (!milestone.isEmpty) (milestone map (t => s"milestone=$t&")).get else "") +
s"state=$state" +
(if (!assignee.isEmpty) (assignee map (t => s"&assignee=$t")).get else "") +
(if (!creator.isEmpty) (creator map (t => s"&creator=$t")).get else "") +
(if (!mentioned.isEmpty) (mentioned map (t => s"&mentioned=$t")).get else "") +
def q = s"?state=$state&sort=$sort&direction=$direction" +
milestone.map(t => s"milestone=$t&").getOrElse("") +
assignee.map(t => s"&assignee=$t").getOrElse("") +
creator.map(t => s"&creator=$t").getOrElse("") +
mentioned.map(t => s"&mentioned=$t").getOrElse("") +
(if (!labels.isEmpty) "&labels=" + labels.mkString(",") else "") +
s"&sort=$sort" +
s"&direction=$direction" +
(if (!since.isEmpty) (since map ("&since=" + _.toString("yyyy-MM-dd'T'HH:mm:ss'Z'"))).get else "")
since.map("&since=" + _.toDateTime(DateTimeZone.UTC).toString("yyyy-MM-dd'T'HH:mm:ss'Z'")).getOrElse("")
}

case class IssueInput(
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/IssueOpSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class IssueOpSpec extends FunSpec with Constants with BeforeAndAfterAll {
val number = 1
var nUser: Long = 0
var nOrg: Long = 0
var nTime: DateTime = DateTime.now().toDateTime(DateTimeZone.UTC)
var nTime: DateTime = DateTime.now
val tRepo = repo + "2"

override def beforeAll() {
Expand Down