From ac54e4d5aeb66eb8ff10bc83e4ddf2a48cf5eb88 Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Fri, 8 Nov 2024 18:08:50 +0100 Subject: [PATCH 1/3] Add new cta_text field to suggestions response --- .../wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt | 3 ++- .../network/rest/wpcom/blaze/BlazeCreationRestClient.kt | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt index d19ba73883..28e9b423fa 100644 --- a/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt +++ b/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeAdSuggestion.kt @@ -2,5 +2,6 @@ package org.wordpress.android.fluxc.model.blaze data class BlazeAdSuggestion( val tagLine: String, - val description: String + val description: String, + val ctaText: String ) diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt index 004458d8f3..c0a2832664 100644 --- a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt +++ b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt @@ -366,11 +366,14 @@ private class BlazeAdSuggestionListResponse( val siteName: String, @SerializedName("text_snippet") val textSnippet: String, + @SerializedName("cta_text") + val ctaText: String, ) { fun toDomainModel(): BlazeAdSuggestion { return BlazeAdSuggestion( tagLine = siteName, - description = textSnippet + description = textSnippet, + ctaText = ctaText ) } } From 54ac46c3b7fe5ac44c4f3d53ce545efaeef7025b Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Fri, 8 Nov 2024 18:27:58 +0100 Subject: [PATCH 2/3] Send cta text value when creating Blaze campaign --- .../android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt | 1 + .../fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt index 905d8317e9..e98cf974da 100644 --- a/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt +++ b/fluxc/src/main/java/org/wordpress/android/fluxc/model/blaze/BlazeCampaignCreationRequest.kt @@ -12,6 +12,7 @@ data class BlazeCampaignCreationRequest( val paymentMethodId: String, val tagLine: String, val description: String, + val ctaText: String, val startDate: Date, val endDate: Date, val budget: BlazeCampaignCreationRequestBudget, diff --git a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt index c0a2832664..dff6c1b78c 100644 --- a/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt +++ b/fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/blaze/BlazeCreationRestClient.kt @@ -234,6 +234,7 @@ class BlazeCreationRestClient @Inject constructor( ), "site_name" to request.tagLine, "text_snippet" to request.description, + "cta_text" to request.ctaText, "target_url" to request.targetUrl, "url_params" to request.urlParams.entries.joinToString(separator = "&") { "${it.key}=${it.value}" }, "main_image" to JsonObject().apply { From 0209c40e7ac3806c11f2c96c2c691061d0a773e8 Mon Sep 17 00:00:00 2001 From: jorgemucientesfayos Date: Mon, 11 Nov 2024 10:41:16 +0100 Subject: [PATCH 3/3] Fix unit test compile issues --- .../android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/example/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt b/example/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt index c6bbdac8f4..f01250ec49 100644 --- a/example/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt +++ b/example/src/test/java/org/wordpress/android/fluxc/store/blaze/BlazeCampaignsStoreTest.kt @@ -402,7 +402,8 @@ class BlazeCampaignsStoreTest { val suggestions = List(10) { BlazeAdSuggestion( tagLine = it.toString(), - description = "Ad $it" + description = "Ad $it", + ctaText = "CTA $it" ) }