From 53819b3240d4a56f386134b222d264cef8676152 Mon Sep 17 00:00:00 2001 From: batalin Date: Mon, 7 Oct 2019 16:45:14 +0300 Subject: [PATCH 1/2] refactoring --- .../node/services/v1/OfferSearchService.kt | 14 ++++++++------ .../com/bitclave/node/services/v1/OfferService.kt | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/kotlin/com/bitclave/node/services/v1/OfferSearchService.kt b/src/main/kotlin/com/bitclave/node/services/v1/OfferSearchService.kt index 05008eeb..12a11394 100644 --- a/src/main/kotlin/com/bitclave/node/services/v1/OfferSearchService.kt +++ b/src/main/kotlin/com/bitclave/node/services/v1/OfferSearchService.kt @@ -1077,13 +1077,15 @@ class OfferSearchService( } fun deleteByOfferIds(ids: List, 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) } diff --git a/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt b/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt index 65125f23..2e99061d 100644 --- a/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt +++ b/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt @@ -127,7 +127,7 @@ class OfferService( 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 createdAt = if (id != 0L) existedOffers[id]!!.createdAt else Date() Offer( id, From bb5a8dc9741bcb8d61b7f568d21f4a473fa58dbf Mon Sep 17 00:00:00 2001 From: batalin Date: Mon, 7 Oct 2019 17:42:44 +0300 Subject: [PATCH 2/2] get rid of warning --- .../kotlin/com/bitclave/node/services/v1/OfferService.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt b/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt index 2e99061d..54da1901 100644 --- a/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt +++ b/src/main/kotlin/com/bitclave/node/services/v1/OfferService.kt @@ -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 else Date() + val offer = existedOffers[it.id] + val id = offer?.id ?: 0 + val createdAt = offer?.createdAt ?: Date() Offer( id,