Merge pull request #3031 from wordpress-mobile/issue/update-voice-to-content-requests

[Voice to Content] Endpoint adjustments

Author: pantstamp

fluxc/src/main/java/org/wordpress/android/fluxc/model/jetpackai/JetpackAIAssistantFeature.kt

@@ -34,6 +34,7 @@ data class JetpackAIAssistantFeature(
     val usagePeriod: UsagePeriod?,
     val siteRequireUpgrade: Boolean,
     val upgradeType: String,
+    val upgradeUrl: String?,
     val currentTier: Tier?,
     val nextTier: Tier?,
     val tierPlans: List<Tier>,

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIAssistantFeatureDto.kt

@@ -94,6 +94,8 @@ data class JetpackAIAssistantFeatureDto(
     val siteRequireUpgrade: Boolean?,
     @SerializedName("upgrade-type")
     val upgradeType: String?,
+    @SerializedName("upgrade-url")
+    val upgradeUrl: String?,
     @SerializedName("current-tier")
     val currentTier: TierDto?,
     @SerializedName("next-tier")
@@ -114,6 +116,7 @@ data class JetpackAIAssistantFeatureDto(
             usagePeriod = usagePeriod?.toUsagePeriod(),
             siteRequireUpgrade = siteRequireUpgrade ?: false,
             upgradeType = upgradeType.orEmpty(),
+            upgradeUrl = upgradeUrl, // Can be null
             currentTier = currentTier?.toTier(),
             nextTier = nextTier?.toTier(),
             tierPlans = tierPlans?.map { it.toTier() } ?: emptyList(),

fluxc/src/main/java/org/wordpress/android/fluxc/network/rest/wpcom/jetpackai/JetpackAIRestClient.kt

@@ -1,6 +1,7 @@
 package org.wordpress.android.fluxc.network.rest.wpcom.jetpackai
 
 import android.content.Context
+import androidx.annotation.VisibleForTesting
 import com.android.volley.RequestQueue
 import com.google.gson.annotations.SerializedName
 import org.wordpress.android.fluxc.Dispatcher
@@ -168,8 +169,11 @@ class JetpackAIRestClient @Inject constructor(
 
         return when (response) {
             is Response.Success -> {
-                (response.data as? JetpackAIQueryDto)?.toJetpackAIQueryResponse()
-                    ?: JetpackAIQueryResponse.Error(JetpackAIQueryErrorType.INVALID_DATA, "Can not get the object")
+                val data = response.data as? JetpackAIQueryDto
+                data?.toJetpackAIQueryResponse()
+                    ?: JetpackAIQueryResponse.Error(
+                        JetpackAIQueryErrorType.INVALID_DATA, "Can not get the object"
+                    )
             }
             is Response.Error -> {
                 JetpackAIQueryResponse.Error(
@@ -222,7 +226,8 @@ class JetpackAIRestClient @Inject constructor(
         @SerializedName ("completion") val completion: String
     )
 
-    internal data class JetpackAIQueryDto(val model: String, val choices: List<Choice>) {
+    @VisibleForTesting
+    internal data class JetpackAIQueryDto(val model: String, val choices: List<Choice>?) {
         data class Choice(val index: Int, val message: Message) {
             data class Message(val role: String, val content: String)
         }
@@ -253,7 +258,10 @@ class JetpackAIRestClient @Inject constructor(
     }
 
     private fun JetpackAIQueryDto.toJetpackAIQueryResponse(): JetpackAIQueryResponse {
-        return JetpackAIQueryResponse.Success(model, choices.map { choice ->
+        // Check if choices is null or empty
+        val safeChoices = choices ?: emptyList()
+
+        return JetpackAIQueryResponse.Success(model, safeChoices.map { choice ->
             JetpackAIQueryResponse.Success.Choice(
                 choice.index,
                 JetpackAIQueryResponse.Success.Choice.Message(