diff --git a/app/org/maproulette/framework/repository/ChallengeCommentRepository.scala b/app/org/maproulette/framework/repository/ChallengeCommentRepository.scala index 499a3866..e6a7f6a6 100644 --- a/app/org/maproulette/framework/repository/ChallengeCommentRepository.scala +++ b/app/org/maproulette/framework/repository/ChallengeCommentRepository.scala @@ -117,13 +117,15 @@ class ChallengeCommentRepository @Inject() (override val db: Database) extends R object ChallengeCommentRepository { val parser: RowParser[ChallengeComment] = { long("id") ~ long("project_id") ~ long("challenge_id") ~ get[DateTime]("created") ~ - get[String]("comment") ~ long("osm_id") ~ get[String]("name") ~ get[String]("avatar_url") map { + get[String]("comment") ~ long("osm_id") ~ get[String]("name") ~ get[Option[String]]( + "avatar_url" + ) map { case id ~ projectId ~ challengeId ~ created ~ comment ~ osmId ~ name ~ avatarUrl => ChallengeComment( id, osmId, name, - avatarUrl, + avatarUrl.getOrElse(""), challengeId, projectId, created, @@ -134,7 +136,9 @@ object ChallengeCommentRepository { val expandedParser: RowParser[ChallengeComment] = { long("id") ~ long("project_id") ~ long("challenge_id") ~ get[DateTime]("created") ~ - get[String]("comment") ~ long("osm_id") ~ get[String]("name") ~ get[String]("avatar_url") ~ get[ + get[String]("comment") ~ long("osm_id") ~ get[String]("name") ~ get[Option[String]]( + "avatar_url" + ) ~ get[ Option[String] ]("challenge_name") ~ get[Option[Int]]("full_count") map { case id ~ projectId ~ challengeId ~ created ~ comment ~ osmId ~ name ~ avatarUrl ~ challengeName ~ fullCount => @@ -142,7 +146,7 @@ object ChallengeCommentRepository { id, osmId, name, - avatarUrl, + avatarUrl.getOrElse(""), challengeId, projectId, created, diff --git a/app/org/maproulette/framework/repository/CommentRepository.scala b/app/org/maproulette/framework/repository/CommentRepository.scala index 2fa8b61b..54445eea 100644 --- a/app/org/maproulette/framework/repository/CommentRepository.scala +++ b/app/org/maproulette/framework/repository/CommentRepository.scala @@ -165,19 +165,17 @@ class CommentRepository @Inject() (override val db: Database) extends Repository object CommentRepository { val parser: RowParser[Comment] = { - long("task_comments.id") ~ long("task_comments.osm_id") ~ get[String]("users.name") ~ get[ - String - ]("users.avatar_url") ~ - long("task_comments.task_id") ~ long("task_comments.challenge_id") ~ long( - "task_comments.project_id" - ) ~ get[DateTime]("task_comments.created") ~ get[String]("task_comments.comment") ~ + long("task_comments.id") ~ long("task_comments.osm_id") ~ get[String]("users.name") ~ + get[Option[String]]("users.avatar_url") ~ long("task_comments.task_id") ~ + long("task_comments.challenge_id") ~ long("task_comments.project_id") ~ + get[DateTime]("task_comments.created") ~ get[String]("task_comments.comment") ~ get[Option[Long]]("task_comments.action_id") map { case id ~ osmId ~ name ~ avatarUrl ~ taskId ~ challengeId ~ projectId ~ created ~ comment ~ actionId => Comment( id, osm_id = osmId, osm_username = name, - avatarUrl, + avatarUrl.getOrElse(""), taskId = taskId, challengeId = challengeId, projectId = projectId, @@ -189,19 +187,17 @@ object CommentRepository { } val expandedParser: RowParser[Comment] = { - long("task_comments.id") ~ long("task_comments.osm_id") ~ get[String]("users.name") ~ get[ - String - ]("users.avatar_url") ~ - long("task_comments.task_id") ~ long("task_comments.challenge_id") ~ long( - "task_comments.project_id" - ) ~ get[DateTime]("task_comments.created") ~ get[String]("task_comments.comment") ~ + long("task_comments.id") ~ long("task_comments.osm_id") ~ get[String]("users.name") ~ + get[Option[String]]("users.avatar_url") ~ long("task_comments.task_id") ~ + long("task_comments.challenge_id") ~ long("task_comments.project_id") ~ + get[DateTime]("task_comments.created") ~ get[String]("task_comments.comment") ~ get[Option[Long]]("task_comments.action_id") ~ get[Option[Int]]("full_count") map { case id ~ osmId ~ name ~ avatarUrl ~ taskId ~ challengeId ~ projectId ~ created ~ comment ~ actionId ~ fullCount => Comment( id, osm_id = osmId, osm_username = name, - avatarUrl, + avatarUrl.getOrElse(""), taskId = taskId, challengeId = challengeId, projectId = projectId,