fix(#76-support-search): fuckery optional again

meetacy · Oct 31, 2023 · 07be05a · 07be05a
1 parent 491d3a5
commit 07be05a
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 60 deletions.
diff --git a/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/KtorMeetacyEngine.kt b/api/api-ktor/src/commonMain/kotlin/app/meetacy/sdk/engine/ktor/KtorMeetacyEngine.kt
@@ -24,6 +24,8 @@ import io.ktor.client.call.*
 import io.ktor.client.plugins.*
 import io.ktor.client.plugins.contentnegotiation.*
 import io.ktor.client.plugins.websocket.*
+import io.ktor.client.request.*
+import io.ktor.http.*
 import io.ktor.utils.io.errors.*
 import io.rsocket.kotlin.ktor.client.RSocketSupport
 import kotlinx.coroutines.CancellationException
@@ -49,6 +51,9 @@ public class KtorMeetacyEngine(
                 ignoreUnknownKeys = true
             }
         }
+        defaultRequest {
+            header(HttpHeaders.ContentType, ContentType.Application.Json.toString())
+        }
     }
 
     private val auth = AuthEngine(baseUrl, this.httpClient)

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 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?
+    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>
 ) : MeetacyRequest<EditMeetingRequest.Response> {
     public data class Response(val meeting: Meeting)
 }
diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/AuthorizedMeetingRepository.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/AuthorizedMeetingRepository.kt
@@ -21,7 +21,7 @@ public class AuthorizedMeetingRepository(
     public val creator: User get() = data.creator
     public val date: Date get() = data.date
     public val location: Location get() = data.location
-    public val title: String? get() = data.title
+    public val title: String get() = data.title
     public val description: String? get() = data.description
     public val participantsCount: Int get() = data.participantsCount
     public val previewParticipants: List<User> get() = data.previewParticipants
@@ -33,28 +33,28 @@ public class AuthorizedMeetingRepository(
         AuthorizedMeetingParticipantsRepository(data.id, api)
 
     public suspend fun edited(
-        title: String? = null,
-        date: Date? = null,
-        location: Location? = null,
-        description: String? = null,
-        avatarId: FileId? = null,
-        visibility: Meeting.Visibility? = null
+        title: String,
+        date: Date,
+        location: Location,
+        description: String?,
+        avatarId: FileId?,
+        visibility: Meeting.Visibility
     ): AuthorizedMeetingRepository = edited(
-        title = title,
-        date = date,
-        location = location,
-        description = description,
+        title = Optional.Present(title),
+        date = Optional.Present(date),
+        location = Optional.Present(location),
+        description = Optional.Present(description),
         avatarId = Optional.Present(avatarId),
-        visibility = visibility,
+        visibility = Optional.Present(visibility),
     )
 
     public suspend fun edited(
-        title: String?,
-        date: Date?,
-        location: Location?,
-        description: String?,
+        title: Optional<String> = Optional.Undefined,
+        date: Optional<Date> = Optional.Undefined,
+        location: Optional<Location> = Optional.Undefined,
+        description: Optional<String?> = Optional.Undefined,
         avatarId: Optional<FileId?> = Optional.Undefined,
-        visibility: Meeting.Visibility?
+        visibility: Optional<Meeting.Visibility> = Optional.Undefined
     ): AuthorizedMeetingRepository {
         return api.meetings.edit(
             meetingId = data.id,

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/AuthorizedMeetingsApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/AuthorizedMeetingsApi.kt
@@ -55,22 +55,22 @@ public class AuthorizedMeetingsApi(
         visibility: Meeting.Visibility
     ): AuthorizedMeetingRepository = edit(
         meetingId = meetingId,
-        title = title,
-        date = date,
-        location = location,
-        description = description,
+        title = Optional.Present(title),
+        date = Optional.Present(date),
+        location = Optional.Present(location),
+        description = Optional.Present(description),
         avatarId = Optional.Present(avatarId),
-        visibility = visibility
+        visibility = Optional.Present(visibility),
     )
 
     public suspend fun edit(
         meetingId: MeetingId,
-        title: String?,
-        date: Date?,
-        location: Location?,
-        description: String?,
+        title: Optional<String> = Optional.Undefined,
+        date: Optional<Date> = Optional.Undefined,
+        location: Optional<Location> = Optional.Undefined,
+        description: Optional<String?> = Optional.Undefined,
         avatarId: Optional<FileId?> = Optional.Undefined,
-        visibility: Meeting.Visibility?
+        visibility: Optional<Meeting.Visibility> = Optional.Undefined
     ): AuthorizedMeetingRepository {
         val meeting = api.base.meetings.edit(
             token = api.token,

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/MeetingRepository.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/MeetingRepository.kt
@@ -24,7 +24,7 @@ public class MeetingRepository(
     public val creator: User get() = data.creator
     public val date: Date get() = data.date
     public val location: Location get() = data.location
-    public val title: String? get() = data.title
+    public val title: String get() = data.title
     public val description: String? get() = data.description
     public val participantsCount: Int get() = data.participantsCount
     public val previewParticipants: List<User> get() = data.previewParticipants
@@ -36,30 +36,30 @@ public class MeetingRepository(
 
     public suspend fun edited(
         token: Token,
-        title: String?,
-        date: Date?,
-        location: Location?,
+        title: String,
+        date: Date,
+        location: Location,
         description: String?,
         avatarId: FileId?,
-        visibility: Meeting.Visibility?
+        visibility: Meeting.Visibility
     ): MeetingRepository = edited(
         token = token,
-        title = title,
-        date = date,
-        location = location,
-        description = description,
+        title = Optional.Present(title),
+        date = Optional.Present(date),
+        location = Optional.Present(location),
+        description = Optional.Present(description),
         avatarId = Optional.Present(avatarId),
-        visibility = visibility,
+        visibility = Optional.Present(visibility),
     )
 
     public suspend fun edited(
         token: Token,
-        title: String?,
-        date: Date?,
-        location: Location?,
-        description: String?,
+        title: Optional<String> = Optional.Undefined,
+        date: Optional<Date> = Optional.Undefined,
+        location: Optional<Location> = Optional.Undefined,
+        description: Optional<String?> = Optional.Undefined,
         avatarId: Optional<FileId?> = Optional.Undefined,
-        visibility: Meeting.Visibility?
+        visibility: Optional<Meeting.Visibility> = Optional.Undefined
     ): MeetingRepository {
         return api.meetings.edit(
             token = token,

diff --git a/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/MeetingsApi.kt b/api/src/commonMain/kotlin/app/meetacy/sdk/meetings/MeetingsApi.kt
@@ -62,23 +62,23 @@ public class MeetingsApi(private val api: MeetacyApi) {
     ): MeetingRepository = edit(
         token = token,
         meetingId = meetingId,
-        title = title,
-        date = date,
-        location = location,
-        description = description,
+        title = Optional.Present(title),
+        date = Optional.Present(date),
+        location = Optional.Present(location),
+        description = Optional.Present(description),
         avatarId = Optional.Present(avatarId),
-        visibility = visibility,
+        visibility = Optional.Present(visibility),
     )
 
     public suspend fun edit(
         token: Token,
         meetingId: MeetingId,
-        title: String?,
-        date: Date?,
-        location: Location?,
-        description: String?,
+        title: Optional<String> = Optional.Undefined,
+        date: Optional<Date> = Optional.Undefined,
+        location: Optional<Location> = Optional.Undefined,
+        description: Optional<String?> = Optional.Undefined,
         avatarId: Optional<FileId?> = Optional.Undefined,
-        visibility: Meeting.Visibility?
+        visibility: Optional<Meeting.Visibility> = Optional.Undefined
     ): MeetingRepository {
         val meeting = api.engine.execute(
             EditMeetingRequest(

diff --git a/...e/src/commonMain/kotlin/app/meetacy/sdk/types/serializable/meeting/MeetingSerializable.kt b/...e/src/commonMain/kotlin/app/meetacy/sdk/types/serializable/meeting/MeetingSerializable.kt
@@ -22,7 +22,7 @@ public data class MeetingSerializable(
     val creator: UserSerializable,
     val date: DateSerializable,
     val location: LocationSerializable,
-    val title: String?,
+    val title: String,
     val description: String? = null,
     val participantsCount: Int,
     val previewParticipants: List<UserSerializable>,

diff --git a/types/src/commonMain/kotlin/app/meetacy/sdk/types/meeting/Meeting.kt b/types/src/commonMain/kotlin/app/meetacy/sdk/types/meeting/Meeting.kt
@@ -15,7 +15,7 @@ public data class Meeting(
     val creator: User,
     val date: Date,
     val location: Location,
-    val title: String?,
+    val title: String,
     val description: String?,
     val participantsCount: Int,
     val previewParticipants: List<User>,