Migrate "What's New" models from WellSql to Room

WooCommerce/src/main/kotlin/com/woocommerce/android/model/FeatureAnnouncement.kt

@@ -6,12 +6,9 @@ import org.wordpress.android.fluxc.utils.WhatsNewAppVersionUtils
 
 @Parcelize
 data class FeatureAnnouncement(
-    val appVersionName: String,
-    val announcementVersion: Int,
     val minimumAppVersion: String,
     val maximumAppVersion: String,
     val appVersionTargets: List<String>,
-    val detailsUrl: String?,
     val isLocalized: Boolean = false,
     val features: List<FeatureAnnouncementItem>
 ) : Parcelable {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/connectivitytool/useCases/WordPressConnectionCheckUseCase.kt

@@ -17,8 +17,7 @@ class WordPressConnectionCheckUseCase @Inject constructor(
     operator fun invoke(): Flow<ConnectivityCheckStatus> = flow {
         emit(InProgress)
         whatsNewStore.fetchRemoteAnnouncements(
-            versionName = buildConfigWrapper.versionName,
-            appId = WhatsNewStore.WhatsNewAppId.WOO_ANDROID
+            versionName = buildConfigWrapper.versionName
         ).fetchError?.let {
             emit(Failure())
         } ?: emit(Success)

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/whatsnew/FeatureAnnouncementRepository.kt

@@ -22,23 +22,17 @@ class FeatureAnnouncementRepository @Inject constructor(
         val onWhatsNewFetched = if (fromCache) {
             whatsNewStore.fetchCachedAnnouncements()
         } else {
-            whatsNewStore.fetchRemoteAnnouncements(
-                buildConfigWrapper.versionName,
-                WhatsNewStore.WhatsNewAppId.WOO_ANDROID
-            )
+            whatsNewStore.fetchRemoteAnnouncements(buildConfigWrapper.versionName)
         }
         onWhatsNewFetched.whatsNewItems?.map { featureAnnouncements.add(it.build()) }?.toList()
         return featureAnnouncements
     }
 
     fun WhatsNewAnnouncementModel.build(): FeatureAnnouncement {
         return FeatureAnnouncement(
-            appVersionName,
-            announcementVersion,
             minimumAppVersion,
             maximumAppVersion,
             appVersionTargets,
-            detailsUrl,
             isLocalized,
             features.map {
                 it.build()

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/main/MainActivityViewModelTest.kt

@@ -116,12 +116,9 @@ class MainActivityViewModelTest : BaseUnitTest() {
     }
 
     private val testAnnouncement = FeatureAnnouncement(
-        appVersionName = "14.2",
-        announcementVersion = 1337,
         minimumAppVersion = "14.2",
         maximumAppVersion = "14.3",
         appVersionTargets = listOf("alpha-centauri-1", "alpha-centauri-2"),
-        detailsUrl = "https://woocommerce.com/",
         isLocalized = true,
         features = listOf(
             FeatureAnnouncementItem(

WooCommerce/src/test/kotlin/com/woocommerce/android/ui/orders/connectivitytool/useCases/WordPressConnectionCheckUseCaseTest.kt

@@ -41,8 +41,7 @@ class WordPressConnectionCheckUseCaseTest : BaseUnitTest() {
         whenever(buildConfigWrapper.versionName).thenReturn("1.0.0")
         whenever(
             whatsNewStore.fetchRemoteAnnouncements(
-                versionName = "1.0.0",
-                appId = WhatsNewStore.WhatsNewAppId.WOO_ANDROID
+                versionName = "1.0.0"
             )
         ).thenReturn(response)
 
@@ -63,8 +62,7 @@ class WordPressConnectionCheckUseCaseTest : BaseUnitTest() {
         whenever(buildConfigWrapper.versionName).thenReturn("1.0.0")
         whenever(
             whatsNewStore.fetchRemoteAnnouncements(
-                versionName = "1.0.0",
-                appId = WhatsNewStore.WhatsNewAppId.WOO_ANDROID
+                versionName = "1.0.0"
             )
         ).thenReturn(response)
 

libs/fluxc/schemas/org.wordpress.android.fluxc.persistence.WPAndroidDatabase/31.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 31,
-    "identityHash": "170c715c7279c4691cfd3d797a79fa3b",
+    "identityHash": "aa2684d22c5ec8552e80cd32e2ec522a",
     "entities": [
       {
         "tableName": "FeatureFlagConfigurations",
@@ -363,11 +363,106 @@
             "isWpComTheme"
           ]
         }
+      },
+      {
+        "tableName": "WhatsNewAnnouncementEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`announcementId` INTEGER NOT NULL, `minimumAppVersion` TEXT NOT NULL, `maximumAppVersion` TEXT NOT NULL, `appVersionTargets` TEXT NOT NULL, `localized` INTEGER NOT NULL, PRIMARY KEY(`announcementId`))",
+        "fields": [
+          {
+            "fieldPath": "announcementId",
+            "columnName": "announcementId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "minimumAppVersion",
+            "columnName": "minimumAppVersion",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "maximumAppVersion",
+            "columnName": "maximumAppVersion",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "appVersionTargets",
+            "columnName": "appVersionTargets",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "localized",
+            "columnName": "localized",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "announcementId"
+          ]
+        }
+      },
+      {
+        "tableName": "WhatsNewAnnouncementFeatureEntity",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`announcementId` INTEGER NOT NULL, `title` TEXT NOT NULL, `subtitle` TEXT, `iconUrl` TEXT, `iconBase64` TEXT, PRIMARY KEY(`announcementId`, `title`), FOREIGN KEY(`announcementId`) REFERENCES `WhatsNewAnnouncementEntity`(`announcementId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "announcementId",
+            "columnName": "announcementId",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "title",
+            "columnName": "title",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "subtitle",
+            "columnName": "subtitle",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "iconUrl",
+            "columnName": "iconUrl",
+            "affinity": "TEXT"
+          },
+          {
+            "fieldPath": "iconBase64",
+            "columnName": "iconBase64",
+            "affinity": "TEXT"
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "announcementId",
+            "title"
+          ]
+        },
+        "foreignKeys": [
+          {
+            "table": "WhatsNewAnnouncementEntity",
+            "onDelete": "CASCADE",
+            "onUpdate": "NO ACTION",
+            "columns": [
+              "announcementId"
+            ],
+            "referencedColumns": [
+              "announcementId"
+            ]
+          }
+        ]
       }
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '170c715c7279c4691cfd3d797a79fa3b')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'aa2684d22c5ec8552e80cd32e2ec522a')"
     ]
   }
 }

libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/whatsnew/WhatsNewAnnouncementModel.kt

@@ -7,14 +7,11 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 @SuppressLint("ParcelCreator")
 data class WhatsNewAnnouncementModel(
-    val appVersionName: String,
     val announcementVersion: Int,
     val minimumAppVersion: String,
     val maximumAppVersion: String,
     val appVersionTargets: List<String>,
-    val detailsUrl: String?,
     val isLocalized: Boolean,
-    val responseLocale: String,
     val features: List<WhatsNewAnnouncementFeature>
 ) : Parcelable {
     @Parcelize

libs/fluxc/src/main/java/org/wordpress/android/fluxc/model/whatsnew/WhatsNewAppId.kt

@@ -0,0 +1,5 @@
+package org.wordpress.android.fluxc.model.whatsnew
+
+internal enum class WhatsNewAppId(val id: Int) {
+    WOO_ANDROID(3),
+}

libs/fluxc/src/main/java/org/wordpress/android/fluxc/module/DatabaseModule.kt

@@ -9,6 +9,7 @@ import org.wordpress.android.fluxc.persistence.WPAndroidDatabase.Companion.build
 import org.wordpress.android.fluxc.persistence.blaze.BlazeCampaignsDao
 import org.wordpress.android.fluxc.persistence.blaze.BlazeObjectivesDao
 import org.wordpress.android.fluxc.persistence.blaze.BlazeTargetingDao
+import org.wordpress.android.fluxc.persistence.dao.WhatsNewDao
 import org.wordpress.android.fluxc.persistence.domains.DomainDao
 import javax.inject.Singleton
 
@@ -49,4 +50,9 @@ class DatabaseModule {
     fun provideBlazeObjectivesDao(wpAndroidDatabase: WPAndroidDatabase): BlazeObjectivesDao {
         return wpAndroidDatabase.blazeObjectivesDao()
     }
+
+    @Provides
+    internal fun provideWhatsNewDao(wpAndroidDatabase: WPAndroidDatabase): WhatsNewDao {
+        return wpAndroidDatabase.whatsNewDao()
+    }
 }