Merge pull request #89 from meetacy/#177-search-without-location

feat(#177-search-without-location): added support search without loca…
meetacy · Feb 28, 2024 · 16b47c2 · 16b47c2
2 parents 2ffd9e5 + f8b4165
commit 16b47c2
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 30 deletions.
diff --git a/...-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/friends/FriendsEngine.kt b/...-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/friends/FriendsEngine.kt
@@ -73,7 +73,7 @@ internal class FriendsEngine(
     suspend fun delete(request: DeleteFriendRequest) {
         val url =  baseUrl / "delete"
         val body = request.toBody()
-        httpClient.post(url.string) {
+        httpClient.delete(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)

diff --git a/...tor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/meetings/MeetingsEngine.kt b/...tor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/meetings/MeetingsEngine.kt
@@ -37,9 +37,7 @@ import app.meetacy.sdk.types.serializable.user.type
 import app.meetacy.sdk.types.url.Url
 import io.ktor.client.HttpClient
 import io.ktor.client.call.body
-import io.ktor.client.request.get
-import io.ktor.client.request.post
-import io.ktor.client.request.setBody
+import io.ktor.client.request.*
 import kotlinx.serialization.Serializable
 
 internal class MeetingsEngine(
@@ -76,43 +74,31 @@ internal class MeetingsEngine(
         return ListMeetingsHistoryRequest.Response(response)
     }
 
-    private fun ListActiveMeetingsRequest.toBody() = ListMeetingsPagingBody(
-        amount.serializable(),
-        pagingId?.serializable()
-    )
-
     suspend fun listActiveMeetings(
         request: ListActiveMeetingsRequest
     ): ListActiveMeetingsRequest.Response {
         val url = baseUrl / "history" / "active"
-        val body = request.toBody()
-
         val response = httpClient.get(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
-            setBody(body)
+            parameter("amount", request.amount.int)
+            parameter("pagingId", request.pagingId?.string)
         }.bodyAsSuccess<PagingResponseSerializable<MeetingSerializable>>()
             .type()
             .mapItems { meeting -> meeting.type() }
 
         return ListActiveMeetingsRequest.Response(response)
     }
 
-    private fun ListPastMeetingsRequest.toBody() = ListMeetingsPagingBody(
-        amount.serializable(),
-        pagingId?.serializable()
-    )
-
     suspend fun listPastMeetings(
         request: ListPastMeetingsRequest
     ): ListPastMeetingsRequest.Response {
         val url = baseUrl / "history" / "past"
-        val body = request.toBody()
-
-        val response = httpClient.post(url.string) {
+        val response = httpClient.get(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
-            setBody(body)
+            parameter("amount", request.amount.int)
+            parameter("pagingId", request.pagingId?.string)
         }.bodyAsSuccess<PagingResponseSerializable<MeetingSerializable>>()
             .type()
             .mapItems { meeting -> meeting.type() }
@@ -164,7 +150,7 @@ internal class MeetingsEngine(
 
     suspend fun createMeeting(
         request: CreateMeetingRequest
-    ): CreateMeetingRequest.Response = with(request) {
+    ): CreateMeetingRequest.Response {
         val url = baseUrl / "create"
         val body = request.toBody()
         val response = httpClient.post(url.string) {
@@ -199,7 +185,7 @@ internal class MeetingsEngine(
     suspend fun editMeeting(request: EditMeetingRequest): EditMeetingRequest.Response = with(request) {
         val url = baseUrl / "edit"
         val body = request.toBody()
-        val response = httpClient.post(url.string) {
+        val response = httpClient.put(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)

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,8 +20,8 @@ internal class SearchEngine(
         val response =  httpClient.get(baseUrl.string) {
             apiVersion(request.apiVersion)
             token(request.token)
-            parameter("latitude", request.location.latitude)
-            parameter("longitude", request.location.longitude)
+            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/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/users/UsersEngine.kt b/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/users/UsersEngine.kt
@@ -69,7 +69,7 @@ internal class UsersEngine(
     suspend fun editUser(request: EditUserRequest): EditUserRequest.Response {
         val url = baseUrl / "edit"
         val body = request.toBody()
-        val response = httpClient.post(url.string) {
+        val response = httpClient.put(url.string) {
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/AuthorizedMeetacyApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/AuthorizedMeetacyApi.kt
@@ -41,7 +41,7 @@ public class AuthorizedMeetacyApi @UnsafeConstructor constructor(
             data = base.getMe(token),
             api = this
         )
-    public suspend fun search(location: Location, prompt: String): List<AuthorizedSearchItemRepository> =
+    public suspend fun search(location: Location?, prompt: String): List<AuthorizedSearchItemRepository> =
         base.search(token, location, prompt).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
@@ -35,7 +35,7 @@ public class MeetacyApi(
 
     public suspend fun search(
         token: Token,
-        location: Location,
+        location: Location?,
         prompt: String
     ): List<SearchItemRepository> {
         return engine.execute(

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
@@ -6,7 +6,7 @@ import app.meetacy.sdk.types.search.SearchItem
 
 public data class SearchRequest(
     val token: Token,
-    val location: Location,
+    val location: Location?,
     val prompt: String
 ) : MeetacyRequest<SearchRequest.Response> {
     public data class Response(val items: List<SearchItem>)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,7 +2,7 @@
 
 kotlin = "1.9.0"
 ktor = "2.3.6"
-meetacySdk = "0.0.61"
+meetacySdk = "0.0.62"
 
 # kotlinx
 kotlinxCoroutines = "1.6.4"