Skip to content

WIP - BASE-931 refactoring #165

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

Open
antbat wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

WIP - BASE-931 refactoring #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53819b3
refactoring
antbat Oct 7, 2019
bb5a8dc
get rid of warning
antbat Oct 7, 2019
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
14 changes: 8 additions & 6 deletions src/main/kotlin/com/bitclave/node/services/v1/OfferSearchService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,13 +1077,15 @@ class OfferSearchService(
}

fun deleteByOfferIds(ids: List<Long>, strategy: RepositoryStrategyType) {

offerSearchRepository.changeStrategy(strategy).deleteAllByOfferIds(ids)
val filteredStateIds = ids.map { offerId ->
offerInteractionRepository.changeStrategy(strategy)
.findByOfferId(offerId)
.filter { it.state == OfferAction.NONE || it.state == OfferAction.REJECT }
.map { it.id }
}.flatten()

val filteredStateIds = offerInteractionRepository
.changeStrategy(strategy)
.findByOfferIdIn(ids)
.filter { it.state == OfferAction.NONE || it.state == OfferAction.REJECT }
.map { it.id }

offerInteractionRepository.changeStrategy(strategy).delete(filteredStateIds)
}

Expand Down
5 changes: 3 additions & 2 deletions src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@ class OfferService(
val existedOffers = existedOffersByIds.map { it.id to it }.toMap()
val readyForSaveOffers = offers.map {

val id = if (existedOffers.containsKey(it.id)) it.id else 0
val createdAt = if (id != 0L) existedOffers[id]?.createdAt ?: Date() else Date()
val offer = existedOffers[it.id]
val id = offer?.id ?: 0
val createdAt = offer?.createdAt ?: Date()

Offer(
id,
Expand Down