2 files changed, 46 insertions, 3 deletions

diff --git a/app/controllers/Sale.scala b/app/controllers/Sale.scala
new file mode 100644
index 0000000..b5e4622
--- /dev/null
+++ b/app/controllers/Sale.scala
@@ -0,0 +1,37 @@
+package controllers
+
+import play.api._
+import play.api.data._
+import play.api.data.Forms._
+import play.api.mvc._
+
+import play.api.db.slick._
+import play.api.db.slick.Config.driver.simple._
+import play.api.Play.current
+
+import scala.concurrent.Future
+
+import models._
+
+
+object Sale extends Controller {
+
+  def sales = Auth { implicit request =>
+    DB.withSession { implicit session =>
+      val currentDateTime =  new java.sql.Timestamp((new java.util.Date).getTime)
+      val sales = Views.Sales.filter(_.endDate > currentDateTime).sortBy(_.endDate.asc).run
+
+      Ok(views.html.pages.sales.currentSales(sales))
+    }
+  }
+
+  def sell(itemUuid: String) = TODO
+
+
+  def item(itemUuid: String) = TODO
+
+  def bids(itemUuid: String) = TODO
+
+  def bidSubmit(itemUuid: String) = TODO
+
+}
diff --git a/app/models/Views.scala b/app/models/Views.scala
index 438c1d3..154ca86 100644
--- a/app/models/Views.scala
+++ b/app/models/Views.scala
@@ -48,25 +48,29 @@ trait Views {
   
   /** Entity class storing rows of table Sales
    *  @param itemUuid Database column item_uuid DBType(varchar), Length(36,true), Default(None)
+   *  @param itemName Database column item_name DBType(varchar), Length(20,true), Default(None)
    *  @param sellerUuid Database column seller_uuid DBType(varchar), Length(36,true), Default(None)
    *  @param startDate Database column start_date DBType(timestamptz), Default(None)
    *  @param endDate Database column end_date DBType(timestamptz), Default(None)
    *  @param bestBidUuid Database column best_bid_uuid DBType(varchar), Length(36,true), Default(None)
    *  @param bestBidderUuid Database column best_bidder_uuid DBType(varchar), Length(36,true), Default(None)
+   *  @param initialPrice Database column initial_price DBType(numeric), Default(None)
    *  @param bestOffer Database column best_offer DBType(numeric), Default(None)
    *  @param charges Database column charges DBType(numeric), Default(None) */
-  case class Sale(itemUuid: Option[String] = None, sellerUuid: Option[String] = None, startDate: Option[java.sql.Timestamp] = None, endDate: Option[java.sql.Timestamp] = None, bestBidUuid: Option[String] = None, bestBidderUuid: Option[String] = None, bestOffer: Option[scala.math.BigDecimal] = None, charges: Option[scala.math.BigDecimal] = None)
+  case class Sale(itemUuid: Option[String] = None, itemName: Option[String] = None, sellerUuid: Option[String] = None, startDate: Option[java.sql.Timestamp] = None, endDate: Option[java.sql.Timestamp] = None, bestBidUuid: Option[String] = None, bestBidderUuid: Option[String] = None, initialPrice: Option[scala.math.BigDecimal] = None, bestOffer: Option[scala.math.BigDecimal] = None, charges: Option[scala.math.BigDecimal] = None)
   /** GetResult implicit for fetching Sale objects using plain SQL queries */
   implicit def GetResultSale(implicit e0: GR[Option[String]], e1: GR[Option[java.sql.Timestamp]], e2: GR[Option[scala.math.BigDecimal]]): GR[Sale] = GR{
     prs => import prs._
-    Sale.tupled((<<?[String], <<?[String], <<?[java.sql.Timestamp], <<?[java.sql.Timestamp], <<?[String], <<?[String], <<?[scala.math.BigDecimal], <<?[scala.math.BigDecimal]))
+    Sale.tupled((<<?[String], <<?[String], <<?[String], <<?[java.sql.Timestamp], <<?[java.sql.Timestamp], <<?[String], <<?[String], <<?[scala.math.BigDecimal], <<?[scala.math.BigDecimal], <<?[scala.math.BigDecimal]))
   }
   /** Table description of table sales. Objects of this class serve as prototypes for rows in queries. */
   class Sales(_tableTag: Tag) extends Table[Sale](_tableTag, "sales") {
-    def * = (itemUuid, sellerUuid, startDate, endDate, bestBidUuid, bestBidderUuid, bestOffer, charges) <> (Sale.tupled, Sale.unapply)
+    def * = (itemUuid, itemName, sellerUuid, startDate, endDate, bestBidUuid, bestBidderUuid, initialPrice, bestOffer, charges) <> (Sale.tupled, Sale.unapply)
     
     /** Database column item_uuid DBType(varchar), Length(36,true), Default(None) */
     val itemUuid: Column[Option[String]] = column[Option[String]]("item_uuid", O.Length(36,varying=true), O.Default(None))
+    /** Database column item_name DBType(varchar), Length(20,true), Default(None) */
+    val itemName: Column[Option[String]] = column[Option[String]]("item_name", O.Length(20,varying=true), O.Default(None))
     /** Database column seller_uuid DBType(varchar), Length(36,true), Default(None) */
     val sellerUuid: Column[Option[String]] = column[Option[String]]("seller_uuid", O.Length(36,varying=true), O.Default(None))
     /** Database column start_date DBType(timestamptz), Default(None) */
@@ -77,6 +81,8 @@ trait Views {
     val bestBidUuid: Column[Option[String]] = column[Option[String]]("best_bid_uuid", O.Length(36,varying=true), O.Default(None))
     /** Database column best_bidder_uuid DBType(varchar), Length(36,true), Default(None) */
     val bestBidderUuid: Column[Option[String]] = column[Option[String]]("best_bidder_uuid", O.Length(36,varying=true), O.Default(None))
+    /** Database column initial_price DBType(numeric), Default(None) */
+    val initialPrice: Column[Option[scala.math.BigDecimal]] = column[Option[scala.math.BigDecimal]]("initial_price", O.Default(None))
     /** Database column best_offer DBType(numeric), Default(None) */
     val bestOffer: Column[Option[scala.math.BigDecimal]] = column[Option[scala.math.BigDecimal]]("best_offer", O.Default(None))
     /** Database column charges DBType(numeric), Default(None) */