Merge pull request #2770 from wordpress-mobile/revert-incorect-mapping

Revert incorrect change to mapping
wordpress-mobile · Jul 10, 2023 · 5eeeff6 · 5eeeff6
2 parents 958779f + dbfe0d9
commit 5eeeff6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/example/src/test/java/org/wordpress/android/fluxc/model/customer/WCCustomerMapperTest.kt b/example/src/test/java/org/wordpress/android/fluxc/model/customer/WCCustomerMapperTest.kt
@@ -219,7 +219,7 @@ class WCCustomerMapperTest {
         assertThat(result.lastName).isEqualTo("lastname")
         assertThat(result.email).isEqualTo("email")
         assertThat(result.isPayingCustomer).isEqualTo(true)
-        assertThat(result.remoteCustomerId).isEqualTo(13L)
+        assertThat(result.remoteCustomerId).isEqualTo(1L)
         assertThat(result.dateCreated).isEqualTo("dateRegistered")
         assertThat(result.dateModified).isEqualTo("dateLastActive")
 

diff --git a/...oocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerMapper.kt b/...oocommerce/src/main/kotlin/org/wordpress/android/fluxc/model/customer/WCCustomerMapper.kt
@@ -88,7 +88,7 @@ class WCCustomerMapper @Inject constructor() {
     fun mapToModel(site: SiteModel, dto: CustomerFromAnalyticsDTO): WCCustomerModel {
         return WCCustomerModel().apply {
             localSiteId = site.id
-            remoteCustomerId = dto.id ?: 0
+            remoteCustomerId = dto.userId ?: 0
             email = dto.email ?: ""
             firstName = dto.name.firstNameFromName()
             lastName = dto.name.lastNameFromName()