Skip to content

Commit e5926d0

Browse files
author
Leandro Ferreira
committed
Fixing search
1 parent 557a4ab commit e5926d0

19 files changed

Lines changed: 85 additions & 103 deletions

File tree

application/core/documents/src/commonMain/kotlin/io/writeopia/core/folders/repository/folder/RoomFolderRepository.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ class RoomFolderRepository(
102102
TODO("Not yet implemented")
103103
}
104104

105-
override suspend fun search(query: String): List<Folder> =
106-
folderRoomDao.search(query)
105+
override suspend fun search(query: String, workspaceId: String): List<Folder> =
106+
folderRoomDao.search(query, workspaceId)
107107

108108
override suspend fun getLastUpdated(): List<Folder> =
109109
folderRoomDao.getLastUpdated()

application/core/models/src/commonMain/kotlin/io/writeopia/models/interfaces/search/FolderSearch.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import io.writeopia.sdk.models.document.Folder
44

55
interface FolderSearch {
66

7-
suspend fun search(query: String): List<Folder>
7+
suspend fun search(query: String, workspaceId: String): List<Folder>
88

99
suspend fun getLastUpdated(): List<Folder>
1010
}

application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/FolderDaoDelegator.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ class FolderDaoDelegator(
2121
return delegate.getFolderById(id)?.toCommonEntity()?.toModel(0)
2222
}
2323

24-
override suspend fun search(query: String): List<Folder> {
25-
return delegate.search(query).map { it.toCommonEntity().toModel(0) }
24+
override suspend fun search(query: String, workspaceId: String): List<Folder> {
25+
return delegate.search(query, workspaceId).map { it.toCommonEntity().toModel(0) }
2626
}
2727

2828
override suspend fun getLastUpdated(): List<Folder> {

application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/daos/FolderRoomDao.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ interface FolderRoomDao {
1616
@Query("SELECT * FROM $FOLDER_ENTITY WHERE folder_id = :id")
1717
suspend fun getFolderById(id: String): FolderEntity?
1818

19-
@Query("SELECT * FROM $FOLDER_ENTITY WHERE title LIKE '%' || :query || '%' ORDER BY last_updated_at")
20-
suspend fun search(query: String): List<FolderEntity>
19+
@Query("SELECT * FROM $FOLDER_ENTITY WHERE title LIKE '%' || :query || '%' AND workspace_id = :workspaceId ORDER BY last_updated_at")
20+
suspend fun search(query: String, workspaceId: String): List<FolderEntity>
2121

2222
@Query("SELECT * FROM $FOLDER_ENTITY ORDER BY last_updated_at LIMIT 15")
2323
suspend fun getLastUpdated(): List<FolderEntity>

application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/data/entities/FolderEntity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ class FolderEntity(
1313
@ColumnInfo(name = "title") val title: String,
1414
@ColumnInfo(name = "created_at") val createdAt: Long,
1515
@ColumnInfo(name = "last_updated_at") val lastUpdatedAt: Long,
16-
@ColumnInfo(name = "user_id") val userId: String,
16+
@ColumnInfo(name = "workspace_id") val workspaceId: String,
1717
@ColumnInfo(name = "favorite") val favorite: Boolean = false,
1818
)

application/core/persistence_room/src/commonMain/kotlin/io/writeopia/persistence/room/extensions/FolderModelExtensions.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ fun FolderEntity.toCommonEntity(): FolderCommonEntity {
1010
title = this.title,
1111
createdAt = this.createdAt,
1212
lastUpdatedAt = this.lastUpdatedAt,
13-
userId = this.userId,
13+
workspaceId = this.workspaceId,
1414
favorite = this.favorite,
1515
)
1616
}
@@ -22,7 +22,7 @@ fun FolderCommonEntity.toEntity(): FolderEntity {
2222
title = this.title,
2323
createdAt = this.createdAt,
2424
lastUpdatedAt = this.lastUpdatedAt,
25-
userId = this.userId,
25+
workspaceId = this.workspaceId,
2626
favorite = this.favorite
2727
)
2828
}

application/core/persistence_sqldelight/src/commonMain/kotlin/io/writeopia/sqldelight/dao/FolderSqlDelightDao.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ class FolderSqlDelightDao(database: WriteopiaDb?) : FolderSearch {
3939
refreshFolders()
4040
}
4141

42-
override suspend fun search(query: String): List<Folder> = folderEntityQueries?.query(query)
43-
?.executeAsList()
44-
?.map { folderEntity -> folderEntity.toModel(0) }
45-
?: emptyList()
42+
override suspend fun search(query: String, workspaceId: String): List<Folder> =
43+
folderEntityQueries?.query(query, workspace_id = workspaceId)
44+
?.executeAsList()
45+
?.map { folderEntity -> folderEntity.toModel(0) }
46+
?: emptyList()
4647

4748
override suspend fun getLastUpdated(): List<Folder> = folderEntityQueries?.getLastUpdated()
4849
?.executeAsList()

application/core/persistence_sqldelight/src/commonMain/sqldelight/io/writeopia/app/sql/FolderEntity.sq

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CREATE TABLE folderEntity (
1414
query:
1515
SELECT *
1616
FROM folderEntity
17-
WHERE title LIKE '%' || ? || '%'
17+
WHERE title LIKE '%' || ? || '%' AND workspace_id = ?
1818
ORDER BY last_updated_at
1919
LIMIT 10;
2020

application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/daos/FolderCommonDao.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface FolderCommonDao {
88

99
suspend fun getFolderById(id: String): Folder?
1010

11-
suspend fun search(query: String): List<Folder>
11+
suspend fun search(query: String, workspaceId: String): List<Folder>
1212

1313
suspend fun getLastUpdated(): List<Folder>
1414

application/core/utils/src/commonMain/kotlin/io/writeopia/common/utils/persistence/folder/FolderCommonEntity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ data class FolderCommonEntity(
66
val title: String,
77
val createdAt: Long,
88
val lastUpdatedAt: Long,
9-
val userId: String,
9+
val workspaceId: String,
1010
val favorite: Boolean = false
1111
)

0 commit comments

Comments
 (0)