Saving document links on Room Database (#473)

OdisBy · web-flow · commit d364ebdacf67 · 2025-06-26T14:17:52.000+02:00
diff --git a/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/WriteopiaAplicationDatabase.kt b/application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/WriteopiaAplicationDatabase.kt
@@ -37,7 +37,7 @@ expect object AppDatabaseConstructor : RoomDatabaseConstructor<WriteopiaApplicat
         UserEntity::class,
         TokenEntity::class
     ],
-    version = 22,
+    version = 23,
     exportSchema = false
 )
 @TypeConverters(IdListConverter::class)
diff --git a/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/dao/DocumentEntityDao.kt b/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/dao/DocumentEntityDao.kt
@@ -128,4 +128,7 @@ interface DocumentEntityDao {
 
     @Query("UPDATE $DOCUMENT_ENTITY set user_id = :newUserId WHERE user_id = :oldUserId")
     suspend fun moveDocumentsToNewUser(oldUserId: String, newUserId: String)
+
+    @Query("SELECT title FROM $DOCUMENT_ENTITY WHERE $DOCUMENT_ENTITY.id = :documentId")
+    suspend fun getDocumentTitleById(documentId: String): String?
 }
diff --git a/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/dao/room/RoomDocumentRepository.kt b/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/dao/room/RoomDocumentRepository.kt
@@ -3,6 +3,7 @@ package io.writeopia.sdk.persistence.dao.room
 import io.writeopia.sdk.model.document.DocumentInfo
 import io.writeopia.sdk.model.document.info
 import io.writeopia.sdk.models.document.Document
+import io.writeopia.sdk.models.link.DocumentLink
 import io.writeopia.sdk.models.story.StoryStep
 import io.writeopia.sdk.search.DocumentSearch
 import io.writeopia.sdk.repository.DocumentRepository
@@ -168,13 +169,17 @@ class RoomDocumentRepository(
         storyEntities.filter { entity -> entity.parentId == null }
             .associateBy { entity -> entity.position }
             .mapValues { (_, entity) ->
+                if (entity.linkToDocument != null) {
+                    val title = documentEntityDao.getDocumentTitleById(entity.linkToDocument)
+                    return@mapValues entity.toModel(documentLink = DocumentLink(entity.linkToDocument, title))
+                }
+
                 if (entity.hasInnerSteps) {
                     val innerSteps = storyUnitEntityDao?.queryInnerSteps(entity.id) ?: emptyList()
-
-                    entity.toModel(innerSteps)
-                } else {
-                    entity.toModel()
+                    return@mapValues entity.toModel(innerSteps)
                 }
+
+                entity.toModel()
             }
 
     private suspend fun setFavorite(ids: Set<String>, isFavorite: Boolean) {
diff --git a/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/entity/story/StoryStepEntity.kt b/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/entity/story/StoryStepEntity.kt
@@ -23,4 +23,5 @@ data class StoryStepEntity(
     @ColumnInfo(name = "background_color") val backgroundColor: Int?,
     @ColumnInfo(name = "tags") val tags: String,
     @ColumnInfo(name = "spans") val spans: String,
+    @ColumnInfo(name = "link_to_document") val linkToDocument: String? = null
 )
diff --git a/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/parse/StoryUnitParse.kt b/plugins/writeopia_persistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/parse/StoryUnitParse.kt
@@ -1,5 +1,6 @@
 package io.writeopia.sdk.persistence.parse
 
+import io.writeopia.sdk.models.link.DocumentLink
 import io.writeopia.sdk.models.span.SpanInfo
 import io.writeopia.sdk.models.story.Decoration
 import io.writeopia.sdk.models.story.StoryStep
@@ -23,7 +24,8 @@ fun StoryStepEntity.toModel(
     steps: List<StoryStepEntity> = emptyList(),
     nameToType: (String) -> StoryType = { typeName ->
         StoryTypes.fromName(typeName).type
-    }
+    },
+    documentLink: DocumentLink? = null,
 ): StoryStep =
     StoryStep(
         id = id,
@@ -47,7 +49,8 @@ fun StoryStepEntity.toModel(
             .split(",")
             .filter { it.isNotEmpty() }
             .map(SpanInfo::fromString)
-            .toSet()
+            .toSet(),
+        documentLink = documentLink
     )
 
 fun StoryStep.toEntity(position: Int, documentId: String): StoryStepEntity =
@@ -66,5 +69,6 @@ fun StoryStep.toEntity(position: Int, documentId: String): StoryStepEntity =
         hasInnerSteps = this.steps.isNotEmpty(),
         backgroundColor = this.decoration.backgroundColor,
         tags = this.tags.joinToString(separator = ",") { it.tag.label },
-        spans = this.spans.joinToString(separator = ",") { it.toText() }
+        spans = this.spans.joinToString(separator = ",") { it.toText() },
+        linkToDocument = documentLink?.id
     )

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ expect object AppDatabaseConstructor : RoomDatabaseConstructor<WriteopiaApplicat`
`37`	`37`	`UserEntity::class,`
`38`	`38`	`TokenEntity::class`
`39`	`39`	`],`
`40`		`- version = 22,`
	`40`	`+ version = 23,`
`41`	`41`	`exportSchema = false`
`42`	`42`	`)`
`43`	`43`	`@TypeConverters(IdListConverter::class)`
Original file line number	Diff line number	Diff line change
`@@ -128,4 +128,7 @@ interface DocumentEntityDao {`
`128`	`128`
`129`	`129`	`@Query("UPDATE $DOCUMENT_ENTITY set user_id = :newUserId WHERE user_id = :oldUserId")`
`130`	`130`	`suspend fun moveDocumentsToNewUser(oldUserId: String, newUserId: String)`
	`131`	`+`
	`132`	`+ @Query("SELECT title FROM $DOCUMENT_ENTITY WHERE $DOCUMENT_ENTITY.id = :documentId")`
	`133`	`+ suspend fun getDocumentTitleById(documentId: String): String?`
`131`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,4 +23,5 @@ data class StoryStepEntity(`
`23`	`23`	`@ColumnInfo(name = "background_color") val backgroundColor: Int?,`
`24`	`24`	`@ColumnInfo(name = "tags") val tags: String,`
`25`	`25`	`@ColumnInfo(name = "spans") val spans: String,`
	`26`	`+ @ColumnInfo(name = "link_to_document") val linkToDocument: String? = null`
`26`	`27`	`)`