3 files changed, 186 insertions, 122 deletions

diff --git a/app/controllers/Application.scala b/app/controllers/Application.scala
index 43b579e..3380e38 100644
--- a/app/controllers/Application.scala
+++ b/app/controllers/Application.scala
@@ -3,6 +3,7 @@ package controllers
 import play.api._
 import play.api.mvc._
 
+
 object Application extends Controller {
 
   def index = Action {
diff --git a/app/models/Tables.scala b/app/models/Tables.scala
index 7d4406c..ff1f267 100644
--- a/app/models/Tables.scala
+++ b/app/models/Tables.scala
@@ -1,89 +1,78 @@
 package models
-
 // AUTO-GENERATED Slick data model
 /** Stand-alone Slick data model for immediate use */
 object Tables extends {
-  val profile = scala.slick.driver.PostgresDriver
+  val profile = play.api.db.slick.Config.driver
 } with Tables
 
 /** Slick data model trait for extension, choice of backend or usage in the cake pattern. (Make sure to initialize this late.) */
 trait Tables {
   val profile: scala.slick.driver.JdbcProfile
-
   import profile.simple._
   import scala.slick.model.ForeignKeyAction
-
   // NOTE: GetResult mappers for plain SQL are only generated for tables where Slick knows how to map the types of all columns.
-
   import scala.slick.jdbc.{GetResult => GR}
-
+  
   /** DDL for all tables. Call .create to execute. */
   lazy val ddl = Bids.ddl ++ Charges.ddl ++ Items.ddl ++ Transactions.ddl ++ Users.ddl
-
+  
   /** Entity class storing rows of table Bids
-    * @param uuid Database column uuid DBType(varchar), PrimaryKey, Length(36,true)
-    * @param itemUuid Database column item_uuid DBType(varchar), Length(36,true)
-    * @param userUuid Database column user_uuid DBType(varchar), Length(36,true)
-    * @param bidDate Database column bid_date DBType(timestamptz)
-    * @param offer Database column offer DBType(numeric) */
+   *  @param uuid Database column uuid DBType(varchar), PrimaryKey, Length(36,true)
+   *  @param itemUuid Database column item_uuid DBType(varchar), Length(36,true)
+   *  @param userUuid Database column user_uuid DBType(varchar), Length(36,true)
+   *  @param bidDate Database column bid_date DBType(timestamptz)
+   *  @param offer Database column offer DBType(numeric) */
   case class Bid(uuid: String, itemUuid: String, userUuid: String, bidDate: java.sql.Timestamp, offer: scala.math.BigDecimal)
-
   /** GetResult implicit for fetching Bid objects using plain SQL queries */
-  implicit def GetResultBid(implicit e0: GR[String], e1: GR[java.sql.Timestamp], e2: GR[scala.math.BigDecimal]): GR[Bid] = GR {
+  implicit def GetResultBid(implicit e0: GR[String], e1: GR[java.sql.Timestamp], e2: GR[scala.math.BigDecimal]): GR[Bid] = GR{
     prs => import prs._
-      Bid.tupled((<<[String], <<[String], <<[String], <<[java.sql.Timestamp], <<[scala.math.BigDecimal]))
+    Bid.tupled((<<[String], <<[String], <<[String], <<[java.sql.Timestamp], <<[scala.math.BigDecimal]))
   }
-
   /** Table description of table bids. Objects of this class serve as prototypes for rows in queries. */
   class Bids(_tableTag: Tag) extends Table[Bid](_tableTag, "bids") {
-    def * = (uuid, itemUuid, userUuid, bidDate, offer) <>(Bid.tupled, Bid.unapply)
-
+    def * = (uuid, itemUuid, userUuid, bidDate, offer) <> (Bid.tupled, Bid.unapply)
     /** Maps whole row to an option. Useful for outer joins. */
-    def ? = (uuid.?, itemUuid.?, userUuid.?, bidDate.?, offer.?).shaped.<>({ r => import r._; _1.map(_ => Bid.tupled((_1.get, _2.get, _3.get, _4.get, _5.get)))}, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
-
+    def ? = (uuid.?, itemUuid.?, userUuid.?, bidDate.?, offer.?).shaped.<>({r=>import r._; _1.map(_=> Bid.tupled((_1.get, _2.get, _3.get, _4.get, _5.get)))}, (_:Any) =>  throw new Exception("Inserting into ? projection not supported."))
+    
     /** Database column uuid DBType(varchar), PrimaryKey, Length(36,true) */
-    val uuid: Column[String] = column[String]("uuid", O.PrimaryKey, O.Length(36, varying = true))
+    val uuid: Column[String] = column[String]("uuid", O.PrimaryKey, O.Length(36,varying=true))
     /** Database column item_uuid DBType(varchar), Length(36,true) */
-    val itemUuid: Column[String] = column[String]("item_uuid", O.Length(36, varying = true))
+    val itemUuid: Column[String] = column[String]("item_uuid", O.Length(36,varying=true))
     /** Database column user_uuid DBType(varchar), Length(36,true) */
-    val userUuid: Column[String] = column[String]("user_uuid", O.Length(36, varying = true))
+    val userUuid: Column[String] = column[String]("user_uuid", O.Length(36,varying=true))
     /** Database column bid_date DBType(timestamptz) */
     val bidDate: Column[java.sql.Timestamp] = column[java.sql.Timestamp]("bid_date")
     /** Database column offer DBType(numeric) */
     val offer: Column[scala.math.BigDecimal] = column[scala.math.BigDecimal]("offer")
-
+    
     /** Foreign key referencing Items (database name bids_items_fk) */
-    lazy val itemsFk = foreignKey("bids_items_fk", itemUuid, Items)(r => r.uuid, onUpdate = ForeignKeyAction.NoAction, onDelete = ForeignKeyAction.NoAction)
+    lazy val itemsFk = foreignKey("bids_items_fk", itemUuid, Items)(r => r.uuid, onUpdate=ForeignKeyAction.NoAction, onDelete=ForeignKeyAction.NoAction)
     /** Foreign key referencing Users (database name bids_users_fk) */
-    lazy val usersFk = foreignKey("bids_users_fk", userUuid, Users)(r => r.uuid, onUpdate = ForeignKeyAction.NoAction, onDelete = ForeignKeyAction.NoAction)
+    lazy val usersFk = foreignKey("bids_users_fk", userUuid, Users)(r => r.uuid, onUpdate=ForeignKeyAction.NoAction, onDelete=ForeignKeyAction.NoAction)
   }
-
   /** Collection-like TableQuery object for table Bids */
   lazy val Bids = new TableQuery(tag => new Bids(tag))
-
+  
   /** Entity class storing rows of table Charges
-    * @param uuid Database column uuid DBType(varchar), PrimaryKey, Length(36,true)
-    * @param startDate Database column start_date DBType(timestamptz)
-    * @param endDate Database column end_date DBType(timestamptz)
-    * @param fee Database column fee DBType(numeric)
-    * @param rate Database column rate DBType(numeric) */
+   *  @param uuid Database column uuid DBType(varchar), PrimaryKey, Length(36,true)
+   *  @param startDate Database column start_date DBType(timestamptz)
+   *  @param endDate Database column end_date DBType(timestamptz)
+   *  @param fee Database column fee DBType(numeric)
+   *  @param rate Database column rate DBType(numeric) */
   case class Charge(uuid: String, startDate: java.sql.Timestamp, endDate: java.sql.Timestamp, fee: scala.math.BigDecimal, rate: scala.math.BigDecimal)
-
   /** GetResult implicit for fetching Charge objects using plain SQL queries */
-  implicit def GetResultCharge(implicit e0: GR[String], e1: GR[java.sql.Timestamp], e2: GR[scala.math.BigDecimal]): GR[Charge] = GR {
+  implicit def GetResultCharge(implicit e0: GR[String], e1: GR[java.sql.Timestamp], e2: GR[scala.math.BigDecimal]): GR[Charge] = GR{
     prs => import prs._
-      Charge.tupled((<<[String], <<[java.sql.Timestamp], <<[java.sql.Timestamp], <<[scala.math.BigDecimal], <<[scala.math.BigDecimal]))
+    Charge.tupled((<<[String], <<[java.sql.Timestamp], <<[java.sql.Timestamp], <<[scala.math.BigDecimal], <<[scala.math.BigDecimal]))
   }
-
   /** Table description of table charges. Objects of this class serve as prototypes for rows in queries. */
   class Charges(_tableTag: Tag) extends Table[Charge](_tableTag, "charges") {
-    def * = (uuid, startDate, endDate, fee, rate) <>(Charge.tupled, Charge.unapply)
-
+    def * = (uuid, startDate, endDate, fee, rate) <> (Charge.tupled, Charge.unapply)
     /** Maps whole row to an option. Useful for outer joins. */
-    def ? = (uuid.?, startDate.?, endDate.?, fee.?, rate.?).shaped.<>({ r => import r._; _1.map(_ => Charge.tupled((_1.get, _2.get, _3.get, _4.get, _5.get)))}, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
-
+    def ? = (uuid.?, startDate.?, endDate.?, fee.?, rate.?).shaped.<>({r=>import r._; _1.map(_=> Charge.tupled((_1.get, _2.get, _3.get, _4.get, _5.get)))}, (_:Any) =>  throw new Exception("Inserting into ? projection not supported."))
+    
     /** Database column uuid DBType(varchar), PrimaryKey, Length(36,true) */
-    val uuid: Column[String] = column[String]("uuid", O.PrimaryKey, O.Length(36, varying = true))
+    val uuid: Column[String] = column[String]("uuid", O.PrimaryKey, O.Length(36,varying=true))
     /** Database column start_date DBType(timestamptz) */
     val startDate: Column[java.sql.Timestamp] = column[java.sql.Timestamp]("start_date")
     /** Database column end_date DBType(timestamptz) */
@@ -93,151 +82,141 @@ trait Tables {
     /** Database column rate DBType(numeric) */
     val rate: Column[scala.math.BigDecimal] = column[scala.math.BigDecimal]("rate")
   }
-
   /** Collection-like TableQuery object for table Charges */
   lazy val Charges = new TableQuery(tag => new Charges(tag))
-
+  
   /** Entity class storing rows of table Items
-    * @param uuid Database column uuid DBType(varchar), PrimaryKey, Length(36,true)
-    * @param userUuid Database column user_uuid DBType(varchar), Length(36,true)
-    * @param startDate Database column start_date DBType(timestamptz)
-    * @param endDate Database column end_date DBType(timestamptz)
-    * @param itemName Database column item_name DBType(varchar), Length(20,true)
-    * @param shortDesc Database column short_desc DBType(varchar), Length(30,true)
-    * @param longDesc Database column long_desc DBType(text), Length(2147483647,true)
-    * @param initialPrice Database column initial_price DBType(numeric) */
+   *  @param uuid Database column uuid DBType(varchar), PrimaryKey, Length(36,true)
+   *  @param userUuid Database column user_uuid DBType(varchar), Length(36,true)
+   *  @param startDate Database column start_date DBType(timestamptz)
+   *  @param endDate Database column end_date DBType(timestamptz)
+   *  @param itemName Database column item_name DBType(varchar), Length(20,true)
+   *  @param shortDesc Database column short_desc DBType(varchar), Length(30,true)
+   *  @param longDesc Database column long_desc DBType(text), Length(2147483647,true)
+   *  @param initialPrice Database column initial_price DBType(numeric) */
   case class Item(uuid: String, userUuid: String, startDate: java.sql.Timestamp, endDate: java.sql.Timestamp, itemName: String, shortDesc: String, longDesc: String, initialPrice: scala.math.BigDecimal)
-
   /** GetResult implicit for fetching Item objects using plain SQL queries */
-  implicit def GetResultItem(implicit e0: GR[String], e1: GR[java.sql.Timestamp], e2: GR[scala.math.BigDecimal]): GR[Item] = GR {
+  implicit def GetResultItem(implicit e0: GR[String], e1: GR[java.sql.Timestamp], e2: GR[scala.math.BigDecimal]): GR[Item] = GR{
     prs => import prs._
-      Item.tupled((<<[String], <<[String], <<[java.sql.Timestamp], <<[java.sql.Timestamp], <<[String], <<[String], <<[String], <<[scala.math.BigDecimal]))
+    Item.tupled((<<[String], <<[String], <<[java.sql.Timestamp], <<[java.sql.Timestamp], <<[String], <<[String], <<[String], <<[scala.math.BigDecimal]))
   }
-
   /** Table description of table items. Objects of this class serve as prototypes for rows in queries. */
   class Items(_tableTag: Tag) extends Table[Item](_tableTag, "items") {
-    def * = (uuid, userUuid, startDate, endDate, itemName, shortDesc, longDesc, initialPrice) <>(Item.tupled, Item.unapply)
-
+    def * = (uuid, userUuid, startDate, endDate, itemName, shortDesc, longDesc, initialPrice) <> (Item.tupled, Item.unapply)
     /** Maps whole row to an option. Useful for outer joins. */
-    def ? = (uuid.?, userUuid.?, startDate.?, endDate.?, itemName.?, shortDesc.?, longDesc.?, initialPrice.?).shaped.<>({ r => import r._; _1.map(_ => Item.tupled((_1.get, _2.get, _3.get, _4.get, _5.get, _6.get, _7.get, _8.get)))}, (_: Any) => throw new Exception("Inserting into ? projection not supported."))
-
+    def ? = (uuid.?, userUuid.?, startDate.?, endDate.?, itemName.?, shortDesc.?, longDesc.?, initialPrice.?).shaped.<>({r=>import r._; _1.map(_=> Item.tupled((_1.get, _2.get, _3.get, _4.get, _5.get, _6.get, _7.get, _8.get)))}, (_:Any) =>  throw new Exception("Inserting into ? projection not supported."))
+    
     /** Database column uuid DBType(varchar), PrimaryKey, Length(36,true) */
-    val uuid: Column[String] = column[String]("uuid", O.PrimaryKey, O.Length(36, varying = true))
+    val uuid: Column[String] = column[String]("uuid", O.PrimaryKey, O.Length(36,varying=true))
     /** Database column user_uuid DBType(varchar), Length(36,true) */
-    val userUuid: Column[String] = column[String]("user_uuid", O.Length(36, varying = true))
+    val userUuid: Column[String] = column[String]("user_uuid", O.Length(36,varying=true))
     /** Database column start_date DBType(timestamptz) */
     val startDate: Column[java.sql.Timestamp] = column[java.sql.Timestamp]("start_date")
     /** Database column end_date DBType(timestamptz) */
     val endDate: Column[java.sql.Timestamp] = column[java.sql.Timestamp]("end_date")