fix(#93-add-getSubscriptions-and-getSubscribers-methods): promt in fi…

…rst place in search request
meetacy · Mar 7, 2024 · 58487fa · 58487fa
1 parent 2bdbdb4
commit 58487fa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/...pi-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/search/SearchEngine.kt b/...pi-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/search/SearchEngine.kt
@@ -20,9 +20,9 @@ internal class SearchEngine(
         val response =  httpClient.get(baseUrl.string) {
             apiVersion(request.apiVersion)
             token(request.token)
+            parameter("prompt", request.prompt)
             parameter("latitude", request.location?.latitude)
             parameter("longitude", request.location?.longitude)
-            parameter("prompt", request.prompt)
         }.bodyAsSuccess<List<SearchItemSerializable>>()
         return SearchRequest.Response(response.map { it.type() })
     }

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/AuthorizedMeetacyApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/AuthorizedMeetacyApi.kt
@@ -12,7 +12,6 @@ import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.location.Location
 import app.meetacy.sdk.updates.AuthorizedUpdatesApi
 import app.meetacy.sdk.users.AuthorizedSelfUserDetailsRepository
-import app.meetacy.sdk.users.AuthorizedSelfUserRepository
 import app.meetacy.sdk.users.AuthorizedUsersApi
 
 /**
@@ -44,6 +43,6 @@ public class AuthorizedMeetacyApi @UnsafeConstructor constructor(
         )
 
     public suspend fun search(location: Location?, prompt: String): List<AuthorizedSearchItemRepository> =
-        base.search(token, location, prompt).map { AuthorizedSearchItemRepository.of(it.data, api = this) }
+        base.search(prompt, token, location).map { AuthorizedSearchItemRepository.of(it.data, api = this) }
 
 }
diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/MeetacyApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/MeetacyApi.kt
@@ -13,8 +13,6 @@ import app.meetacy.sdk.search.SearchItemRepository
 import app.meetacy.sdk.types.annotation.UnsafeConstructor
 import app.meetacy.sdk.types.auth.Token
 import app.meetacy.sdk.types.location.Location
-import app.meetacy.sdk.types.user.SelfUser
-import app.meetacy.sdk.types.user.SelfUserDetails
 import app.meetacy.sdk.updates.UpdatesApi
 import app.meetacy.sdk.users.SelfUserDetailsRepository
 import app.meetacy.sdk.users.UsersApi
@@ -40,13 +38,13 @@ public class MeetacyApi(
     }
 
     public suspend fun search(
+        prompt: String,
         token: Token,
-        location: Location?,
-        prompt: String
+        location: Location?
     ): List<SearchItemRepository> {
         return engine.execute(
             request = SearchRequest(
-                token, location, prompt
+                prompt, token, location
             )
         ).items.map { searchItem ->
             SearchItemRepository.of(searchItem, api = this)

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/SearchRequest.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/SearchRequest.kt
@@ -5,9 +5,9 @@ import app.meetacy.sdk.types.location.Location
 import app.meetacy.sdk.types.search.SearchItem
 
 public data class SearchRequest(
+    val prompt: String,
     val token: Token,
-    val location: Location?,
-    val prompt: String
+    val location: Location?
 ) : MeetacyRequest<SearchRequest.Response> {
     public data class Response(val items: List<SearchItem>)
 }