fix report fetch limit

is4kov · Jul 18, 2017 · 9207621 · 9207621
1 parent 7741df7
commit 9207621
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/conf/base.conf b/conf/base.conf
@@ -10,7 +10,7 @@ net {
   ip = "5.196.91.160"
   asset {
     domain = ${net.domain}
-    version = 1787
+    version = 1794
   }
   email = "[email protected]"
   crawlable = false

diff --git a/modules/report/src/main/ReportApi.scala b/modules/report/src/main/ReportApi.scala
@@ -216,8 +216,9 @@ final class ReportApi(
 
   def unprocessedAndRecentWithFilter(nb: Int, room: Option[Room]): Fu[List[Report.WithUserAndNotes]] = for {
     unprocessed <- findRecent(nb, unprocessedSelect ++ roomSelect(room))
-    processed <- if (room has Room.Xfiles) fuccess(Nil)
-    else findRecent(nb - unprocessed.size, processedSelect ++ roomSelect(room))
+    nbProcessed = nb - unprocessed.size
+    processed <- if (room.has(Room.Xfiles) || nbProcessed == 0) fuccess(Nil)
+    else findRecent(nbProcessed, processedSelect ++ roomSelect(room))
     withNotes <- addUsersAndNotes(unprocessed ++ processed)
   } yield withNotes