wip

Author: steffenheger

driver-app/app/src/main/java/de/motis/prima/Tours.kt

@@ -165,10 +165,7 @@ fun DateSelect(
 
             ) {
             IconButton(
-                onClick = {
-                    viewModel.decrementDate()
-                    viewModel.fetchTours()
-                },
+                onClick = { viewModel.decrementDate() },
                 Modifier
                     .size(width = 48.dp, height = 24.dp)
             ) {
@@ -203,10 +200,7 @@ fun DateSelect(
 
             ) {
             IconButton(
-                onClick = {
-                    viewModel.incrementDate()
-                    viewModel.fetchTours()
-                },
+                onClick = { viewModel.incrementDate() },
                 Modifier
                     .size(width = 48.dp, height = 24.dp)
             ) {

driver-app/app/src/main/java/de/motis/prima/data/DataRepository.kt

@@ -29,17 +29,12 @@ class DataRepository @Inject constructor(
         return _scannedTickets.value[md5(ticketCode)]?.validationStatus
     }
 
-    fun updateScannedTickets(
-        requestId: Int,
-        ticketCode: String,
-        validationStatus: ValidationStatus
-    ) {
-        val entry = _scannedTickets.value[md5(ticketCode)]
+    fun updateScannedTickets(ticket: Ticket) {
+        val entry = _scannedTickets.value[md5(ticket.ticketCode)]
         if (entry != null) {
-            entry.validationStatus = validationStatus
+            entry.validationStatus = ticket.validationStatus
         } else {
-            _scannedTickets.value[md5(ticketCode)] =
-                Ticket(requestId, ticketCode, validationStatus)
+            _scannedTickets.value[md5(ticket.ticketCode)] = ticket
         }
     }
 

driver-app/app/src/main/java/de/motis/prima/viewmodel/ScanViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.motis.prima.data.DataRepository
+import de.motis.prima.data.Ticket
 import de.motis.prima.data.ValidationStatus
 import de.motis.prima.services.ApiService
 import kotlinx.coroutines.launch
@@ -33,7 +34,7 @@ class ScanViewModel @Inject constructor(
                     validationStatus = ValidationStatus.FAILED
                     Log.d("error", "Network Error: ${e.message!!}")
                 } finally {
-                    repository.updateScannedTickets(requestId, ticketCode, validationStatus)
+                    repository.updateScannedTickets(Ticket(requestId, ticketCode, validationStatus))
                 }
             }
         }

driver-app/app/src/main/java/de/motis/prima/viewmodel/ToursViewModel.kt

@@ -6,6 +6,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
 import de.motis.prima.data.DataRepository
+import de.motis.prima.data.Ticket
 import de.motis.prima.data.ValidationStatus
 import de.motis.prima.formatTo
 import de.motis.prima.services.ApiService
@@ -48,21 +49,21 @@ class ToursViewModel @Inject constructor(
     val selectedVehicle = repository.selectedVehicle
         .stateIn(viewModelScope, SharingStarted.Eagerly, null)
 
-    val scannedTickets = repository.scannedTickets
+    private val scannedTickets = repository.scannedTickets
 
-    fun reportTicketScan(requestId: Int, ticketCode: String) {
+    private fun retryFailedReport(ticket: Ticket) {
         viewModelScope.launch {
-            var validationStatus = ValidationStatus.OK
             try {
-                val response = apiService.validateTicket(requestId, ticketCode)
-                if (!response.isSuccessful) {
-                    validationStatus = ValidationStatus.REJECTED
+                val response = apiService.validateTicket(ticket.requestId, ticket.ticketCode)
+                if (response.isSuccessful) {
+                    ticket.validationStatus =  ValidationStatus.OK
+                    repository.updateScannedTickets(ticket)
+                } else {
+                    ticket.validationStatus = ValidationStatus.REJECTED
+                    repository.updateScannedTickets(ticket)
                 }
             } catch (e: Exception) {
-                validationStatus = ValidationStatus.FAILED
                 Log.d("error", "Network Error: ${e.message!!}")
-            } finally {
-                repository.updateScannedTickets(requestId, ticketCode, validationStatus)
             }
         }
     }
@@ -96,10 +97,12 @@ class ToursViewModel @Inject constructor(
                         val pickupDate = Date(pickup.scheduledTimeStart)
 
                         if (pickupDate.formatTo("yyyy-MM-dd") == currentDday) {
-                            Log.d("test", "new tour") // TODO: notification
+                            // TODO: notifications
                         }
                     }
                     _tours.value = newTours
+                } else {
+                    Log.d("debug", "fetchTours: $response")
                 }
             }
 
@@ -124,7 +127,7 @@ class ToursViewModel @Inject constructor(
                 val failedReports = scannedTickets.value.entries
                     .filter { e -> e.value.validationStatus == ValidationStatus.FAILED }
                 for (report in failedReports) {
-                    reportTicketScan(report.value.requestId, report.value.ticketCode)
+                    retryFailedReport(report.value)
                 }
 
                 delay(5000) // Fetch every 5 seconds