Skip to content

Not loading deleted documents from DB in Android #545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
leandroBorgesFerreira merged 1 commit into from
Dec 8, 2025
Merged

Not loading deleted documents from DB in Android #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...e_room/src/commonMain/kotlin/io/writeopia/persistence/room/WriteopiaAplicationDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ expect object AppDatabaseConstructor : RoomDatabaseConstructor<WriteopiaApplicat
TokenEntity::class,
WorkspaceEntity::class
],
version = 25,
version = 26,
exportSchema = false
)
@TypeConverters(IdListConverter::class)
Expand Down
2 changes: 1 addition & 1 deletion backend/core/database/src/main/sqldelight/io/writeopia/sql/DocumentEntity.sq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LIMIT 1;
selectWithContent:
SELECT *
FROM document_entity
LEFT JOIN story_step_entity ON document_entity.id=story_step_entity.document_id
INNER JOIN story_step_entity ON document_entity.id=story_step_entity.document_id
WHERE deleted = FALSE
ORDER BY position;

Expand Down
22 changes: 11 additions & 11 deletions ...sistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/dao/DocumentEntityDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ interface DocumentEntityDao {
// The order here doesn't matter, because only one document should be returned
@Query(
"SELECT * FROM $DOCUMENT_ENTITY " +
"LEFT JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.id = :documentId " +
"JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.id = :documentId AND is_deleted = FALSE " +
"ORDER BY $DOCUMENT_ENTITY.created_at, $STORY_UNIT_ENTITY.position"
)
suspend fun loadDocumentWithContentById(
Expand All @@ -68,8 +68,8 @@ interface DocumentEntityDao {
// The order here doesn't matter, because only one document should be returned
@Query(
"SELECT * FROM $DOCUMENT_ENTITY " +
"LEFT JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.id IN (:documentIds) " +
"JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.id IN (:documentIds) AND is_deleted = FALSE " +
"ORDER BY " +
"CASE WHEN :orderBy = \'$TITLE\' THEN $DOCUMENT_ENTITY.title END COLLATE NOCASE ASC, " +
"CASE WHEN :orderBy = \'$CREATED_AT\' THEN $DOCUMENT_ENTITY.created_at END DESC, " +
Expand All @@ -83,7 +83,7 @@ interface DocumentEntityDao {

@Query(
"SELECT * FROM $DOCUMENT_ENTITY " +
"LEFT JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE workspace_id = :userId " +
"ORDER BY " +
// "CASE WHEN :orderBy = \'$TITLE\' THEN $DOCUMENT_ENTITY.title END COLLATE NOCASE ASC, " +
Expand All @@ -97,22 +97,22 @@ interface DocumentEntityDao {

@Query(
"SELECT * FROM $DOCUMENT_ENTITY " +
"LEFT JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE workspace_id = :userId " +
"JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE workspace_id = :userId AND is_deleted = FALSE " +
"ORDER BY " +
// "CASE WHEN :orderBy = \'$TITLE\' THEN $DOCUMENT_ENTITY.title END COLLATE NOCASE ASC, " +
// "CASE WHEN :orderBy = \'$CREATED_AT\' THEN $DOCUMENT_ENTITY.created_at END DESC, " +
// "CASE WHEN :orderBy = \'$LAST_UPDATED_AT\' THEN $DOCUMENT_ENTITY.last_updated_at END DESC, " +
"$STORY_UNIT_ENTITY.position"
)
fun listenForDocumentsWithContentForUser(
fun listenForDocumentsWithContentForWorkspace(
userId: String
): Flow<Map<DocumentEntity, List<StoryStepEntity>>>

@Query(
"SELECT * FROM $DOCUMENT_ENTITY " +
"LEFT JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.parent_id = :parentId " +
"JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.parent_id = :parentId AND is_deleted = FALSE " +
"ORDER BY " +
// "CASE WHEN :orderBy = \'$TITLE\' THEN $DOCUMENT_ENTITY.title END COLLATE NOCASE ASC, " +
// "CASE WHEN :orderBy = \'$CREATED_AT\' THEN $DOCUMENT_ENTITY.created_at END DESC, " +
Expand All @@ -135,7 +135,7 @@ interface DocumentEntityDao {
@Query(
"SELECT * " +
"FROM $DOCUMENT_ENTITY " +
"LEFT JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"JOIN $STORY_UNIT_ENTITY ON $DOCUMENT_ENTITY.id = $STORY_UNIT_ENTITY.document_id " +
"WHERE $DOCUMENT_ENTITY.workspace_id = :workspaceId " +
"ORDER BY " +
"$STORY_UNIT_ENTITY.position"
Expand Down
5 changes: 4 additions & 1 deletion ...room/src/commonMain/kotlin/io/writeopia/sdk/persistence/entity/document/DocumentEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import io.writeopia.sdk.models.CREATED_AT
import io.writeopia.sdk.models.DOCUMENT_ENTITY
import io.writeopia.sdk.models.FAVORITE
import io.writeopia.sdk.models.ICON
import io.writeopia.sdk.models.IS_DELETED
import io.writeopia.sdk.models.IS_LOCKED
import io.writeopia.sdk.models.LAST_SYNCED_AT
import io.writeopia.sdk.models.LAST_UPDATED_AT
Expand All @@ -27,6 +28,7 @@ data class DocumentEntity(
@ColumnInfo(PARENT_ID) val parentId: String,
@ColumnInfo(ICON) val icon: String? = null,
@ColumnInfo(IS_LOCKED) val isLocked: Boolean,
@ColumnInfo(IS_DELETED) val isDeleted: Boolean,
) {
companion object {
fun createById(id: String, workspaceId: String, parentId: String): DocumentEntity {
Expand All @@ -40,7 +42,8 @@ data class DocumentEntity(
workspaceId,
favorite = false,
parentId = parentId,
isLocked = false
isLocked = false,
isDeleted = false
)
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...ersistence_room/src/commonMain/kotlin/io/writeopia/sdk/persistence/parse/DocumentParse.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ fun Document.toEntity() = DocumentEntity(
workspaceId = workspaceId,
favorite = favorite,
parentId = parentId,
isLocked = isLocked
isLocked = isLocked,
isDeleted = deleted
)
1 change: 1 addition & 0 deletions writeopia_models/src/commonMain/kotlin/io/writeopia/sdk/models/DatabaseConstants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ const val FAVORITE: String = "favorite"
const val PARENT_ID: String = "parent_id"
const val ICON: String = "icon"
const val IS_LOCKED: String = "is_locked"
const val IS_DELETED: String = "is_deleted"