X-Git-Url: http://git.cielonegro.org/gitweb.cgi?p=task-reporter.git;a=blobdiff_plain;f=src%2Fmain%2Fscala%2Fjp%2Fymir%2FtaskReporter%2Fcore%2FTask.scala;fp=src%2Fmain%2Fscala%2Fjp%2Fymir%2FtaskReporter%2Fcore%2FTask.scala;h=71526941fd34099dc8785f03afe331ba8f5bdeae;hp=53e813d7b0c5079bed38816c010f5cc9be1c02c5;hb=b098d253574a32e3c77952987033f9e5ce35c572;hpb=cb226bf20b21a6ebc1213152f96e7bcd465cda9d

diff --git a/src/main/scala/jp/ymir/taskReporter/core/Task.scala b/src/main/scala/jp/ymir/taskReporter/core/Task.scala
index 53e813d..7152694 100644
--- a/src/main/scala/jp/ymir/taskReporter/core/Task.scala
+++ b/src/main/scala/jp/ymir/taskReporter/core/Task.scala
@@ -1,7 +1,10 @@
 package jp.ymir.taskReporter.core
 import java.util.Calendar
 import java.util.GregorianCalendar
+import scala.language.reflectiveCalls
 import scala.util.matching.Regex
+import scalaz._
+import Scalaz._
 
 case class Task(
   date:                   Calendar,
@@ -18,131 +21,46 @@ object Task {
 
   sealed abstract class Status
   object Status {
-    case object DoingFine extends Status
-    case object Lagging extends Status
-    case object DeadlineChanged extends Status
-    case object Completed extends Status
+    case object DoingFine       extends Status { override def toString() = "順調"     }
+    case object Lagging         extends Status { override def toString() = "遅延"     }
+    case object DeadlineChanged extends Status { override def toString() = "期限変更" }
+    case object Completed       extends Status { override def toString() = "完了"     }
   }
 
-  implicit def CalendarFromField = new FromField[Calendar] {
+  implicit val CalendarFromField = new FromField[Calendar] {
     val pattern = """^(\d{4})/(\d{2})/(\d{2})$""".r
 
-    def parseField(f: Field): Calendar = {
-      f match {
-        case pattern(year, month, day) =>
-          new GregorianCalendar(year.toInt, month.toInt, day.toInt)
-      }
-    }
-  }
-
-  implicit def StatusFromField = new FromField[Status] {
-    def parseField(f: Field): Status = f match {
-      case "順調"     => Status.DoingFine
-      case "遅延"     => Status.Lagging
-      case "期限変更" => Status.DeadlineChanged
-      case "完了"     => Status.Completed
-    }
-  }
-
-  implicit def TaskFromRecord = new FromRecord[Task] {
-    def parseRecord(r: Record): Task = {
-      return Task(
-        date                   = parseField[Calendar](r('報告日)),
-        ticketID               = parseField[Option[Int]](r('チケットID)),
-        title                  = parseField[String](r('作業名)),
-        expectedCompletionDate = parseField[Calendar](r('作業完了予定年月日)),
-        deadline               = parseField[Option[Calendar]](r('タスク期限)),
-        status                 = parseField[Status](r('状態)),
-        description            = parseField[Option[String]](r('説明))
-      )
-    }
-  }
-}
-
-/*
-class Task(tsvLine: String) {
-  sealed abstract class Status
-  object Status {
-    case object NoProgress extends Status
-    case object DoingFine extends Status
-    case object Lagging extends Status
-    case object WillDelay extends Status
-    case object DeadlineChanged extends Status
-    case object Completed extends Status
-  }
-
-  class InvalidNumberOfColumnsException private(e: RuntimeException) extends RuntimeException(e) {
-    def this(msg: String) = this(new RuntimeException(msg))
-    def this(msg: String, cause: Throwable) = this(new RuntimeException(msg, cause))
-  }
-
-  private val cols = tsvLine.split("\\t")
-  if (cols.length != 7) {
-    throw new InvalidNumberOfColumnsException(tsvLine)
-  }
-
-  var date : Calendar = {
-    val pattern = """^(?:報告日:)?(\d{4})/(\d{2})/(\d{2})$""".r
-    cols(0) match {
+    def parseField(f: Field): Parser[Calendar] = f.value match {
       case pattern(year, month, day) =>
-        new GregorianCalendar(year.toInt, month.toInt, day.toInt)
-    }
-  }
-
-  var ticketID : Int = {
-    val pattern = """^(?:チケットID:)?(\d+)$""".r
-    cols(1) match {
-      case pattern(id) => id.toInt
-    }
-  }
-
-  var title : String = {
-    val pattern = """^(?:作業名:)?(.*)$""".r
-    cols(2) match {
-      case pattern(title) => title
-    }
-  }
-
-  var tentativeDeadline : Option[Calendar] = {
-    val pattern = """^(?:仮期限:)?(\d{4})/(\d{2})/(\d{2})$""".r
-    cols(3) match {
-      case pattern(year, month, day) =>
-        Some(new GregorianCalendar(year.toInt, month.toInt, day.toInt))
+        new GregorianCalendar(year.toInt, month.toInt - 1, day.toInt).point[Parser]
       case _ =>
-        None
+        ("date not in format yyyy/MM/dd: " + f).raiseError[Calendar]
     }
   }
 
-  var deadline : Option[Calendar] = {
-    val pattern = """^(?:期限:)?(\d{4})/(\d{2})/(\d{2})$""".r
-    cols(4) match {
-      case pattern(year, month, day) =>
-        Some(new GregorianCalendar(year.toInt, month.toInt, day.toInt))
+  implicit val StatusFromField = new FromField[Status] {
+    def parseField(f: Field): Parser[Status] = f.value match {
+      case "順調"     => (Status.DoingFine:       Status).point[Parser]
+      case "遅延"     => (Status.Lagging:         Status).point[Parser]
+      case "期限変更" => (Status.DeadlineChanged: Status).point[Parser]
+      case "完了"     => (Status.Completed:       Status).point[Parser]
       case _ =>
-        None
-    }
-  }
-
-  var status : Status = {
-    val pattern = """^(?:状態:)?(.+)$""".r
-    cols(5) match {
-      case pattern(s) =>
-        s match {
-          case "未作業"   => Status.NoProgress
-          case "順調"     => Status.DoingFine
-          case "悪化"     => Status.Lagging
-          case "遅延"     => Status.WillDelay
-          case "期限変更" => Status.DeadlineChanged
-          case "完了"     => Status.Completed
-        }
+        ("invalid status: " + f).raiseError[Status]
     }
   }
 
-  var supplement : String = {
-    val pattern = """^(?:補足:)?(.*)$""".r
-    cols(6) match {
-      case pattern(title) => title
-    }
+  implicit val TaskFromRecord = new FromRecord[Task] {
+    def parseRecord(r: Record): Parser[Task] =
+      for {
+        date                   <- r.lookup[Calendar        ]('報告日)
+        ticketID               <- r.lookup[Option[Int]     ]('チケットID)
+        title                  <- r.lookup[String          ]('作業名)
+        expectedCompletionDate <- r.lookup[Calendar        ]('作業完了予定年月日)
+        deadline               <- r.lookup[Option[Calendar]]('タスク期限)
+        status                 <- r.lookup[Status          ]('状態)
+        description            <- r.lookup[Option[String]  ]('説明).handleError(_ => None.point[Parser])
+      }
+      yield Task(date, ticketID, title, expectedCompletionDate,
+                 deadline, status, description)
   }
 }
- */