Skip to content
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

Jump to bottom

Fix curation creation #360

Merged
merged 1 commit into from
Mar 5, 2022
Merged

Fix curation creation #360

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
12 changes: 6 additions & 6 deletions ...ion/src/main/java/com/phicdy/mycuration/feature/addcuration/StoreCurationActionCreator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class StoreCurationActionCreator @Inject constructor(
private val dispatcher: Dispatcher,
private val repository: CurationRepository
): ActionCreator3<String, List<String>, Int> {
override suspend fun run(name: String, words: List<String>, id: Int) {
override suspend fun run(name: String, words: List<String>, updateId: Int) {
dispatcher.dispatch(StoreCurationAction(StoreCurationState.Loading))
if (name.isEmpty()) {
dispatcher.dispatch(StoreCurationAction(StoreCurationState.EmptyNameError))
Expand All @@ -20,18 +20,18 @@ class StoreCurationActionCreator @Inject constructor(
return
}

val isNew = id < 0
val isNew = updateId < 0
if (isNew && repository.isExist(name)) {
dispatcher.dispatch(StoreCurationAction(StoreCurationState.SameNameExitError))
return
}
if (isNew) {
repository.store(name, words)
repository.adaptToArticles(id, words)
val id = repository.store(name, words)
repository.adaptToArticles(id.toInt(), words)
dispatcher.dispatch(StoreCurationAction(StoreCurationState.SucceedToAdd))
} else {
repository.update(id, name, words)
repository.adaptToArticles(id, words)
repository.update(updateId, name, words)
repository.adaptToArticles(updateId, words)
dispatcher.dispatch(StoreCurationAction(StoreCurationState.SucceedToEdit))
}
}
Expand Down
86 changes: 46 additions & 40 deletions repository/src/main/java/com/phicdy/mycuration/data/repository/CurationRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import com.phicdy.mycuration.entity.Article
import com.phicdy.mycuration.entity.Curation
import com.phicdy.mycuration.repository.Database
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.async
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.withContext
import timber.log.Timber
import java.util.ArrayList
import javax.inject.Inject
import javax.inject.Singleton

Expand Down Expand Up @@ -113,53 +113,59 @@ class CurationRepository @Inject constructor(
return@withContext result
}

suspend fun store(name: String, words: List<String>): Long = withContext(coroutineDispatcherProvider.io()) {
if (words.isEmpty()) return@withContext -1L
var addedCurationId = -1L
try {
database.transaction {
database.curationQueries.insert(name)
addedCurationId = database.curationQueries.selectLastInsertRowId().executeAsOne()
for (word in words) {
database.curationConditionQueries.insert(addedCurationId, word)
suspend fun store(name: String, words: List<String>): Long =
applicationCoroutineScope.async(coroutineDispatcherProvider.io()) {
if (words.isEmpty()) return@async -1L
var addedCurationId = -1L
try {
database.transaction {
database.curationQueries.insert(name)
addedCurationId =
database.curationQueries.selectLastInsertRowId().executeAsOne()
for (word in words) {
database.curationConditionQueries.insert(addedCurationId, word)
}
}
} catch (e: SQLException) {
Timber.e(e)
}
} catch (e: SQLException) {
Timber.e(e)
}
return@withContext addedCurationId
}

suspend fun adaptToArticles(curationId: Int, words: List<String>): Boolean = withContext(coroutineDispatcherProvider.io()) {
if (curationId == NOT_FOUND_ID) return@withContext false

var result = true
try {
database.transaction {
// Delete old curation selection
database.curationSelectionQueries.deleteByCurationId(curationId.toLong())
return@async addedCurationId
}.await()

// Get all articles
val allArticles = database.articleQueries.getAll().executeAsList()
suspend fun adaptToArticles(curationId: Int, words: List<String>): Boolean =
applicationCoroutineScope.async(coroutineDispatcherProvider.io()) {
if (curationId == NOT_FOUND_ID) return@async false

// Adapt
for (article in allArticles) {
val articleId = article._id
val articleTitle = article.title
for (word in words) {
if (articleTitle.contains(word)) {
database.curationSelectionQueries.insert(articleId, curationId.toLong())
break
var result = true
try {
database.transaction {
// Delete old curation selection
database.curationSelectionQueries.deleteByCurationId(curationId.toLong())

// Get all articles
val allArticles = database.articleQueries.getAll().executeAsList()

// Adapt
for (article in allArticles) {
val articleId = article._id
val articleTitle = article.title
for (word in words) {
if (articleTitle.contains(word)) {
database.curationSelectionQueries.insert(
articleId,
curationId.toLong()
)
break
}
}
}
}
} catch (e: SQLException) {
Timber.e(e)
result = false
}
} catch (e: SQLException) {
Timber.e(e)
result = false
}
return@withContext result
}
return@async result
}.await()

suspend fun getAllCurations(): List<Curation> = withContext(coroutineDispatcherProvider.io()) {
return@withContext database.transactionWithResult<List<Curation>> {
Expand Down