Skip to content

Commit 8067efc

Browse files
niyajaliniyajali
authored
Merge pull request #208 from skniyajali/155-enhancement-orders
Enhancement - CartOrder
2 parents 06c218b + d4059a3 commit 8067efc

File tree

8 files changed

+125
-242
lines changed

8 files changed

+125
-242
lines changed

‎core/data/src/main/java/com/niyaj/data/data/repository/CartOrderRepositoryImpl.kt

+52-156
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import com.niyaj.common.utils.Constants.SELECTED_CART_ORDER_ID
99
import com.niyaj.common.utils.Resource
1010
import com.niyaj.common.utils.ValidationResult
1111
import com.niyaj.common.utils.getCalculatedStartDate
12+
import com.niyaj.data.mapper.toEntity
1213
import com.niyaj.data.repository.CartOrderRepository
1314
import com.niyaj.data.repository.SettingsRepository
1415
import com.niyaj.data.repository.validation.CartOrderValidationRepository
@@ -41,6 +42,7 @@ import kotlinx.coroutines.CoroutineDispatcher
4142
import kotlinx.coroutines.flow.Flow
4243
import kotlinx.coroutines.flow.channelFlow
4344
import kotlinx.coroutines.flow.collectLatest
45+
import kotlinx.coroutines.flow.mapLatest
4446
import kotlinx.coroutines.withContext
4547
import org.mongodb.kbson.BsonObjectId
4648
import timber.log.Timber
@@ -137,45 +139,32 @@ class CartOrderRepositoryImpl(
137139
}
138140

139141
override suspend fun getAllAddress(searchText: String): Flow<List<Address>> {
140-
return channelFlow {
141-
withContext(ioDispatcher) {
142-
try {
143-
val items = realm.query<AddressEntity>()
144-
.sort("addressId", Sort.DESCENDING)
145-
.find()
146-
.asFlow()
147-
142+
return withContext(ioDispatcher) {
143+
realm.query<AddressEntity>()
144+
.sort("addressId", Sort.DESCENDING)
145+
.find()
146+
.asFlow()
147+
.mapLatest { items ->
148148
items.collectWithSearch(
149149
transform = { it.toExternalModel() },
150150
searchFilter = { it.filterAddress(searchText) },
151-
send = { send(it) }
152151
)
153-
154-
} catch (e: Exception) {
155-
send(emptyList())
156152
}
157-
}
158153
}
159154
}
160155

161156
override suspend fun getAllCustomers(searchText: String): Flow<List<Customer>> {
162-
return channelFlow {
163-
withContext(ioDispatcher) {
164-
try {
165-
val items = realm.query<CustomerEntity>()
166-
.sort("customerId", Sort.DESCENDING)
167-
.find()
168-
.asFlow()
169-
157+
return withContext(ioDispatcher) {
158+
realm.query<CustomerEntity>()
159+
.sort("customerId", Sort.DESCENDING)
160+
.find()
161+
.asFlow()
162+
.mapLatest { items ->
170163
items.collectWithSearch(
171164
transform = { it.toExternalModel() },
172165
searchFilter = { it.filterCustomer(searchText) },
173-
send = { send(it) }
174166
)
175-
} catch (e: Exception) {
176-
send(emptyList())
177167
}
178-
}
179168
}
180169
}
181170

@@ -191,13 +180,16 @@ class CartOrderRepositoryImpl(
191180
}
192181
}
193182

194-
override suspend fun createNewOrder(newOrder: CartOrder): Resource<Boolean> {
195-
return try {
196-
withContext(ioDispatcher) {
197-
val validateOrderId = validateOrderId(newOrder.orderId, newOrder.cartOrderId)
183+
override suspend fun createOrUpdateCartOrder(
184+
newOrder: CartOrder,
185+
cartOrderId: String
186+
): Resource<Boolean> {
187+
return withContext(ioDispatcher) {
188+
try {
189+
val validateOrderId = validateOrderId(newOrder.orderId, cartOrderId)
198190
val validateAddress = validateCustomerAddress(
199191
newOrder.orderType,
200-
newOrder.address?.addressName ?: ""
192+
customerAddress = newOrder.address?.addressName ?: ""
201193
)
202194
val validateCustomer = validateCustomerPhone(
203195
newOrder.orderType,
@@ -241,14 +233,12 @@ class CartOrderRepositoryImpl(
241233
realm.query<AddressEntity>(
242234
"addressId == $0",
243235
newOrder.address!!.addressId
244-
)
245-
.first().find()
236+
).first().find()
246237
} else {
247238
realm.query<AddressEntity>(
248239
"addressName == $0",
249240
newOrder.address!!.addressName
250-
)
251-
.first().find()
241+
).first().find()
252242
}
253243

254244
if (findAddress == null) {
@@ -267,121 +257,12 @@ class CartOrderRepositoryImpl(
267257
}
268258
}
269259

270-
val cartOrder = CartOrderEntity()
271-
cartOrder.cartOrderId =
272-
newOrder.cartOrderId.ifEmpty { BsonObjectId().toHexString() }
273-
cartOrder.orderId = newOrder.orderId
274-
cartOrder.orderType = newOrder.orderType.name
275-
cartOrder.createdAt =
276-
newOrder.createdAt.ifEmpty { System.currentTimeMillis().toString() }
277-
278-
realm.write {
279-
if (customer != null) {
280-
findLatest(customer)?.also {
281-
cartOrder.customer = it
282-
}
283-
}
284-
285-
if (address != null) {
286-
findLatest(address)?.also {
287-
cartOrder.address = it
288-
}
289-
}
290-
291-
this.copyToRealm(cartOrder)
292-
}
293-
294-
addSelectedCartOrder(cartOrder.cartOrderId)
295-
296-
Resource.Success(true)
297-
} else {
298-
Resource.Error("Unable to validate cart order")
299-
}
300-
}
301-
} catch (e: Exception) {
302-
Resource.Error(e.message ?: "Unable to create order")
303-
}
304-
}
305-
306-
override suspend fun updateCartOrder(
307-
newOrder: CartOrder,
308-
cartOrderId: String
309-
): Resource<Boolean> {
310-
return try {
311-
withContext(ioDispatcher) {
312-
val validateOrderId = validateOrderId(newOrder.orderId, cartOrderId)
313-
val validateAddress =
314-
validateCustomerAddress(newOrder.orderType, newOrder.address?.addressName ?: "")
315-
val validateCustomer = validateCustomerPhone(
316-
newOrder.orderType,
317-
newOrder.customer?.customerPhone ?: ""
318-
)
319-
320-
val hasError = listOf(
321-
validateAddress,
322-
validateCustomer,
323-
validateOrderId
324-
).any { !it.successful }
260+
val cartOrder = realm
261+
.query<CartOrderEntity>("cartOrderId == $0", cartOrderId)
262+
.first()
263+
.find()
325264

326-
if (!hasError) {
327-
val cartOrder =
328-
realm.query<CartOrderEntity>("cartOrderId == $0", cartOrderId).first()
329-
.find()
330265
if (cartOrder != null) {
331-
var customer: CustomerEntity? = null
332-
333-
var address: AddressEntity? = null
334-
335-
if (newOrder.customer != null) {
336-
val findCustomer = realm.query<CustomerEntity>(
337-
"customerPhone == $0",
338-
newOrder.customer!!.customerPhone
339-
).first().find()
340-
341-
if (findCustomer == null) {
342-
val newCustomer = CustomerEntity()
343-
newCustomer.customerId = BsonObjectId().toHexString()
344-
newCustomer.customerPhone = newOrder.customer!!.customerPhone
345-
newCustomer.createdAt = System.currentTimeMillis().toString()
346-
347-
customer = realm.write {
348-
this.copyToRealm(newCustomer)
349-
}
350-
} else {
351-
customer = findCustomer
352-
}
353-
}
354-
355-
if (newOrder.address != null) {
356-
357-
val findAddress = if (newOrder.address!!.addressId.isNotEmpty()) {
358-
realm.query<AddressEntity>(
359-
"addressId == $0",
360-
newOrder.address!!.addressId
361-
).first().find()
362-
} else {
363-
realm.query<AddressEntity>(
364-
"addressName == $0",
365-
newOrder.address!!.addressName
366-
).first().find()
367-
}
368-
369-
if (findAddress == null) {
370-
val newAddress = AddressEntity()
371-
newAddress.addressId = BsonObjectId().toHexString()
372-
newAddress.shortName = newOrder.address!!.shortName
373-
newAddress.addressName = newOrder.address!!.addressName
374-
newAddress.createdAt = System.currentTimeMillis().toString()
375-
376-
address = realm.write {
377-
this.copyToRealm(newAddress)
378-
}
379-
380-
} else {
381-
address = findAddress
382-
}
383-
}
384-
385266
realm.write {
386267
findLatest(cartOrder)?.apply {
387268
this.orderId = newOrder.orderId
@@ -408,15 +289,30 @@ class CartOrderRepositoryImpl(
408289

409290
Resource.Success(true)
410291
} else {
411-
Resource.Error("Unable to find cart order")
412-
}
292+
val data = realm.write {
293+
this.copyToRealm(
294+
newOrder.toEntity(
295+
customerEntity = if (customer != null) {
296+
findLatest(customer)
297+
} else null,
298+
addressEntity = if (address != null) {
299+
findLatest(address)
300+
} else null
301+
)
302+
)
303+
}
304+
305+
addSelectedCartOrder(data.cartOrderId)
413306

307+
Resource.Success(true)
308+
}
414309
} else {
415310
Resource.Error("Unable to validate cart order")
416311
}
312+
313+
} catch (e: Exception) {
314+
Resource.Error(e.message ?: "Unable to update order")
417315
}
418-
} catch (e: Exception) {
419-
Resource.Error(e.message ?: "Unable to update order")
420316
}
421317
}
422318

@@ -575,7 +471,7 @@ class CartOrderRepositoryImpl(
575471
}
576472
}
577473

578-
override suspend fun getSelectedCartOrders(): Flow<String?> {
474+
override fun getSelectedCartOrders(): Flow<String?> {
579475
return channelFlow {
580476
withContext(ioDispatcher) {
581477
val selectedCartOrder = realm
@@ -656,11 +552,11 @@ class CartOrderRepositoryImpl(
656552

657553
override suspend fun deleteCartOrders(deleteAll: Boolean): Resource<Boolean> {
658554
return try {
659-
val settings = settingsRepository.getSetting().data!!
660-
val cartOrderDate =
661-
getCalculatedStartDate(days = "-${settings.cartOrderDataDeletionInterval}")
662-
663555
withContext(ioDispatcher) {
556+
val settings = settingsRepository.getSetting().data!!
557+
val cartOrderDate =
558+
getCalculatedStartDate(days = "-${settings.cartOrderDataDeletionInterval}")
559+
664560
val cartOrders = if (deleteAll) {
665561
realm.query<CartOrderEntity>().find()
666562
} else {

‎core/data/src/main/java/com/niyaj/data/data/repository/SelectedRepositoryImpl.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ import kotlinx.coroutines.flow.channelFlow
2020
import kotlinx.coroutines.withContext
2121

2222
class SelectedRepositoryImpl(
23-
private val config: RealmConfiguration,
23+
config: RealmConfiguration,
2424
private val ioDispatcher: CoroutineDispatcher,
2525
) : SelectedRepository {
2626

2727
private val realm = Realm.open(config)
2828

29-
override suspend fun getAllProcessingCartOrder(): Flow<List<CartOrder>> {
29+
override fun getAllProcessingCartOrder(): Flow<List<CartOrder>> {
3030
return channelFlow {
3131
withContext(ioDispatcher) {
3232
try {
@@ -49,7 +49,7 @@ class SelectedRepositoryImpl(
4949
}
5050
}
5151

52-
override suspend fun getSelectedCartOrders(): Flow<String?> {
52+
override fun getSelectedCartOrders(): Flow<String?> {
5353
return channelFlow {
5454
withContext(ioDispatcher){
5555
val selectedCartOrder = realm

‎core/data/src/main/java/com/niyaj/data/mapper/CartOrderMapper.kt

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,43 @@
11
package com.niyaj.data.mapper
22

3+
import com.niyaj.database.model.AddressEntity
34
import com.niyaj.database.model.CartOrderEntity
5+
import com.niyaj.database.model.CustomerEntity
46
import com.niyaj.database.model.SelectedCartOrderEntity
57
import com.niyaj.model.CartOrder
68
import com.niyaj.model.SelectedCartOrder
79
import io.realm.kotlin.ext.toRealmList
10+
import org.mongodb.kbson.BsonObjectId
811

912
fun CartOrder.toEntity(): CartOrderEntity {
1013
return CartOrderEntity(
11-
cartOrderId = cartOrderId,
14+
cartOrderId = cartOrderId.ifEmpty { BsonObjectId().toHexString() },
1215
orderId = orderId,
1316
orderType = orderType,
1417
customer = customer?.toEntity(),
1518
address = address?.toEntity(),
1619
addOnItems = addOnItems.map { it.toEntity() }.toRealmList(),
1720
doesChargesIncluded = doesChargesIncluded,
1821
cartOrderStatus = cartOrderStatus,
19-
createdAt = createdAt,
22+
createdAt = createdAt.ifEmpty { System.currentTimeMillis().toString() },
23+
updatedAt = updatedAt
24+
)
25+
}
26+
27+
fun CartOrder.toEntity(
28+
customerEntity: CustomerEntity?,
29+
addressEntity: AddressEntity?
30+
): CartOrderEntity {
31+
return CartOrderEntity(
32+
cartOrderId = cartOrderId.ifEmpty { BsonObjectId().toHexString() },
33+
orderId = orderId,
34+
orderType = orderType,
35+
customer = customerEntity,
36+
address = addressEntity,
37+
addOnItems = addOnItems.map { it.toEntity() }.toRealmList(),
38+
doesChargesIncluded = doesChargesIncluded,
39+
cartOrderStatus = cartOrderStatus,
40+
createdAt = createdAt.ifEmpty { System.currentTimeMillis().toString() },
2041
updatedAt = updatedAt
2142
)
2243
}

‎core/data/src/main/java/com/niyaj/data/repository/CartOrderRepository.kt

+2-4
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ interface CartOrderRepository {
2323

2424
suspend fun getCartOrderById(cartOrderId: String): Resource<CartOrder?>
2525

26-
suspend fun createNewOrder(newOrder: CartOrder): Resource<Boolean>
27-
28-
suspend fun updateCartOrder(newOrder: CartOrder, cartOrderId: String): Resource<Boolean>
26+
suspend fun createOrUpdateCartOrder(newOrder: CartOrder, cartOrderId: String): Resource<Boolean>
2927

3028
suspend fun updateAddOnItem(addOnItemId: String, cartOrderId: String): Resource<Boolean>
3129

@@ -37,7 +35,7 @@ interface CartOrderRepository {
3735

3836
suspend fun placeAllOrder(cartOrderIds: List<String>): Resource<Boolean>
3937

40-
suspend fun getSelectedCartOrders(): Flow<String?>
38+
fun getSelectedCartOrders(): Flow<String?>
4139

4240
suspend fun addSelectedCartOrder(cartOrderId: String): Boolean
4341

0 commit comments

Comments
 (0)