Timeslot type instead of using (Date, Date)

diff --git a/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala
new file mode 100644 (file)
index 0000000..b61ecc8
--- /dev/null
+++ b/logic/src/main/scala/gr/grnet/aquarium/logic/accounting/dsl/Timeslot.scala
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2011 GRNET S.A. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer.
+ *
+ *   2. Redistributions in binary form must reproduce the above
+ *      copyright notice, this list of conditions and the following
+ *      disclaimer in the documentation and/or other materials
+ *      provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GRNET S.A. ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GRNET S.A OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and
+ * documentation are those of the authors and should not be
+ * interpreted as representing official policies, either expressed
+ * or implied, of GRNET S.A.
+ */
+
+package gr.grnet.aquarium.logic.accounting.dsl
+
+import java.util.Date
+
+/**
+ * A representation of a timeslot with a start and end date.
+ *
+ * @author Georgios Gousios <gousiosg@gmail.com>
+ */
+case class Timeslot(from: Date, to: Date) {
+  assert(from != null)
+  assert(to != null)
+  assert(from.before(to))
+
+  def contains(t: Timeslot) : Boolean = {
+    if (this.from.after(t.from))
+      return false
+
+    if (this.to.before(t.to))
+      return false
+
+    true
+  }
+
+  def includes(t: Date) : Boolean = if (from.before(t) && to.after(t)) true else false
+
+  def overlaps(t: Timeslot) : Boolean = {
+    if (contains(t) || t.contains(this))
+      return true
+
+    if (this.includes(t.from) || this.includes(t.to))
+      return true
+
+    false
+  }
+
+  def merge(t: Timeslot) : Option[Timeslot] = {
+    if (overlaps(t)) {
+      val nfrom = if (from.before(t.from)) from else t.from
+      val nto   = if (to.after(t.to)) to else t.to
+      Some(Timeslot(nfrom, nto))
+    } else
+      None
+  }
+}
\ No newline at end of file