Update query for top visited articles

Author: cooltey

app/src/main/java/org/wikipedia/history/db/HistoryEntryDao.kt

@@ -30,8 +30,8 @@ interface HistoryEntryDao {
     @Query("SELECT COUNT(*) FROM (SELECT DISTINCT HistoryEntry.lang, HistoryEntry.apiTitle FROM HistoryEntry WHERE timestamp > :timestamp)")
     suspend fun getDistinctEntriesCountSince(timestamp: Long): Int?
 
-    @Query("SELECT DISTINCT displayTitle FROM HistoryEntry ORDER BY timestamp DESC LIMIT :limit")
-    suspend fun getLatestArticleTitles(limit: Int): List<String>
+    @Query("SELECT displayTitle FROM HistoryEntry WHERE timestamp > :timestamp GROUP BY displayTitle ORDER BY COUNT(displayTitle) DESC LIMIT :limit")
+    suspend fun getTopVisitedEntriesSince(limit: Int, timestamp: Long): List<String>
 
     @Query("SELECT COUNT(*) FROM HistoryEntry")
     suspend fun getHistoryCount(): Int

app/src/main/java/org/wikipedia/yearinreview/YearInReviewViewModel.kt

@@ -66,17 +66,14 @@ class YearInReviewViewModel() : ViewModel() {
             }
 
             val topVisitedArticlesForTheYear = async {
-                // TODO: update the query
-                AppDatabase.instance.historyEntryDao().getLatestArticleTitles(MINIMUM_READ_COUNT)
+                AppDatabase.instance.historyEntryDao().getTopVisitedEntriesSince(MINIMUM_READ_COUNT, yearAgo)
                     .map { StringUtil.fromHtml(it).toString() }
             }
 
             val totalTimeSpent = async {
                 AppDatabase.instance.historyEntryWithImageDao().getTimeSpentSinceTimeStamp(yearAgo)
             }
 
-            // TODO: think about the actual data to show.
-
             val impactDataJob = async {
                 if (AccountUtil.isLoggedIn) {
                     val wikiSite = WikipediaApp.instance.wikiSite