Merge branch 'develop' into issue/1402-cache-jetpack-user-email

Author: 0nko

fluxc/src/main/java/org/wordpress/android/fluxc/persistence/WellSqlConfig.kt

@@ -27,7 +27,7 @@ open class WellSqlConfig : DefaultWellConfig {
     annotation class AddOn
 
     override fun getDbVersion(): Int {
-        return 89
+        return 90
     }
 
     override fun getDbName(): String {
@@ -1000,8 +1000,11 @@ open class WellSqlConfig : DefaultWellConfig {
                                 "DATA TEXT NOT NULL)"
                     )
                 }
-                88 -> migrate(version) {
-                    db.execSQL("alter table SiteModel add JETPACK_USER_EMAIL TEXT")
+                88 -> migrateAddOn(ADDON_WOOCOMMERCE, version) {
+                    db.execSQL("ALTER TABLE WCOrderNoteModel ADD AUTHOR TEXT")
+                }
+                89 -> migrate(version) {
+                    db.execSQL("ALTER TABLE SiteModel ADD JETPACK_USER_EMAIL TEXT")
                 }
             }
         }

plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/WCOrderNoteModel.kt

@@ -13,6 +13,7 @@ data class WCOrderNoteModel(@PrimaryKey @Column private var id: Int = 0) : Ident
     @Column var remoteNoteId = 0L // The unique identifier for this note on the server
     @Column var dateCreated = "" // ISO 8601-formatted date in UTC, e.g. 1955-11-05T14:15:00Z
     @Column var note = ""
+    @Column var author = ""
     @Column var isSystemNote = false // True if the note is 'system-created', else created by a site user
         @JvmName("setIsSystemNote")
         set

plugins/woocommerce/src/main/kotlin/org/wordpress/android/fluxc/network/rest/wpcom/wc/order/OrderRestClient.kt

@@ -692,7 +692,8 @@ class OrderRestClient(
             remoteNoteId = response.id ?: 0
             dateCreated = response.date_created_gmt?.let { "${it}Z" } ?: ""
             note = response.note ?: ""
-            isSystemNote = response.author == "system"
+            isSystemNote = response.author == "system" || response.author == "WooCommerce"
+            author = response.author ?: ""
             isCustomerNote = response.customer_note
         }
     }