feat: allow metadata modification on root space

d1snin · Aug 16, 2023 · fa875fa · fa875fa
1 parent 146dc46
commit fa875fa
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/beam-client/src/commonMain/kotlin/dev/d1s/beam/client/Builders.kt b/beam-client/src/commonMain/kotlin/dev/d1s/beam/client/Builders.kt
@@ -24,6 +24,8 @@ internal annotation class BuilderDsl
 @BuilderDsl
 public class RootSpaceModificationBuilder {
 
+    private var metadata: Metadata = metadataOf()
+
     private var view: ViewConfiguration? = null
 
     public fun view(build: ViewConfigurationBuilder.() -> Unit) {
@@ -32,6 +34,7 @@ public class RootSpaceModificationBuilder {
 
     internal fun build() =
         RootSpaceModification(
+            metadata,
             view ?: error("View is undefined")
         )
 }
@@ -41,7 +44,7 @@ public class SpaceModificationBuilder {
 
     public var slug: SpaceSlug? = null
 
-    public var metadata: Metadata? = null
+    public var metadata: Metadata = metadataOf()
 
     private var view: ViewConfiguration? = null
 
@@ -52,7 +55,7 @@ public class SpaceModificationBuilder {
     internal fun build() =
         SpaceModification(
             slug ?: error("Space slug is undefined"),
-            metadata ?: error("Space metadata is undefined"),
+            metadata,
             view ?: error("View is undefined")
         )
 }

diff --git a/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/Space.kt b/beam-common/src/commonMain/kotlin/dev/d1s/beam/commons/Space.kt
@@ -26,14 +26,14 @@ public typealias SpaceToken = String
 
 public sealed interface ModifiedRootSpace {
 
+    public val metadata: Metadata
+
     public val view: ViewConfiguration
 }
 
 public sealed interface ModifiedSpace : ModifiedRootSpace {
 
     public val slug: SpaceSlug
-
-    public val metadata: Metadata
 }
 
 public sealed interface IdentifiedSpace : ModifiedSpace {
@@ -67,6 +67,7 @@ public data class SpaceModification(
 
 @Serializable
 public data class RootSpaceModification(
+    override val metadata: Metadata,
     override val view: ViewConfiguration
 ) : ModifiedRootSpace
 

diff --git a/...daemon/src/main/kotlin/dev/d1s/beam/daemon/converter/RootSpaceModificationDtoConverter.kt b/...daemon/src/main/kotlin/dev/d1s/beam/daemon/converter/RootSpaceModificationDtoConverter.kt
@@ -25,6 +25,7 @@ class RootSpaceModificationDtoConverter : DtoConverter<SpaceEntity, RootSpaceMod
 
     override suspend fun convertToEntity(dto: RootSpaceModification) =
         SpaceEntity {
+            metadata = dto.metadata
             view = dto.view
         }
 }
diff --git a/beam-daemon/src/main/kotlin/dev/d1s/beam/daemon/service/SpaceService.kt b/beam-daemon/src/main/kotlin/dev/d1s/beam/daemon/service/SpaceService.kt
@@ -122,7 +122,7 @@ class DefaultSpaceService : SpaceService, KoinComponent {
 
             val rootSpace = SpaceEntity {
                 slug = SpaceEntity.ROOT_SPACE_SLUG
-                metadata = metadataOf()
+                metadata = space.metadata
                 view = space.view
                 role = Role.ROOT
             }
@@ -230,6 +230,7 @@ class DefaultSpaceService : SpaceService, KoinComponent {
             requireNotNull(originalSpaceDto)
 
             originalSpace.apply {
+                this.metadata = modification.metadata
                 this.view = modification.view
             }