fix(#79-support-search): fuckery is all

meetacy · Oct 30, 2023 · 25a7bbb · 25a7bbb
1 parent a58088c
commit 25a7bbb
Show file tree

Hide file tree

Showing 6 changed files with 34 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
@@ -31,6 +31,7 @@ import app.meetacy.sdk.types.url.Url
 import app.meetacy.sdk.types.user.RegularUser
 import app.meetacy.sdk.types.user.UserLocationSnapshot
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.request.*
 import io.rsocket.kotlin.ktor.client.rSocket
 import io.rsocket.kotlin.payload.Payload
@@ -62,7 +63,7 @@ internal class FriendsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
         return response
     }
 
@@ -77,7 +78,7 @@ internal class FriendsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
         return response
     }
 

diff --git a/...c/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/invitations/InvitationsEngine.kt b/...c/commonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/invitations/InvitationsEngine.kt
@@ -18,6 +18,7 @@ import app.meetacy.sdk.types.serializable.user.UserIdSerializable
 import app.meetacy.sdk.types.serializable.user.serializable
 import app.meetacy.sdk.types.url.Url
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.request.*
 import kotlinx.serialization.Serializable
 
@@ -63,7 +64,7 @@ internal class InvitationsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
     }
 
     @Serializable
@@ -79,7 +80,7 @@ internal class InvitationsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
     }
 
     @Serializable
@@ -95,6 +96,6 @@ internal class InvitationsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
     }
 }
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
@@ -29,6 +29,7 @@ import app.meetacy.sdk.types.serializable.paging.serializable
 import app.meetacy.sdk.types.serializable.user.type
 import app.meetacy.sdk.types.url.Url
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.request.*
 import kotlinx.serialization.Serializable
 
@@ -140,17 +141,17 @@ internal class MeetingsEngine(
     @Serializable
     private data class CreateMeetingBody(
         val title: String?,
+        val description: String?,
         val date: DateSerializable,
         val location: LocationSerializable,
-        val description: String?,
         val visibility: MeetingSerializable.Visibility,
-        val fileId: FileIdSerializable?
+        val avatarId: FileIdSerializable?
     )
     private fun CreateMeetingRequest.toBody() = CreateMeetingBody(
         title,
+        description,
         date.serializable(),
         location.serializable(),
-        description,
         visibility.serializable(),
         fileId?.serializable()
     )
@@ -171,22 +172,22 @@ internal class MeetingsEngine(
     @Serializable
     private data class EditMeetingBody(
         val meetingId: MeetingIdSerializable,
-        val title: OptionalSerializable<String>,
-        val description: OptionalSerializable<String?>,
-        val location: OptionalSerializable<LocationSerializable>,
-        val date: OptionalSerializable<DateSerializable>,
-        val avatarId: OptionalSerializable<FileIdSerializable?>,
-        val visibility: OptionalSerializable<MeetingSerializable.Visibility>
+        val title: String?,
+        val description: String?,
+        val location: LocationSerializable?,
+        val date: DateSerializable?,
+        val avatarId: OptionalSerializable<FileIdSerializable?> = OptionalSerializable.Undefined,
+        val visibility: MeetingSerializable.Visibility?
     )
 
     private fun EditMeetingRequest.toBody() = EditMeetingBody(
         meetingId.serializable(),
-        title.serializable(),
-        description.serializable(),
-        location.map { it.serializable() }.serializable(),
-        date.map { it.serializable() }.serializable(),
+        title,
+        description,
+        location?.serializable(),
+        date?.serializable(),
         avatarId.map { it?.serializable() }.serializable(),
-        visibility.map { it.serializable() }.serializable()
+        visibility?.serializable()
     )
 
     suspend fun editMeeting(request: EditMeetingRequest): EditMeetingRequest.Response = with(request) {
@@ -243,7 +244,7 @@ internal class MeetingsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
     }
 
     @Serializable

diff --git a/...mmonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/notifications/NotificationsEngine.kt b/...mmonMain/kotlin/app/meetacy/sdk/engine/ktor/requests/notifications/NotificationsEngine.kt
@@ -18,6 +18,7 @@ import app.meetacy.sdk.types.serializable.paging.PagingIdSerializable
 import app.meetacy.sdk.types.serializable.paging.serializable
 import app.meetacy.sdk.types.url.Url
 import io.ktor.client.*
+import io.ktor.client.call.*
 import io.ktor.client.request.*
 import kotlinx.serialization.Serializable
 
@@ -64,6 +65,6 @@ internal class NotificationsEngine(
             apiVersion(request.apiVersion)
             token(request.token)
             setBody(body)
-        }.bodyAsSuccess<StatusTrueResponse>()
+        }.body<StatusTrueResponse>()
     }
 }
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
@@ -56,9 +56,9 @@ internal class UsersEngine(
 
     @Serializable
     private data class EditUserBody(
-        val nickname: OptionalSerializable<String>,
-        val avatarId: OptionalSerializable<FileIdSerializable?>,
-        val username: OptionalSerializable<UsernameSerializable?>
+        val nickname: OptionalSerializable<String> = OptionalSerializable.Undefined,
+        val avatarId: OptionalSerializable<FileIdSerializable?> = OptionalSerializable.Undefined,
+        val username: OptionalSerializable<UsernameSerializable?> = OptionalSerializable.Undefined
     )
 
     private fun EditUserRequest.toBody() = EditUserBody(

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/EditMeetingRequest.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/engine/requests/EditMeetingRequest.kt
@@ -11,12 +11,12 @@ import app.meetacy.sdk.types.optional.Optional
 public data class EditMeetingRequest(
     public val token: Token,
     public val meetingId: MeetingId,
-    public val title: Optional<String>,
-    public val description: Optional<String?>,
-    public val location: Optional<Location>,
-    public val date: Optional<Date>,
-    public val avatarId: Optional<FileId?>,
-    public val visibility: Optional<Meeting.Visibility>
+    public val avatarId: Optional<FileId?> = Optional.Undefined,
+    public val title: String?,
+    public val description: String?,
+    public val location: Location?,
+    public val date: Date?,
+    public val visibility: Meeting.Visibility?
 ) : MeetacyRequest<EditMeetingRequest.Response> {
     public data class Response(val meeting: Meeting)
 }