From e8a169e274dc0859f41795ef8cfcc9b49bb668e5 Mon Sep 17 00:00:00 2001 From: Sergio De la torre Date: Fri, 5 Jul 2024 13:25:19 +0200 Subject: [PATCH] feat itemToBarCode refs #7614 --- .../es/verdnatura/domain/userCases/UserCases.kt | 13 +++++-------- .../feature/articulo/fragment/ItemCardViewModel.kt | 6 +++--- .../view/feature/boxPicking/BoxPickingViewModel.kt | 7 +++---- .../collection/fragment/CollectionViewModel.kt | 7 +++---- .../inventario/fragment/InventaryViewModel.kt | 7 +++---- .../presacador/fragment/PreSacadorViewModel.kt | 6 +++--- .../feature/ubicador/fragment/UbicadorViewModel.kt | 7 +++---- 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt b/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt index fa8cafe9..c3494307 100644 --- a/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt +++ b/app/src/main/java/es/verdnatura/domain/userCases/UserCases.kt @@ -1,15 +1,12 @@ package es.verdnatura.domain.userCases -import android.content.Context -import es.verdnatura.domain.RestClient + import es.verdnatura.domain.SalixService import retrofit2.Call -class UserCases(context: Context) : RestClient(context) { - fun itemToBarCode(barcode: String, salix: SalixService) : Call { - - return salix.barcodesToItem(barcode) +class GetItemFromBarcodeUseCase(private val salixService: SalixService) { + fun execute(barcode: String): Call { + return salixService.barcodesToItem(barcode) } - -} \ No newline at end of file +} diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt index 6df4cbc4..507342bb 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes -import es.verdnatura.domain.userCases.UserCases +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.common.Event import es.verdnatura.presentation.common.ItemBarCodeSalix @@ -25,7 +25,7 @@ import java.io.File class ItemCardViewModel(var context: Context) : BaseViewModel(context) { - private val userCase = UserCases(context) + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val _itemCard by lazy { MutableLiveData() } val itemCard: LiveData @@ -155,7 +155,7 @@ class ItemCardViewModel(var context: Context) : BaseViewModel(context) { } fun getIdFromCodeSalix(code: String) { - userCase.itemToBarCode(code,salix) + getItemFromBarcodeUseCase.execute (code) .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt index 2a315b62..f18a6aa5 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/boxPicking/BoxPickingViewModel.kt @@ -4,14 +4,13 @@ import android.content.Context import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import es.verdnatura.domain.SalixCallback -import es.verdnatura.domain.userCases.UserCases +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import retrofit2.Response class BoxPickingViewModel(val context: Context) : BaseViewModel(context) { - private val userCase = UserCases(context) - + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val _isBoxPickingInPrintOut by lazy { MutableLiveData() } val isBoxPickingInPrintOut: LiveData = _isBoxPickingInPrintOut @@ -38,7 +37,7 @@ class BoxPickingViewModel(val context: Context) : BaseViewModel(context) { } fun isBoxPickingInPrintOut(expeditionFk: Long, barcode: String) { - userCase.itemToBarCode(barcode, salix) + getItemFromBarcodeUseCase.execute(barcode) .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt index f648a458..d30be8ed 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt @@ -9,7 +9,7 @@ import es.verdnatura.MobileApplication import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes import es.verdnatura.domain.toast -import es.verdnatura.domain.userCases.UserCases +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -34,7 +34,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.SaleTrackingD import retrofit2.Response class CollectionViewModel(val context: Context) : BaseViewModel(context) { - private val userCase = UserCases(context) + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val contextApp = context private val _responseState by lazy { MutableLiveData() } @@ -828,8 +828,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) { } fun getIdFromCodeSalix(code: String) { - userCase.itemToBarCode(code, salix) - //salix.barcodes_toitem(code) + getItemFromBarcodeUseCase.execute(code) .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) { _responseCode.value = response.body() diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt index 8a270db1..16c22f8c 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.map import com.google.gson.JsonObject import es.verdnatura.MobileApplication import es.verdnatura.domain.SalixCallback -import es.verdnatura.domain.userCases.UserCases +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -31,8 +31,7 @@ import es.verdnatura.presentation.view.feature.workermistake.model.WorkerMistake import retrofit2.Response class InventaryViewModel(val context: Context) : BaseViewModel(context) { - - private val userCase = UserCases(context) + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val _inventaryList by lazy { MutableLiveData() } val inventaryList: LiveData get() = _inventaryList @@ -239,7 +238,7 @@ class InventaryViewModel(val context: Context) : BaseViewModel(context) { } fun getIdFromCodeSalix(code: String) { - userCase.itemToBarCode(code,salix) + getItemFromBarcodeUseCase.execute(code) .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) { _responseCode.value = diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt index a0895bbd..8c1a47b8 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.map import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes -import es.verdnatura.domain.userCases.UserCases +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -23,7 +23,7 @@ import retrofit2.Call import retrofit2.Response class PreSacadorViewModel(val context: Context) : BaseViewModel(context) { - private val userCase = UserCases(context) + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val _salesList by lazy { MutableLiveData>() } val salesList: LiveData> @@ -205,7 +205,7 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) { }*/ fun getIdFromCode(code: String) { - userCase.itemToBarCode(code, salix) + getItemFromBarcodeUseCase.execute(code) .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) { diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt index 29349a53..6ca82709 100644 --- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt +++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorViewModel.kt @@ -7,7 +7,7 @@ import androidx.lifecycle.map import com.google.gson.JsonObject import es.verdnatura.domain.SalixCallback import es.verdnatura.domain.formatWithQuotes -import es.verdnatura.domain.userCases.UserCases +import es.verdnatura.domain.userCases.GetItemFromBarcodeUseCase import es.verdnatura.presentation.base.BaseViewModel import es.verdnatura.presentation.base.getMessageFromAllResponse import es.verdnatura.presentation.base.nameofFunction @@ -27,7 +27,7 @@ import retrofit2.Call import retrofit2.Response class UbicadorViewModel(val context: Context) : BaseViewModel(context) { - private val userCase = UserCases(context) + private val getItemFromBarcodeUseCase = GetItemFromBarcodeUseCase(salix) private val _shelvingList by lazy { MutableLiveData() } @@ -403,8 +403,7 @@ class UbicadorViewModel(val context: Context) : BaseViewModel(context) { } fun getIdFromCode(code: String) { - userCase.itemToBarCode(code,salix) - //salix.barcodes_toitem(code) + getItemFromBarcodeUseCase.execute(code) .enqueue(object : SalixCallback(context) { override fun onSuccess(response: Response) {