foo.scala

trait EntryMasterSerializer {
  def EntryProposedRevisionReader(entryId: UUID)(implicit request: DayOneAuthenticatedRequest[_]): Reads[(ProposedRevision, Entry)] = (
    (__ \ "type").read[RevisionOutcome] and
      (__ \ "editDate").readOrElse(DateTime.now(DateTimeZone.UTC)) and
      (__ \ "entry").read(entryReads(entryId.some))
    ).tupled.map {
    case (outcome, editDate, entry) =>
      val revision = ProposedRevision(
        outcome = outcome,
        user = request.user,
        editDate = editDate,
        saveDate = request.start,
        deviceId = request.deviceInfo.map(_.id)
      )
      (revision, entry)
  }
}