return challenge status in user leaderboard data

maproulette · Feb 18, 2025 · abe79d5 · abe79d5
1 parent e0aeb47
commit abe79d5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/app/org/maproulette/framework/model/Leaderboard.scala b/app/org/maproulette/framework/model/Leaderboard.scala
@@ -9,7 +9,7 @@ import org.maproulette.framework.psql.CommonField
 import play.api.libs.json.{Json, Writes}
 import play.api.libs.json.JodaWrites._
 
-case class LeaderboardChallenge(id: Long, name: String, activity: Int)
+case class LeaderboardChallenge(id: Long, name: String, activity: Int, status: Int)
 object LeaderboardChallenge {
   implicit val writes: Writes[LeaderboardChallenge] = Json.writes[LeaderboardChallenge]
 }

diff --git a/app/org/maproulette/framework/repository/LeaderboardRepository.scala b/app/org/maproulette/framework/repository/LeaderboardRepository.scala
@@ -28,9 +28,10 @@ class LeaderboardRepository @Inject() (override val db: Database) extends Reposi
   val leaderboardChallengeParser: RowParser[LeaderboardChallenge] = {
     get[Long]("challenge_id") ~
       get[String]("challenge_name") ~
-      get[Int]("activity") map {
-      case id ~ name ~ activity => {
-        new LeaderboardChallenge(id, name, activity)
+      get[Int]("activity") ~
+      get[Int]("challenges.status") map {
+      case id ~ name ~ activity ~ status => {
+        new LeaderboardChallenge(id, name, activity, status)
       }
     }
   }
@@ -283,7 +284,9 @@ class LeaderboardRepository @Inject() (override val db: Database) extends Reposi
     withMRConnection { implicit c =>
       query
         .build(
-          "SELECT challenge_id, challenge_name, activity FROM user_top_challenges"
+          """SELECT challenge_id, challenge_name, activity, challenges.status 
+             FROM user_top_challenges
+             JOIN challenges ON challenges.id = user_top_challenges.challenge_id"""
         )
         .as(this.leaderboardChallengeParser.*)
     }

diff --git a/test/org/maproulette/framework/repository/LeaderboardRepositorySpec.scala b/test/org/maproulette/framework/repository/LeaderboardRepositorySpec.scala
@@ -25,7 +25,7 @@ class LeaderboardRepositorySpec(implicit val application: Application) extends F
       // Check for everything
       val results = this.repository.queryUserLeaderboard(
         Query.simple(List()),
-        userId => List(new LeaderboardChallenge(userId, "name", 1))
+        userId => List(new LeaderboardChallenge(userId, "name", 1, 1))
       )
       results.size mustEqual 4
 
@@ -49,7 +49,7 @@ class LeaderboardRepositorySpec(implicit val application: Application) extends F
             )
           )
         ),
-        userId => List(new LeaderboardChallenge(userId, "name", 1))
+        userId => List(new LeaderboardChallenge(userId, "name", 1, 1))
       )
       results2.size mustEqual 2
 
@@ -73,7 +73,7 @@ class LeaderboardRepositorySpec(implicit val application: Application) extends F
             )
           )
         ),
-        userId => List(new LeaderboardChallenge(userId, "name", 1))
+        userId => List(new LeaderboardChallenge(userId, "name", 1, 1))
       )
       results3.size mustEqual 2
     }