From b6115837aef2a49341fca9b1c19cc1ac2830608a Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Tue, 4 Feb 2025 11:57:45 +0100
Subject: [PATCH] feat: refs#8082 TicketPickupResponse

---
 .../java/es/verdnatura/domain/SalixService.kt |  4 +-
 .../presentation/common/SalixBackItems.kt     |  8 +---
 .../fragment/CollectionCheckerViewModel.kt    | 48 +++++++++----------
 3 files changed, 25 insertions(+), 35 deletions(-)

diff --git a/app/src/main/java/es/verdnatura/domain/SalixService.kt b/app/src/main/java/es/verdnatura/domain/SalixService.kt
index fe081cdd..511a84ac 100644
--- a/app/src/main/java/es/verdnatura/domain/SalixService.kt
+++ b/app/src/main/java/es/verdnatura/domain/SalixService.kt
@@ -5,8 +5,8 @@ import es.verdnatura.presentation.common.ExpeditionPrintOut
 import es.verdnatura.presentation.common.ItemBarCodeSalix
 import es.verdnatura.presentation.common.ItemShelving
 import es.verdnatura.presentation.common.PackingSiteSalix
-import es.verdnatura.presentation.common.PickupResponse
 import es.verdnatura.presentation.common.SaleTrackingSalix
+import es.verdnatura.presentation.common.TicketPickupResponse
 import es.verdnatura.presentation.common.TicketState
 import es.verdnatura.presentation.view.feature.ajustes.model.Printers
 import es.verdnatura.presentation.view.feature.ajustes.model.SectorItemVO
@@ -638,7 +638,7 @@ interface SalixService {
     @GET("Tickets")
     fun ticketIsPickup(
         @Query("filter") filter: Any, @Query("schema") schema: String = "vn"
-    ): Call<List<PickupResponse>>
+    ): Call<List<TicketPickupResponse>>
 
     @POST("Applications/workerMachinery_isRegistered/execute-func")
     fun workerMachineryIsRegistered(
diff --git a/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt b/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt
index 1ad73d8b..c52ada88 100644
--- a/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt
+++ b/app/src/main/java/es/verdnatura/presentation/common/SalixBackItems.kt
@@ -101,14 +101,8 @@ data class ExpeditionPrintOut(
     val isChecked: Boolean
 )
 
-data class PickupResponse(
-    val routeFk: Int,
-    val route: Route?
-)
-
-data class Route(
+data class TicketPickupResponse(
     val id: Int,
-    val agencyModeFk: Int,
     val agencyMode: AgencyMode?
 )
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionCheckerViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionCheckerViewModel.kt
index 11fed43b..f3c39d6d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionCheckerViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionCheckerViewModel.kt
@@ -14,8 +14,8 @@ import es.verdnatura.presentation.base.BaseViewModel
 import es.verdnatura.presentation.base.getMessageFromAllResponse
 import es.verdnatura.presentation.base.nameofFunction
 import es.verdnatura.presentation.common.Event
-import es.verdnatura.presentation.common.PickupResponse
 import es.verdnatura.presentation.common.SaleTrackingReplaceSalix
+import es.verdnatura.presentation.common.TicketPickupResponse
 import es.verdnatura.presentation.common.TicketState
 import es.verdnatura.presentation.view.feature.collection.SalixSaleQuantity
 import es.verdnatura.presentation.view.feature.collection.mapper.map
@@ -304,41 +304,37 @@ class CollectionCheckerViewModel(val context: Context) : BaseViewModel(context)
     fun ticketIsPickup(
         ticketFk: Number
     ) {
+
         salix.ticketIsPickup(
             """{
-                  "where": {
-                    "id": $ticketFk
-                  },
-                  "fields": ["id", "routeFk"],
-                  "include": [
-                    {
-                      "relation": "route",
-                      "scope": {
-                        "fields": ["id", "agencyModeFk"],
+                "where": {
+                "id": $ticketFk
+                },
+                "fields": ["id", "agencyModeFk"],
+                "include": [
+                {
+                    "relation": "agencyMode",
+                    "scope": {
+                        "fields": ["id", "deliveryMethodFk", "code"],
+                        "where": {
+                            "code": { "inq": ["REC_ALG", "PICKUP"] }
+                        },
                         "include": {
-                          "relation": "agencyMode",
-                          "scope": {
-                            "fields": ["id", "deliveryMethodFk","code"],
-                            "where": {"code": "REC_ALG"},
-                            "include": {
-                              "relation": "deliveryMethod",
-                              "scope": {
+                            "relation": "deliveryMethod",
+                            "scope": {
                                 "fields": ["id", "code"]
-                              }
                             }
-                          }
                         }
-                      }
                     }
-                  ]
-                }""".trim()
-
-        ).enqueue(object : SalixCallback<List<PickupResponse>>(context) {
-            override fun onSuccess(response: Response<List<PickupResponse>>) {
+                }
+                ]
+            }""".trim()
+        ).enqueue(object : SalixCallback<List<TicketPickupResponse>>(context) {
+            override fun onSuccess(response: Response<List<TicketPickupResponse>>) {
 
                 _responseTicketIsPickup.value =
                     response.body()
-                        ?.firstOrNull()?.route?.agencyMode?.deliveryMethod?.code == "PICKUP"
+                        ?.firstOrNull()?.agencyMode?.deliveryMethod?.code == "PICKUP"
 
             }