Refactor queries

server/src/main/scala/org/openmole-connect/server/DB.scala

@@ -70,13 +70,6 @@ object DB {
           actions: _*
         ).transactionally), Duration.Inf)
 
-  def runQuery(query: TableQuery[DB.Users]) =
-    Await.result(
-      db.run(
-        query.result
-      ), Duration.Inf
-    )
-
   def initDB = {
     runTransaction(userTable.schema.createIfNotExists)
     if (DB.users.isEmpty) {
@@ -84,16 +77,21 @@ object DB {
     }
   }
 
-  def exists(email: Email) = {
+  type UserQuery = Query[Users, (UUID, Email, Password, Role), Seq]
+
+  def runQuery(query: UserQuery) =
     Await.result(
       db.run(
-        (for {
+        query.result
+      ), Duration.Inf
+    ).map { case (u, e, p, r) => User(e, p, r, u) }
+
+  def exists(email: Email) = {
+    runQuery(
+      for {
         u <- userTable if (u.email === email)
-        } yield (u)).result
-      ).map {
-        _.length != 0
-      }, Duration.Inf
-    )
+      } yield (u)
+    ).length != 0
   }
 
   def addUser(email: Email, password: Password, role: Role = simpleUser) = {