GraphQL Migration

.changeset/friendly-cats-beg.md

@@ -0,0 +1,8 @@
+---
+"magicbell-android": major
+---
+
+Updated topic and category filtering APIs in `StorePredicate`
+
+Previously one was able to filter for multiple topics and categories, but this functionality is now deprecated in favor of only filtering for a single topic and category.
+Please reach out to us via the [Community](http://www.magicbell.com/community) if you need the previous functionality.

.changeset/spotty-eels-hope.md

@@ -0,0 +1,5 @@
+---
+"magicbell-android": minor
+---
+
+Fixed a bug where a topic filter value would be passed as a category

README.md

@@ -250,9 +250,9 @@ val unreadNotifications = user.store.build(read = false)
 
 val archivedNotifications = user.store.build(archived = true)
 
-val billingNotifications = user.store.build(categories = ["billing"])
+val billingNotifications = user.store.build(category = "billing")
 
-val firstOrderNotifications = user.store.build(topics = ["order:001"])
+val firstOrderNotifications = user.store.build(topic = "order:001")
 ```
 
 These are the attributes of a notification store:
@@ -328,16 +328,16 @@ These are the available options:
 
 | Param        | Options                            | Default        | Description                    |
 | ------------ | ---------------------------------- | -------------- | ------------------------------ |
-| `read`       | `true`, `false`, `nil` | `nil` | Filter by the `read` state (`nil` means unspecified)    |
-| `seen`       | `true`, `false`, `nil` | `nil` | Filter by the `seen` state (`nil` means unspecified)    |
-| `archived`   | `true`, `false`         | `false`  | Filter by the `archived` state |
-| `categories` | `[String]`                         | `[]`           | Filter by categories          |
-| `topics`     | `[String]`                         | `[]`           | Filter by topics               |
+| `read`       | `true`, `false`, `null`            | `null`         | Filter by the `read` state (`null` means unspecified) |
+| `seen`       | `true`, `false`, `null`            | `null`         | Filter by the `seen` state (`null` means unspecified) |
+| `archived`   | `true`, `false`                    | `false`        | Filter by the `archived` state |
+| `category`   | `String`                           | `null`         | Filter by category             |
+| `topic`      | `String`                           | `null`         | Filter by topic                |
 
 For example, use this predicate to fetch unread notifications of the `"important"` category:
 
 ```kotlin
-val predicate = StorePredicate(read = true, categories = ["important"])
+val predicate = StorePredicate(read = true, category = "important")
 val store = user.store.build(predicate)
 ```
 
@@ -392,7 +392,7 @@ for (notification in store) {
 }
 
 // As an array
-val notifications = store.notifications()
+val notifications = store.notifications
 ```
 
 Enumeration is also available:

sdk/src/main/java/com/magicbell/sdk/SDKProvider.kt

@@ -85,7 +85,6 @@ internal class DefaultSDKModule(
       coroutinesComponent.coroutineDispatcher,
       coroutineScope,
       MainThreadExecutor(Handler(Looper.getMainLooper())),
-      context,
       notificationComponent,
       storeRealTimeComponent,
       configComponent

sdk/src/main/java/com/magicbell/sdk/common/network/HttpClient.kt

@@ -4,28 +4,31 @@ import com.magicbell.sdk.common.environment.Environment
 import com.magicbell.sdk.common.error.NetworkErrorEntity
 import com.magicbell.sdk.common.error.NetworkException
 import kotlinx.serialization.json.Json
+import okhttp3.HttpUrl.Companion.toHttpUrlOrNull
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody.Companion.toRequestBody
 
 typealias HttpHeaders = Array<HeaderNameAndValue>
 typealias HeaderNameAndValue = Pair<String, String>
+typealias QueryParameters = List<Pair<String, String>>
+
 internal interface HttpClient {
   fun prepareRequest(
     path: String,
     externalId: String?,
     email: String?,
     hmac: String?,
-    httpMethod: HttpMethod = HttpMethod.Get,
+    httpMethod: HttpMethod = HttpMethod.Get(),
     additionalHeaders: HttpHeaders = emptyArray()
   ): Request
 
   suspend fun performRequest(request: Request): String?
 
-  sealed class HttpMethod(val name: String, val body: String? = null) {
-    object Get: HttpMethod("GET")
-    class Post(body: String = ""): HttpMethod("POST", body)
-    class Put(body: String = ""): HttpMethod("PUT", body)
+  sealed class HttpMethod(val name: String, val queryParams: QueryParameters? = null, val body: String? = null) {
+    class Get(queryParams: QueryParameters = listOf()) : HttpMethod("GET", queryParams = queryParams)
+    class Post(body: String = ""): HttpMethod("POST", body = body)
+    class Put(body: String = ""): HttpMethod("PUT", body = body)
     object Delete: HttpMethod("DELETE")
   }
 }
@@ -37,8 +40,16 @@ internal class DefaultHttpClient(
 ) : HttpClient {
 
   override fun prepareRequest(path: String, externalId: String?, email: String?, hmac: String?, httpMethod: HttpClient.HttpMethod, additionalHeaders: HttpHeaders): Request {
+    val urlBuilder = "${environment.baseUrl}/$path".toHttpUrlOrNull()!!.newBuilder()
+
+    httpMethod.queryParams?.let {
+      for ((key, value) in it) {
+        urlBuilder.addQueryParameter(key, value)
+      }
+    }
+
     val request = Request.Builder()
-      .url("${environment.baseUrl}/$path")
+      .url(urlBuilder.build())
       .addHeader("X-MAGICBELL-API-KEY", environment.apiKey)
 
     hmac?.also {

sdk/src/main/java/com/magicbell/sdk/feature/notificationpreferences/data/NotificationPreferencesNetworkDataSource.kt

@@ -23,7 +23,7 @@ internal class NotificationPreferencesNetworkDataSource(
           query.externalId,
           query.email,
           query.hmac,
-          HttpClient.HttpMethod.Get,
+          HttpClient.HttpMethod.Get(),
           arrayOf(Pair("accept-version", "v2"))
         )