chore: add location accurancy to app objects

Author: melanieatpace

library/src/main/java/cloud/pace/sdk/appkit/AppManager.kt

@@ -59,7 +59,7 @@ internal class AppManager(private val dispatchers: DispatcherProvider = DefaultD
 
         Timber.i("Check local available apps at $userLocation")
 
-        when (val apps = appRepository.getLocationBasedApps(userLocation.latitude, userLocation.longitude)) {
+        when (val apps = appRepository.getLocationBasedApps(userLocation.latitude, userLocation.longitude, userLocation.accuracy.toDouble())) {
             is Success -> {
                 val result = apps.result
                 Timber.d("Received ${result.size} apps: ${result.map { it.url }}")

library/src/main/java/cloud/pace/sdk/appkit/app/api/AppRepository.kt

@@ -26,7 +26,7 @@ import timber.log.Timber
 
 interface AppRepository {
 
-    suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>>
+    suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double? = null): Completion<List<App>>
     suspend fun getAppsByUrl(url: String, references: List<String>): Completion<List<App>>
     suspend fun getUrlByAppId(appId: String): Completion<String?>
     fun getFuelingUrl(poiId: String, completion: (String) -> Unit)
@@ -40,7 +40,7 @@ class AppRepositoryImpl(
     private val manifestClient: ManifestClient
 ) : AppRepository {
 
-    override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+    override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
         val apps = geoApiManager.apps(latitude, longitude).getOrElse {
             return Failure(it)
         }
@@ -51,7 +51,7 @@ class AppRepositoryImpl(
 
                 apps
                     .map {
-                        async { it.toLocationBasedApps(userLocation) }
+                        async { it.toLocationBasedApps(userLocation, locationAccuracy) }
                     }
                     .flatMap {
                         runCatching { it.await() }.getOrNull() ?: emptyList()
@@ -113,16 +113,16 @@ class AppRepositoryImpl(
         }
     }
 
-    private suspend fun GeoGasStation.toLocationBasedApps(userLocation: LatLng): List<App> {
+    private suspend fun GeoGasStation.toLocationBasedApps(userLocation: LatLng, locationAccuracy: Double? = null): List<App> {
         val references = listOf(id)
         val distance = coordinate?.let { userLocation.distanceTo(it).toInt() }
 
         return appUrls[FUELING_TYPE]?.map {
-            createLocationBasedApps(it, references, distance)
+            createLocationBasedApps(it, references, distance, locationAccuracy)
         }?.flatten() ?: emptyList()
     }
 
-    private suspend fun createLocationBasedApps(appUrl: String?, references: List<String>?, distance: Int? = null): List<App> {
+    private suspend fun createLocationBasedApps(appUrl: String?, references: List<String>?, distance: Int? = null, locationAccuracy: Double? = null): List<App> {
         appUrl ?: return emptyList()
 
         val manifest = runCatching { manifestClient.getManifest(appUrl) }.getOrNull()
@@ -144,7 +144,8 @@ class AppRepositoryImpl(
                     display = manifest?.display,
                     poiId = it.key,
                     distance = distance,
-                    brandUrl = appUrl
+                    brandUrl = appUrl,
+                    locationAccuracy = locationAccuracy
                 )
             }
     }

library/src/main/java/cloud/pace/sdk/appkit/model/App.kt

@@ -12,5 +12,6 @@ data class App(
     val display: String? = null,
     val poiId: String? = null,
     val distance: Int? = null,
-    val brandUrl: String? = null
+    val brandUrl: String? = null,
+    val locationAccuracy: Double? = null
 )

library/src/test/java/cloud/pace/sdk/appkit/AppManagerTest.kt

@@ -53,6 +53,7 @@ class AppManagerTest : CloudSDKKoinComponent {
         `when`(mockLocation.latitude).then { 49.012722 }
         `when`(mockLocation.longitude).then { 8.427326 }
         `when`(mockLocation.speed).then { 3f }
+        `when`(mockLocation.accuracy).then { 2f }
 
         mockkObject(PACECloudSDK)
         every { PACECloudSDK.configuration.speedThresholdInKmPerHour } returns 50
@@ -76,7 +77,7 @@ class AppManagerTest : CloudSDKKoinComponent {
         )
 
         val appRepository = object : TestAppRepository() {
-            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
                 return Success(listOf(app1))
             }
         }
@@ -130,7 +131,7 @@ class AppManagerTest : CloudSDKKoinComponent {
         )
 
         val appRepository = object : TestAppRepository() {
-            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
                 return Success(listOf(app1))
             }
         }
@@ -212,7 +213,7 @@ class AppManagerTest : CloudSDKKoinComponent {
     @Test
     fun `no app due to network error`() {
         val appRepository = object : TestAppRepository() {
-            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
                 return Failure(Exception())
             }
         }
@@ -288,14 +289,15 @@ class AppManagerTest : CloudSDKKoinComponent {
         )
 
         val appRepository = object : TestAppRepository() {
-            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
                 return Success(listOf(app1))
             }
         }
 
         every { location.latitude } returns 49.012722
         every { location.longitude } returns 8.427326
         every { location.speed } returns 3f
+        every { location.accuracy } returns 2f
         every { location.speedAccuracyMetersPerSecond } returns 2f
 
         val testModule = module {
@@ -379,7 +381,7 @@ class AppManagerTest : CloudSDKKoinComponent {
         )
 
         val appRepository = object : TestAppRepository() {
-            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+            override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
                 return Success(listOf(app1, app2, app3))
             }
         }

library/src/test/java/cloud/pace/sdk/appkit/utils/MockFactory.kt

@@ -73,7 +73,7 @@ open class TestLocationProvider(
 
 open class TestAppRepository : AppRepository {
 
-    override suspend fun getLocationBasedApps(latitude: Double, longitude: Double): Completion<List<App>> {
+    override suspend fun getLocationBasedApps(latitude: Double, longitude: Double, locationAccuracy: Double?): Completion<List<App>> {
         return Success(emptyList())
     }