Add FetchMore to Content Suggestions Mediator

ios/chrome/browser/content_suggestions/content_suggestions_mediator.mm

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "ios/chrome/browser/content_suggestions/content_suggestions_mediator.h"
 
 #include "base/mac/bind_objc_block.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/ntp_snippets/category.h"
 #include "components/ntp_snippets/content_suggestion.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_category_wrapper.h"
 #import "ios/chrome/browser/content_suggestions/content_suggestions_service_bridge_observer.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestion_identifier.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_data_sink.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_image_fetcher.h"
 #import "ios/chrome/browser/ui/content_suggestions/content_suggestions_section_information.h"
 #include "ui/gfx/image/image.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace {
 
+// TODO(crbug.com/701275):Once base::BindBlock supports the move semantics,

[lpromero, 2017/03/14 16:33:08]

Add a space after the colon.

[gambard, 2017/03/15 09:53:36]

Done.

+// remove this wrapper.
+// Wraps a callback taking a const ref to a callback taking an object.
+void BindWrapper(
+    base::Callback<void(ntp_snippets::Status status_code,
+                        const std::vector<ntp_snippets::ContentSuggestion>&
+                            suggestions)> callback,
+    ntp_snippets::Status status_code,
+    std::vector<ntp_snippets::ContentSuggestion> suggestions) {
+  if (callback) {
+    callback.Run(status_code, suggestions);
+  }
+}
+
 // Returns the Type for this |category|.
 ContentSuggestionType TypeForCategory(ntp_snippets::Category category) {
   // For now, only Article is a relevant type.
   return ContentSuggestionTypeArticle;
 }
 
 // Returns the section ID for this |category|.
 ContentSuggestionsSectionID SectionIDForCategory(
     ntp_snippets::Category category) {
   if (category.IsKnownCategory(ntp_snippets::KnownCategories::BOOKMARKS))
@@ skipping 67 matching lines @@
   std::unique_ptr<ContentSuggestionsServiceBridge> _suggestionBridge;
 }
 
 @property(nonatomic, assign)
     ntp_snippets::ContentSuggestionsService* contentService;
 @property(nonatomic, strong, nonnull)
     NSMutableDictionary<ContentSuggestionsCategoryWrapper*,
                         ContentSuggestionsSectionInformation*>*
         sectionInformationByCategory;
 
-// Converts the data in |category| to ContentSuggestion and adds them to the
-// |contentArray|.
-- (void)addContentInCategory:(ntp_snippets::Category&)category
-                     toArray:(NSMutableArray<ContentSuggestion*>*)contentArray;
+// Converts the |suggestions| from |category| to ContentSuggestion and adds them
+// to the |contentArray|.
+- (void)addSuggestions:
+            (const std::vector<ntp_snippets::ContentSuggestion>&)suggestions
+          fromCategory:(ntp_snippets::Category&)category
+               toArray:(NSMutableArray<ContentSuggestion*>*)contentArray;
 
 // Adds the section information for |category| in
 // self.sectionInformationByCategory.
 - (void)addSectionInformationForCategory:(ntp_snippets::Category)category;
 
 // Returns a CategoryWrapper acting as a key for this section info.
 - (ContentSuggestionsCategoryWrapper*)categoryWrapperForSectionInfo:
     (ContentSuggestionsSectionInformation*)sectionInfo;
 
 @end
@@ skipping 36 matching lines @@
   NSMutableArray<ContentSuggestion*>* dataHolders = [NSMutableArray array];
   for (auto& category : categories) {
     if (self.contentService->GetCategoryStatus(category) !=
         ntp_snippets::CategoryStatus::AVAILABLE) {
       continue;
     }
     if (!self.sectionInformationByCategory[
             [ContentSuggestionsCategoryWrapper wrapperWithCategory:category]]) {
       [self addSectionInformationForCategory:category];
     }
-    [self addContentInCategory:category toArray:dataHolders];
+    const std::vector<ntp_snippets::ContentSuggestion>& suggestions =
+        self.contentService->GetSuggestionsForCategory(category);
+    [self addSuggestions:suggestions fromCategory:category toArray:dataHolders];
   }
   return dataHolders;
 }
 
 - (id<ContentSuggestionsImageFetcher>)imageFetcher {
   return self;
 }
 
+- (void)fetchMoreSuggestionsKnowing:
+            (NSArray<ContentSuggestionIdentifier*>*)knownSuggestions
+                    fromSectionInfo:
+                        (ContentSuggestionsSectionInformation*)sectionInfo
+                           callback:(MoreSuggestionsFetched)callback {
+  std::set<std::string> known_suggestion_ids;
+  for (ContentSuggestionIdentifier* identifier in knownSuggestions) {
+    if (identifier.sectionInfo != sectionInfo)
+      continue;
+    known_suggestion_ids.insert(identifier.IDInSection);
+  }
+
+  ContentSuggestionsCategoryWrapper* wrapper =
+      [self categoryWrapperForSectionInfo:sectionInfo];
+
+  __weak ContentSuggestionsMediator* weakSelf = self;
+  ntp_snippets::FetchDoneCallback serviceCallback = base::Bind(
+      &BindWrapper,
+      base::BindBlockArc(^void(
+          ntp_snippets::Status status,
+          const std::vector<ntp_snippets::ContentSuggestion>& suggestions) {
+        [weakSelf didFetchMoreSuggestions:suggestions
+                           withStatusCode:status
+                                 callback:callback];
+      }));
+
+  self.contentService->Fetch([wrapper category], known_suggestion_ids,
+                             serviceCallback);
+}
+
 #pragma mark - ContentSuggestionsServiceObserver
 
 - (void)contentSuggestionsService:
             (ntp_snippets::ContentSuggestionsService*)suggestionsService
          newSuggestionsInCategory:(ntp_snippets::Category)category {
   [self.dataSink dataAvailable];
 }
 
 - (void)contentSuggestionsService:
             (ntp_snippets::ContentSuggestionsService*)suggestionsService
@@ skipping 34 matching lines @@
                        callback:(void (^)(const gfx::Image&))callback {
   self.contentService->FetchSuggestionImage(
       SuggestionIDForSectionID(
           [self categoryWrapperForSectionInfo:suggestionIdentifier.sectionInfo],
           suggestionIdentifier.IDInSection),
       base::BindBlockArc(callback));
 }
 
 #pragma mark - Private
 
-- (void)addContentInCategory:(ntp_snippets::Category&)category
-                     toArray:(NSMutableArray<ContentSuggestion*>*)contentArray {
-  const std::vector<ntp_snippets::ContentSuggestion>& suggestions =
-      self.contentService->GetSuggestionsForCategory(category);
+- (void)addSuggestions:
+            (const std::vector<ntp_snippets::ContentSuggestion>&)suggestions
+          fromCategory:(ntp_snippets::Category&)category
+               toArray:(NSMutableArray<ContentSuggestion*>*)contentArray {
   ContentSuggestionsCategoryWrapper* categoryWrapper =
       [[ContentSuggestionsCategoryWrapper alloc] initWithCategory:category];
   for (auto& contentSuggestion : suggestions) {
     ContentSuggestion* suggestion = ConvertContentSuggestion(contentSuggestion);
     suggestion.type = TypeForCategory(category);
+
     suggestion.suggestionIdentifier.sectionInfo =
         self.sectionInformationByCategory[categoryWrapper];
 
     [contentArray addObject:suggestion];
   }
 }
 
 - (void)addSectionInformationForCategory:(ntp_snippets::Category)category {
   base::Optional<ntp_snippets::CategoryInfo> categoryInfo =
       self.contentService->GetCategoryInfo(category);
 
   ContentSuggestionsSectionInformation* sectionInfo =
       SectionInformationFromCategoryInfo(categoryInfo, category);
 
   self.sectionInformationByCategory[[ContentSuggestionsCategoryWrapper
       wrapperWithCategory:category]] = sectionInfo;
 }
 
 - (ContentSuggestionsCategoryWrapper*)categoryWrapperForSectionInfo:
     (ContentSuggestionsSectionInformation*)sectionInfo {
   return [[self.sectionInformationByCategory allKeysForObject:sectionInfo]
       firstObject];
 }
 
+// If the |statusCode| is a success and |suggestions| is not empty, runs the
+// |callback| with the |suggestions| converted to Objective-C.
+- (void)didFetchMoreSuggestions:
+            (const std::vector<ntp_snippets::ContentSuggestion>&)suggestions
+                 withStatusCode:(ntp_snippets::Status)statusCode
+                       callback:(MoreSuggestionsFetched)callback {
+  if (statusCode.IsSuccess() && !suggestions.empty() && callback) {
+    NSMutableArray<ContentSuggestion*>* contentSuggestions =
+        [NSMutableArray array];
+    ntp_snippets::Category category = suggestions[0].id().category();
+    [self addSuggestions:suggestions
+            fromCategory:category
+                 toArray:contentSuggestions];
+    callback(contentSuggestions);
+  }
+}
+
 @end