Fix paging requests when using advanced query (#134)

When using `query` in `BuildsApi.getBuildsFlow`, paging responses would
be incorrect because requests after the 1st would be missing the `query`
parameter. For example:

```
?since=0&query="user:gabriel.feo"&maxBuilds=1000
?fromBuild=X&maxBuilds=1000
...
```

Also move `GradleEnterpriseApiIntegrationTest` to correct package.

(cherry picked from commit 8b363bb)

library/src/integrationTest/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/GradleEnterpriseApiIntegrationTest.kt → library/src/integrationTest/kotlin/com/gabrielfeo/gradle/enterprise/api/GradleEnterpriseApiIntegrationTest.kt

@@ -1,12 +1,9 @@
-package com.gabrielfeo.gradle.enterprise.api.internal
+package com.gabrielfeo.gradle.enterprise.api
 
-import com.gabrielfeo.gradle.enterprise.api.Config
-import com.gabrielfeo.gradle.enterprise.api.GradleEnterpriseApi
+import com.gabrielfeo.gradle.enterprise.api.internal.*
 import kotlinx.coroutines.test.runTest
-import okhttp3.HttpUrl.Companion.toHttpUrl
 import org.junit.jupiter.api.assertDoesNotThrow
-import kotlin.test.assertEquals
-import kotlin.test.Test
+import kotlin.test.*
 
 class GradleEnterpriseApiIntegrationTest {
 

library/src/integrationTest/kotlin/com/gabrielfeo/gradle/enterprise/api/extension/BuildsApiExtensionsTest.kt

@@ -0,0 +1,33 @@
+package com.gabrielfeo.gradle.enterprise.api.extension
+
+import com.gabrielfeo.gradle.enterprise.api.*
+import com.gabrielfeo.gradle.enterprise.api.internal.*
+import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.take
+import kotlinx.coroutines.test.runTest
+import org.junit.jupiter.api.*
+import org.junit.jupiter.api.Assertions.*
+
+class BuildsApiExtensionsTest {
+
+    @Test
+    fun getBuildsFlowUsesQueryInAllRequests() = runTest {
+        env = RealEnv
+        keychain = RealKeychain(RealSystemProperties)
+        val recorder = RequestRecorder()
+        val api = buildApi(recorder)
+        api.buildsApi.getBuildsFlow(since = 0, query = "user:*").take(2000).collect()
+        recorder.requests.forEachIndexed { i, request ->
+            assertEquals("user:*", request.url.queryParameter("query"), "[$i]")
+        }
+        api.shutdown()
+    }
+
+    private fun buildApi(recorder: RequestRecorder) =
+        GradleEnterpriseApi.newInstance(
+            config = Config(
+                clientBuilder = recorder.clientBuilder(),
+                cacheConfig = Config.CacheConfig(cacheEnabled = false),
+            )
+        )
+}

library/src/integrationTest/kotlin/com/gabrielfeo/gradle/enterprise/api/extension/RequestRecorder.kt

@@ -0,0 +1,16 @@
+package com.gabrielfeo.gradle.enterprise.api.extension
+
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.util.*
+
+class RequestRecorder {
+
+    val requests = LinkedList<Request>()
+
+    fun clientBuilder() = OkHttpClient.Builder()
+        .addNetworkInterceptor {
+            requests += it.request()
+            it.proceed(it.request())
+        }
+}

library/src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/extension/BuildsApiExtensions.kt

@@ -46,7 +46,7 @@ fun BuildsApi.getBuildsFlow(
             maxWaitSecs = maxWaitSecs,
             maxBuilds = buildsPerPage,
         )
-        val pagedBuilds = firstBuilds.asFlow().pagedUntilLastBuild(api, buildsPerPage)
+        val pagedBuilds = firstBuilds.asFlow().pagedUntilLastBuild(api, query, buildsPerPage)
         emitAll(pagedBuilds)
     }
 }

library/src/main/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/operator/pagedUntilLastBuild.kt

@@ -10,6 +10,7 @@ import kotlinx.coroutines.flow.*
  */
 internal fun Flow<Build>.pagedUntilLastBuild(
     api: BuildsApi,
+    query: String?,
     buildsPerPage: Int,
 ): Flow<Build> {
     val firstBuilds = this
@@ -22,7 +23,11 @@ internal fun Flow<Build>.pagedUntilLastBuild(
         if (lastBuildId.isEmpty()) {
             return@flow
         } else while (true) {
-            val builds = api.getBuilds(fromBuild = lastBuildId, maxBuilds = buildsPerPage)
+            val builds = api.getBuilds(
+                fromBuild = lastBuildId,
+                query = query,
+                maxBuilds = buildsPerPage,
+            )
             emitAll(builds.asFlow())
             when {
                 builds.isEmpty() || builds.size < buildsPerPage -> break

library/src/test/kotlin/com/gabrielfeo/gradle/enterprise/api/internal/operator/PagedUntilLastBuildTest.kt

@@ -30,7 +30,7 @@ class PagedUntilLastBuildTest {
     fun `Pages and stops once API sends less than maxBuilds`() = runTest {
         val channel = Channel<Build>(Channel.RENDEZVOUS)
         flowOf(api.builds[0], api.builds[1])
-            .pagedUntilLastBuild(api, buildsPerPage = 4)
+            .pagedUntilLastBuild(api, query = null, buildsPerPage = 4)
             .onEach { channel.send(it) }
             .launchIn(this)
         assertEquals(api.builds[0], channel.receive())
@@ -51,7 +51,7 @@ class PagedUntilLastBuildTest {
     fun `Pages and stops once API sends empty list`() = runTest {
         val channel = Channel<Build>(Channel.RENDEZVOUS)
         flowOf(api.builds[0])
-            .pagedUntilLastBuild(api, buildsPerPage = 2)
+            .pagedUntilLastBuild(api, query = null, buildsPerPage = 2)
             .onEach { channel.send(it) }
             .launchIn(this)
         // should wait until original Flow is collected before requesting more builds