Merge pull request #20414 from wordpress-mobile/issue/19572-read-stre…

…ams-discover-endpoint-integration [Reader] `read/streams/discover` endpoint integration
wordpress-mobile · Mar 7, 2024 · 380c65a · 380c65a
2 parents e93b549 + 14115d7
commit 380c65a
Show file tree

Hide file tree

Showing 4 changed files with 3,906 additions and 11 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -143,6 +143,7 @@ android {
         buildConfigField "boolean", "BLOGANUARY_DASHBOARD_NUDGE", "false"
         buildConfigField "boolean", "DYNAMIC_DASHBOARD_CARDS", "false"
         buildConfigField "boolean", "STATS_TRAFFIC_TAB", "false"
+        buildConfigField "boolean", "READER_DISCOVER_NEW_ENDPOINT", "false"
 
         // Override these constants in jetpack product flavor to enable/ disable features
         buildConfigField "boolean", "ENABLE_SITE_CREATION", "true"

diff --git a/...ss/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt b/...ss/src/main/java/org/wordpress/android/ui/reader/services/discover/ReaderDiscoverLogic.kt
@@ -46,6 +46,7 @@ import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.Dis
 import org.wordpress.android.ui.reader.services.discover.ReaderDiscoverLogic.DiscoverTasks.REQUEST_MORE
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T.READER
+import org.wordpress.android.util.config.ReaderDiscoverNewEndpointFeatureConfig
 import javax.inject.Inject
 
 /**
@@ -57,6 +58,7 @@ class ReaderDiscoverLogic @Inject constructor(
     private val getFollowedTagsUseCase: GetFollowedTagsUseCase,
     private val getDiscoverCardsUseCase: GetDiscoverCardsUseCase,
     private val appPrefsWrapper: AppPrefsWrapper,
+    private val readerDiscoverNewEndpointFeatureConfig: ReaderDiscoverNewEndpointFeatureConfig,
 ) {
     enum class DiscoverTasks {
         REQUEST_MORE, REQUEST_FIRST_PAGE
@@ -116,7 +118,12 @@ class ReaderDiscoverLogic @Inject constructor(
                 AppLog.e(READER, volleyError)
                 resultListener.onUpdateResult(FAILED)
             }
-            WordPress.getRestClientUtilsV2()["read/tags/cards", params, null, listener, errorListener]
+            val endpoint = if (readerDiscoverNewEndpointFeatureConfig.isEnabled()) {
+                "read/streams/discover"
+            } else {
+                "read/tags/cards"
+            }
+            WordPress.getRestClientUtilsV2()[endpoint, params, null, listener, errorListener]
         }
     }
 
@@ -200,10 +207,19 @@ class ReaderDiscoverLogic @Inject constructor(
     @Suppress("NestedBlockDepth")
     private fun createSimplifiedJson(cardsJsonArray: JSONArray, discoverTasks: DiscoverTasks): JSONArray {
         val simplifiedJsonList = mutableListOf<JSONObject>()
-        var firstYouMayLikeCard: JSONObject? = null
+        var firstRecommendationCard: JSONObject? = null
+        val isFirstPage = discoverTasks == REQUEST_FIRST_PAGE
         for (i in 0 until cardsJsonArray.length()) {
             val cardJson = cardsJsonArray.getJSONObject(i)
-            when (cardJson.getString(JSON_CARD_TYPE)) {
+            // We should not have a recommended blogs or interests/tags card as the first element on Discover feed.
+            val cardType = cardJson.optString(JSON_CARD_TYPE, "")
+            val isCardTypeRecommendation =
+                cardType == JSON_CARD_RECOMMENDED_BLOGS || cardType == JSON_CARD_INTERESTS_YOU_MAY_LIKE
+            if (i == 0 && isFirstPage && isCardTypeRecommendation) {
+                firstRecommendationCard = cardJson
+                continue
+            }
+            when (cardType) {
                 JSON_CARD_RECOMMENDED_BLOGS -> {
                     cardJson.optJSONArray(JSON_CARD_DATA)?.let { recommendedBlogsCardJson ->
                         if (recommendedBlogsCardJson.length() > 0) {
@@ -212,21 +228,17 @@ class ReaderDiscoverLogic @Inject constructor(
                     }
                 }
                 JSON_CARD_INTERESTS_YOU_MAY_LIKE -> {
-                    // We should not have an interests/tags card as the first element on Discover feed.
-                    if (i == 0 && discoverTasks == REQUEST_FIRST_PAGE) {
-                        firstYouMayLikeCard = cardJson
-                        continue
-                    }
                     simplifiedJsonList.add(cardJson)
                 }
                 JSON_CARD_POST -> {
                     simplifiedJsonList.add(createSimplifiedPostJson(cardJson))
                 }
             }
         }
-        // If we've received an interests/tags card as the first element, it should be displayed as the third card.
-        if (firstYouMayLikeCard != null) {
-            simplifiedJsonList.add(2, firstYouMayLikeCard)
+        // If we've received a recommended tags or blogs card as the first element,
+        // it should be displayed as the third card.
+        if (firstRecommendationCard != null) {
+            simplifiedJsonList.add(2, firstRecommendationCard)
         }
 
         return JSONArray(simplifiedJsonList)

diff --git a/...src/main/java/org/wordpress/android/util/config/ReaderDiscoverNewEndpointFeatureConfig.kt b/...src/main/java/org/wordpress/android/util/config/ReaderDiscoverNewEndpointFeatureConfig.kt
@@ -0,0 +1,23 @@
+package org.wordpress.android.util.config
+
+import org.wordpress.android.BuildConfig
+import org.wordpress.android.annotation.Feature
+import javax.inject.Inject
+
+private const val READER_DISCOVER_NEW_ENDPOINT_REMOTE_FIELD = "reader_discover_new_endpoint"
+
+@Feature(
+    remoteField = READER_DISCOVER_NEW_ENDPOINT_REMOTE_FIELD,
+    defaultValue = true,
+)
+class ReaderDiscoverNewEndpointFeatureConfig @Inject constructor(
+    appConfig: AppConfig
+) : FeatureConfig(
+    appConfig,
+    BuildConfig.READER_DISCOVER_NEW_ENDPOINT,
+    READER_DISCOVER_NEW_ENDPOINT_REMOTE_FIELD
+) {
+    override fun isEnabled(): Boolean {
+        return super.isEnabled() && BuildConfig.IS_JETPACK_APP
+    }
+}