Slick 3.1 - Convert Slick Table Row Object to case Class - scala

Question

I've used the Slick 3.1 code generator to create the default object and trait Tables.scala
The below method works however I would like to implicitly or explicitly convert UserRow and PasswordsRow to User and UserPassword.
Working method:
override def getUser(email: String): Future[Option[(Tables.UsersRow, Tables.PasswordsRow)]] = db.run {
(for {
user <- users if user.email === email
password <- passwords if password.id === user.id
} yield (user, password)).result.headOption
}
Desired method:
override def getUser(email: String): Future[Option[(User, UserPassword)]] = db.run {
(for {
user <- users if user.email === email
password <- passwords if password.id === user.id
} yield (user, password)).result.headOption
}
User.scala
package model
import com.wordnik.swagger.annotations.{ ApiModel, ApiModelProperty }
import slick.jdbc.GetResult
import spray.json.DefaultJsonProtocol
import scala.annotation.meta.field
case class User(
id: Int,
email: String,
name: Option[String] = None,
surname: Option[String] = None,
passwordId: Option[Int] = None
)
object User extends DefaultJsonProtocol{
implicit val getUserResult = GetResult(r => User(r.<<, r.<<, r.<<, r.<<, r.<<))
implicit val userFormat = jsonFormat5(User.apply)
}
UserPassword.scala
package model
import com.github.t3hnar.bcrypt.{Password, generateSalt}
import slick.jdbc.GetResult
case class UserPassword(id: Int, hashedPassword: Option[String], salt: String = generateSalt) {
def passwordMatches(password: String): Boolean = hashedPassword.contains(password.bcrypt(salt))
}
object UserPassword {
implicit val getUserPasswordResult = GetResult(r => UserPassword(r.<<, r.<<, r.<<))
def newWithPassword(password: String) = {
val salt = generateSalt
new UserPassword(0, Some(password.bcrypt(salt)), salt)
}
}

Answer 1

Someting like this maybe?
val futureUserRowAndPwdRow = getUser(email)
val futureUser: Future[Option[(User, UserPassword)]] = futureUserRowAndPwdRow map {
maybeUserRow => maybeUserRow map {
case (userRow, pwdRow) => (User(userRow.whatever....), UserPassword(..))
}
}