Merge pull request #565 from SpongePowered/fix/null-userprojects-api

Fix null object when a user doesn't have any projects Fixes #561
SpongePowered · Jul 12, 2018 · 306bedb · 306bedb
2 parents bf803a1 + 028222e
commit 306bedb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/app/ore/rest/OreRestfulApi.scala b/app/ore/rest/OreRestfulApi.scala
@@ -361,15 +361,15 @@ trait OreRestfulApi {
       jsonProjects <- writeProjects(allProjects)
     } yield {
       val projectsByUser = jsonProjects.groupBy(_._1.ownerId).mapValues(_.map(_._2))
-      userList.map { case user =>
+      userList.map { user =>
         obj(
           "id"              ->  user.id,
           "createdAt"       ->  user.createdAt.get.toString,
           "username"        ->  user.username,
           "roles"           ->  user.globalRoles.map(_.title),
           "starred"         ->  toJson(stars.getOrElse(user.id.get, Seq.empty)),
           "avatarUrl"       ->  user.avatarUrl,
-          "projects"        ->  toJson(projectsByUser.get(user.id.get))
+          "projects"        ->  toJson(projectsByUser.getOrElse(user.id.get, Nil))
         )
       }
     }