Reader: Update Reader hasMore API logic (#22597)

Author: wargcm

API-Mocks/WordPressMocks/src/main/assets/mocks/__files/__admin/scenarios.json

@@ -12,6 +12,12 @@
       "state" : "Started",
       "possibleStates" : [ "Started", "initial_likes_list", "post_liked", "new_likes_list" ]
     },
+    {
+      "id" : "reader_subscriptions_flow",
+      "name" : "reader_subscriptions_flow",
+      "state" : "Started",
+      "possibleStates" : [ "Started", "initial_subscriptions_list", "empty_subscriptions_list" ]
+    },
     {
       "id" : "new_page_flow",
       "name" : "new_page_flow",

API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_following.json

@@ -1,4 +1,7 @@
 {
+  "scenarioName": "reader_subscriptions_flow",
+  "requiredScenarioState": "Started",
+  "newScenarioState": "initial_subscriptions_list",
   "request": {
     "method": "GET",
     "urlPath": "/rest/v1.2/read/following"
@@ -1478,4 +1481,4 @@
       "Cache-Control": "no-cache, must-revalidate, max-age=0"
     }
   }
-}
+}

API-Mocks/WordPressMocks/src/main/assets/mocks/mappings/wpcom/reader/rest_v12_read_following_empty.json

@@ -0,0 +1,26 @@
+{
+  "scenarioName": "reader_subscriptions_flow",
+  "requiredScenarioState": "initial_subscriptions_list",
+  "newScenarioState": "empty_subscriptions_list",
+  "request": {
+    "method": "GET",
+    "urlPath": "/rest/v1.2/read/following"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "date_range": {
+        "before": "2019-05-23T13:00:09+00:00",
+        "after": "2021-05-17T16:34:44+00:00"
+      },
+      "number": 0,
+      "posts": [
+      ]
+    },
+    "headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive",
+      "Cache-Control": "no-cache, must-revalidate, max-age=0"
+    }
+  }
+}

WordPress/Classes/Services/Reader Post/ReaderPostService.m

@@ -768,13 +768,7 @@ - (void)mergePosts:(NSArray *)remotePosts
         [self deletePostsFromBlockedSitesInContext:context];
 
         BOOL spaceAvailable = ([self numberOfPostsForTopic:readerTopic inContext:context] < [self maxPostsToSaveForTopic:readerTopic]);
-        if ([ReaderHelpers isTopicTag:readerTopic] || [ReaderHelpers isRSSFeed:readerTopic]) {
-            // For tags and RSS feeds, assume there is more content as long as more than zero results are returned.
-            hasMore = (postsCount > 0 ) && spaceAvailable;
-        } else {
-            // For other topics, assume there is more content as long as the number of results requested is returned.
-            hasMore = ([remotePosts count] == [self numberToSyncForTopic:readerTopic]) && spaceAvailable;
-        }
+        hasMore = postsCount > 0 && spaceAvailable;
     } completion:^{
         if (success) {
             success(postsCount, hasMore);
@@ -1151,16 +1145,8 @@ - (ReaderPost *)createOrReplaceFromRemotePost:(RemoteReaderPost *)remotePost for
 #pragma mark Internal
 
 - (BOOL)canLoadMorePostsForTopic:(ReaderAbstractTopic * _Nonnull)readerTopic remotePosts:(NSArray * _Nonnull)remotePosts inContext: (NSManagedObjectContext * _Nonnull)context {
-    BOOL hasMore = NO;
     BOOL spaceAvailable = ([self numberOfPostsForTopic:readerTopic inContext:context] < [self maxPostsToSaveForTopic:readerTopic]);
-    if ([ReaderHelpers isTopicTag:readerTopic] || [ReaderHelpers isRSSFeed:readerTopic]) {
-        // For tags and RSS feeds, assume there is more content as long as more than zero results are returned.
-        hasMore = ([remotePosts count] > 0 ) && spaceAvailable;
-    } else {
-        // For other topics, assume there is more content as long as the number of results requested is returned.
-        hasMore = ([remotePosts count] == [self numberToSyncForTopic:readerTopic]) && spaceAvailable;
-    }
-    return hasMore;
+    return [remotePosts count] > 0 && spaceAvailable;
 }
 
 @end

WordPress/UITests/Tests/ReaderTests.swift

@@ -6,6 +6,7 @@ class ReaderTests: XCTestCase {
     @MainActor
     override func setUp() async throws {
         setUpTestSuite()
+        try await WireMock.setUpScenario(scenario: "reader_subscriptions_flow")
         try await WireMock.setUpScenario(scenario: "reader_like_post_flow")
 
         try LoginFlow