Update manifest payload to move countries to top level and add version field (#5405)

https://app.shortcut.com/simpledotorg/story/15331/update-the-manifest-payload-to-remove-versioning-and-directly-have-countries-at-the-top-level?team_id=1&iteration_ids=15087

---------

Co-authored-by: Siddharth Agarwal <[email protected]>

Author: siddh1004

CHANGELOG.md

@@ -25,6 +25,7 @@
 - Skip Sentry config during app startup in the debug mode
 - Show spanish language option in non-production builds only
 - Increase lab based risk threshold to 20%
+- Update manifest payload to move countries to top level and add version field
 
 ### Features
 

app/src/main/java/org/simple/clinic/appconfig/AppConfigRepository.kt

@@ -54,7 +54,7 @@ class AppConfigRepository @Inject constructor(
     return manifestFetchApi
         .fetchManifest()
         .map { it.supportedCountries }
-        .map { FetchSucceeded(it.countries) }
+        .map { FetchSucceeded(it) }
         .cast(ManifestFetchResult::class.java)
         .onErrorReturn { cause -> FetchError(ErrorResolver.resolve(cause)) }
   }

app/src/main/java/org/simple/clinic/appconfig/CountriesPayload.kt

@@ -6,6 +6,9 @@ import com.squareup.moshi.JsonClass
 @JsonClass(generateAdapter = true)
 data class Manifest(
 
-    @Json(name = "v2")
-    val supportedCountries: CountriesPayload
+    @Json(name = "version")
+    val version: String,
+
+    @Json(name = "countries")
+    val supportedCountries: List<Country>
 )

app/src/main/java/org/simple/clinic/appconfig/Manifest.kt

@@ -2,16 +2,16 @@ package org.simple.clinic.appconfig
 
 import com.f2prateek.rx.preferences2.Preference
 import com.google.common.truth.Truth.assertThat
+import io.reactivex.Single
+import okhttp3.MediaType.Companion.toMediaType
+import okhttp3.ResponseBody.Companion.toResponseBody
+import org.junit.Test
 import org.mockito.kotlin.doReturn
 import org.mockito.kotlin.doThrow
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.verifyNoMoreInteractions
 import org.mockito.kotlin.whenever
-import io.reactivex.Single
-import okhttp3.MediaType.Companion.toMediaType
-import okhttp3.ResponseBody.Companion.toResponseBody
-import org.junit.Test
 import org.simple.clinic.TestData
 import org.simple.clinic.appconfig.StatesResult.StatesFetched
 import org.simple.clinic.appconfig.api.ManifestFetchApi
@@ -43,7 +43,7 @@ class AppConfigRepositoryTest {
   @Test
   fun `successful network calls to fetch the app manifest should return the app manifest`() {
     // given
-    val countriesV2 = listOf(
+    val countries = listOf(
         Country(
             isoCountryCode = "IN",
             displayName = "India",
@@ -56,16 +56,19 @@ class AppConfigRepositoryTest {
             )
         )
     )
-    val countriesPayload = CountriesPayload(countriesV2)
+    val manifestPayload = Manifest(
+        version = "3",
+        supportedCountries = countries
+    )
 
-    whenever(manifestFetchApi.fetchManifest()).doReturn(Single.just(Manifest(countriesPayload)))
+    whenever(manifestFetchApi.fetchManifest()).doReturn(Single.just(manifestPayload))
 
     // then
 
     repository
         .fetchAppManifest()
         .test()
-        .assertValue(FetchSucceeded(countriesV2))
+        .assertValue(FetchSucceeded(countries))
         .assertNoErrors()
   }
 

app/src/test/java/org/simple/clinic/appconfig/AppConfigRepositoryTest.kt

@@ -26,7 +26,7 @@ android.experimental.enableTestFixturesKotlinSupport=true
 # Manifest URL endpoint
 # These are currently the same as the API endpoints declared earlier. Those will be removed later
 # once the country selection feature is complete.
-manifestEndpoint=https://api-qa.simple.org/api/
+manifestEndpoint=https://manifest.simple.org/sandbox/
 # Needed to switch NDK versions on the CI server since they have different
 # NDK versions on macOS and Linux environments. Gradle plugin 3.6+ requires
 # us to pin an NDK version if we package native libs.