From 4127deeb2c62c79bce0df4d9b8d2f00c5e5238c6 Mon Sep 17 00:00:00 2001
From: Arjan Mundy <amundy@yelp.com>
Date: Fri, 26 May 2023 13:03:45 -0400
Subject: [PATCH] Advanced Filter.

---
 .../HttpTransactionDatabaseRepository.kt      | 18 ++++-
 .../internal/data/room/HttpTransactionDao.kt  |  5 +-
 .../HttpTransactionDatabaseRepositoryTest.kt  | 65 +++++++++++++++++++
 3 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepository.kt b/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepository.kt
index 6171e7a82..b04f2e672 100644
--- a/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepository.kt
+++ b/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepository.kt
@@ -9,9 +9,20 @@ import com.chuckerteam.chucker.internal.support.distinctUntilChanged
 internal class HttpTransactionDatabaseRepository(private val database: ChuckerDatabase) : HttpTransactionRepository {
 
     private val transactionDao get() = database.transactionDao()
-
+    private val customQueryRegex = """method *: *(get|put|post|patch|delete) *"""
+        .toRegex(RegexOption.IGNORE_CASE)
     override fun getFilteredTransactionTuples(code: String, path: String): LiveData<List<HttpTransactionTuple>> {
-        val pathQuery = if (path.isNotEmpty()) "%$path%" else "%"
+        val pathQuery = if (path.isNotEmpty() &&
+            !customQueryRegex.containsMatchIn(path)
+        ) {
+            "%$path%"
+        } else if (customQueryRegex
+            .containsMatchIn(input = path)
+        ) {
+            path.substring(path.indexOf(':') + 1).trim()
+        } else {
+            "%"
+        }
         return transactionDao.getFilteredTuples(
             "$code%",
             pathQuery = pathQuery,
@@ -19,7 +30,8 @@ internal class HttpTransactionDatabaseRepository(private val database: ChuckerDa
              * Refer <a href='https://github.com/ChuckerTeam/chucker/issues/847">Issue #847</a> for
              * more context
              */
-            graphQlQuery = pathQuery
+            graphQlQuery = pathQuery,
+            methodQuery = pathQuery
         )
     }
 
diff --git a/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/room/HttpTransactionDao.kt b/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/room/HttpTransactionDao.kt
index 4a81f7724..db0a54050 100644
--- a/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/room/HttpTransactionDao.kt
+++ b/library/src/main/kotlin/com/chuckerteam/chucker/internal/data/room/HttpTransactionDao.kt
@@ -23,12 +23,13 @@ internal interface HttpTransactionDao {
         "SELECT id, requestDate, tookMs, protocol, method, host, path, scheme, responseCode, " +
             "requestPayloadSize, responsePayloadSize, error, graphQLDetected, graphQlOperationName FROM " +
             "transactions WHERE responseCode LIKE :codeQuery AND (path LIKE :pathQuery OR " +
-            "graphQlOperationName LIKE :graphQlQuery) ORDER BY requestDate DESC"
+            "graphQlOperationName LIKE :graphQlQuery OR method LIKE :methodQuery) ORDER BY requestDate DESC"
     )
     fun getFilteredTuples(
         codeQuery: String,
         pathQuery: String,
-        graphQlQuery: String = ""
+        graphQlQuery: String = "",
+        methodQuery: String = ""
     ): LiveData<List<HttpTransactionTuple>>
 
     @Insert
diff --git a/library/src/test/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepositoryTest.kt b/library/src/test/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepositoryTest.kt
index 4af9389d1..b3fa2f86b 100644
--- a/library/src/test/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepositoryTest.kt
+++ b/library/src/test/kotlin/com/chuckerteam/chucker/internal/data/repository/HttpTransactionDatabaseRepositoryTest.kt
@@ -299,4 +299,69 @@ internal class HttpTransactionDatabaseRepositoryTest {
             assertThat(it?.host).isEqualTo(newHost)
         }
     }
+
+    @Test
+    fun `tuples are filtered based on request method`() = runBlocking {
+        testObject.insertTransaction(transaction.withResponseData())
+        testObject.insertTransaction(otherTransaction.withResponseData())
+
+        testObject.getFilteredTransactionTuples("", "method  :  get  ").observeForever {
+            assertTuples(listOf(otherTransaction, transaction), it)
+        }
+        testObject.getFilteredTransactionTuples("", "method :  get").observeForever {
+            assertTuples(listOf(otherTransaction, transaction), it)
+        }
+        testObject.getFilteredTransactionTuples("", "method :  gEt").observeForever {
+            assertTuples(listOf(otherTransaction, transaction), it)
+        }
+        testObject.getFilteredTransactionTuples("", "method:gEt").observeForever {
+            assertTuples(listOf(otherTransaction, transaction), it)
+        }
+        testObject.getFilteredTransactionTuples("", "METHOD:GET   ").observeForever {
+            assertTuples(listOf(otherTransaction, transaction), it)
+        }
+    }
+
+    @Test
+    fun `tuples are filtered based on request method POST`() = runBlocking {
+        val anotherTransaction = createRequest("abc").apply {
+            requestDate = 200L
+            responseCode = 418
+            method = "POST"
+        }
+
+        testObject.insertTransaction(transaction)
+        testObject.insertTransaction(otherTransaction)
+        testObject.insertTransaction(anotherTransaction)
+
+        testObject.getFilteredTransactionTuples("", "method  :   POST   ").observeForever {
+            assertTuples(listOf(anotherTransaction), it)
+        }
+
+        testObject.getFilteredTransactionTuples("", "Method:   PoST  ").observeForever {
+            assertTuples(listOf(anotherTransaction), it)
+        }
+    }
+
+    @Test
+    fun `tuples are filtered based on request method PUT`() = runBlocking {
+        val anotherTransaction = createRequest("abc").apply {
+            requestDate = 200L
+            responseCode = 418
+            method = "POST"
+        }
+        val putTransaction = createRequest("abc").apply {
+            requestDate = 200L
+            responseCode = 418
+            method = "PUT"
+        }
+        testObject.insertTransaction(transaction)
+        testObject.insertTransaction(otherTransaction)
+        testObject.insertTransaction(anotherTransaction)
+        testObject.insertTransaction(putTransaction)
+
+        testObject.getFilteredTransactionTuples("", "method:   PUT  ").observeForever {
+            assertTuples(listOf(putTransaction), it)
+        }
+    }
 }