Address PR comments

duckduckgo · May 6, 2024 · 9cbb477 · 9cbb477
1 parent 4e9c30b
commit 9cbb477
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryRepository.kt b/history/history-impl/src/main/java/com/duckduckgo/history/impl/HistoryRepository.kt
@@ -37,7 +37,7 @@ interface HistoryRepository {
 
     suspend fun clearHistory()
 
-    suspend fun clearEntriesOlderThan(minusDays: LocalDateTime)
+    suspend fun clearEntriesOlderThan(dateTime: LocalDateTime)
 }
 
 class RealHistoryRepository(
@@ -97,9 +97,9 @@ class RealHistoryRepository(
             .also { cachedHistoryEntries = it }
     }
 
-    override suspend fun clearEntriesOlderThan(minusDays: LocalDateTime) {
+    override suspend fun clearEntriesOlderThan(dateTime: LocalDateTime) {
         cachedHistoryEntries = null
-        historyDao.deleteEntriesOlderThan(minusDays)
+        historyDao.deleteEntriesOlderThan(dateTime)
         fetchAndCacheHistoryEntries()
     }
 }
diff --git a/history/history-impl/src/main/java/com/duckduckgo/history/impl/store/HistoryDao.kt b/history/history-impl/src/main/java/com/duckduckgo/history/impl/store/HistoryDao.kt
@@ -68,18 +68,15 @@ interface HistoryDao {
     @Query("DELETE FROM visits_list WHERE timestamp < :timestamp")
     suspend fun deleteOldVisitsByTimestamp(timestamp: String)
 
-    @Query(
-        "SELECT * FROM history_entries WHERE id NOT IN (SELECT DISTINCT historyEntryId FROM visits_list) " +
-            "OR id IN (SELECT historyEntryId FROM visits_list WHERE timestamp < :timestamp)",
-    )
-    suspend fun getEntriesWithNoVisitsOrOlderThanTimestamp(timestamp: String): List<HistoryEntryWithVisits>
+    @Query("DELETE FROM history_entries WHERE id NOT IN (SELECT DISTINCT historyEntryId FROM visits_list)")
+    suspend fun deleteEntriesWithNoVisits()
 
     @Transaction
     suspend fun deleteEntriesOlderThan(dateTime: LocalDateTime) {
         val timestamp = DatabaseDateFormatter.timestamp(dateTime)
 
         deleteOldVisitsByTimestamp(timestamp)
 
-        delete(getEntriesWithNoVisitsOrOlderThanTimestamp(timestamp).map { it.historyEntry })
+        deleteEntriesWithNoVisits()
     }
 }
diff --git a/history/history-impl/src/test/java/com/duckduckgo/history/impl/store/HistoryDaoTest.kt b/history/history-impl/src/test/java/com/duckduckgo/history/impl/store/HistoryDaoTest.kt
@@ -96,7 +96,7 @@ class HistoryDaoTest {
     }
 
     @Test
-    fun whenDeleteOldItemsWithNoOldEnoughItemsThenTheyAreDeleted() {
+    fun whenDeleteOldItemsWithOldEnoughItemsThenTheyAreDeleted() {
         runTest {
             val insertDate = LocalDateTime.of(2000, JANUARY, 1, 0, 0)
             historyDao.updateOrInsertVisit("url", "title", "query", false, insertDate)