From 7d0da2d93bef19d37f8f7e0393b13f124ce40fbf Mon Sep 17 00:00:00 2001
From: Satindar Dhillon <satindar@gmail.com>
Date: Mon, 26 Sep 2022 10:36:09 -0700
Subject: [PATCH] create a networker object to handle gql queries

---
 .../java/app/omnivore/omnivore/Networker.kt   | 28 +++++++++++++++++++
 .../omnivore/ui/home/HomeViewModel.kt         | 21 ++++----------
 2 files changed, 34 insertions(+), 15 deletions(-)
 create mode 100644 android/Omnivore/app/src/main/java/app/omnivore/omnivore/Networker.kt

diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Networker.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Networker.kt
new file mode 100644
index 000000000..b3af5fe5c
--- /dev/null
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/Networker.kt
@@ -0,0 +1,28 @@
+package app.omnivore.omnivore
+
+import app.omnivore.omnivore.graphql.generated.SearchQuery
+import com.apollographql.apollo3.ApolloClient
+import com.apollographql.apollo3.api.ApolloResponse
+import com.apollographql.apollo3.api.Optional
+
+object Networker {
+  private fun apolloClient(authToken: String) = ApolloClient.Builder()
+    .serverUrl("${Constants.apiURL}/api/graphql")
+    .addHttpHeader("Authorization", value = authToken)
+    .build()
+
+  suspend fun search(
+    cursor: String? = null,
+    limit: Int = 15,
+    query: String,
+    authToken: String?
+  ): ApolloResponse<SearchQuery.Data> {
+    return apolloClient(authToken ?: "").query(
+      SearchQuery(
+        after = Optional.presentIfNotNull(cursor),
+        first = Optional.presentIfNotNull(limit),
+        query = Optional.presentIfNotNull(query)
+      )
+    ).execute()
+  }
+}
diff --git a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/home/HomeViewModel.kt b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/home/HomeViewModel.kt
index 97f1ff200..87ca4473b 100644
--- a/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/home/HomeViewModel.kt
+++ b/android/Omnivore/app/src/main/java/app/omnivore/omnivore/ui/home/HomeViewModel.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope
 import app.omnivore.omnivore.Constants
 import app.omnivore.omnivore.DatastoreKeys
 import app.omnivore.omnivore.DatastoreRepository
+import app.omnivore.omnivore.Networker
 import app.omnivore.omnivore.graphql.generated.SearchQuery
 import app.omnivore.omnivore.models.LinkedItem
 import com.apollographql.apollo3.ApolloClient
@@ -56,19 +57,9 @@ class HomeViewModel @Inject constructor(
       searchIdx += 1
       val authToken = getAuthToken()
 
-      val apolloClient = ApolloClient.Builder()
-        .serverUrl("${Constants.apiURL}/api/graphql")
-        .addHttpHeader("Authorization", value = authToken ?: "")
-        .build()
-
-      val response = apolloClient.query(
-        SearchQuery(
-          after = Optional.presentIfNotNull(cursor),
-          first = Optional.presentIfNotNull(15),
-          query = Optional.presentIfNotNull(searchQuery())
-        )
-      ).execute()
-
+      val searchResult = Networker.search(
+        cursor = cursor, query = searchQuery(), authToken = authToken
+      )
 
       // Search results aren't guaranteed to return in order so this
       // will discard old results that are returned while a user is typing.
@@ -79,9 +70,9 @@ class HomeViewModel @Inject constructor(
         return@launch
       }
 
-      cursor = response.data?.search?.onSearchSuccess?.pageInfo?.endCursor
+      cursor = searchResult.data?.search?.onSearchSuccess?.pageInfo?.endCursor
       receivedIdx = thisSearchIdx
-      val itemList = response.data?.search?.onSearchSuccess?.edges ?: listOf()
+      val itemList = searchResult.data?.search?.onSearchSuccess?.edges ?: listOf()
       
       val newItems = itemList.map {
         LinkedItem(