[Offline pages] Implementation of RQStore.UpdateRequests with StoreUpdateResult

components/offline_pages/background/request_queue.cc

 // Copyright 2016 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.
 
 #include "components/offline_pages/background/request_queue.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "components/offline_pages/background/request_queue_store.h"
@@ skipping 33 matching lines @@
       break;
     case ItemActionStatus::NOT_FOUND:
     default:
       NOTREACHED();
       return;
   }
   callback.Run(result, request);
 }
 
 // Completes the update request call.
-// TODO(petewil): Move callers to the UpdateMultipleRequestDone callback
-void UpdateRequestDone(const RequestQueue::UpdateRequestCallback& callback,
-                       RequestQueueStore::UpdateStatus status) {
-  RequestQueue::UpdateRequestResult result =
-      (status == RequestQueueStore::UpdateStatus::UPDATED)
-          ? RequestQueue::UpdateRequestResult::SUCCESS
-          : RequestQueue::UpdateRequestResult::STORE_FAILURE;
+// TODO(fgorski): For specific cases, check that appropriate items were updated.
+void UpdateRequestsDone(const RequestQueue::UpdateRequestCallback& callback,
+                        std::unique_ptr<UpdateRequestsResult> store_result) {
+  RequestQueue::UpdateRequestResult result;
+  if (store_result->store_state != StoreState::LOADED) {
+    result = RequestQueue::UpdateRequestResult::STORE_FAILURE;
+  } else if (store_result->item_statuses.size() == 0) {
+    result = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
+  } else {
+    ItemActionStatus status = store_result->item_statuses.begin()->second;
+    if (status == ItemActionStatus::STORE_ERROR)
+      result = RequestQueue::UpdateRequestResult::STORE_FAILURE;
+    else if (status == ItemActionStatus::NOT_FOUND)
+      result = RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST;
+    else
+      result = RequestQueue::UpdateRequestResult::SUCCESS;
+  }
+
   callback.Run(result);
 }
 
 // Handles updating multiple requests at the same time.
 void UpdateMultipleRequestsDone(

[Pete Williamson, 2016/09/22 00:12:50]

We should remove all references to UpdateMultipleRequestsXxx.

The original idea was that UpdateRequestDone was used for a single request, and
UpdateMultipleRequests was used for many.  Since we now always do many, we don't
need both flavors of the function.

[fgorski, 2016/09/22 15:47:53]

I agree with you, but let's go step by step. This is still used right now and
I'd like to remove ChangeRequestsState in a separate patch. Hope that is ok.

     const RequestQueue::UpdateMultipleRequestsCallback& callback,
     const RequestQueue::UpdateMultipleRequestResults& results,
     std::vector<std::unique_ptr<SavePageRequest>> requests) {
   callback.Run(results, std::move(requests));
 }
 
 // Completes the remove request call.
 void RemoveRequestsDone(
     const RequestQueue::RemoveRequestsCallback& callback,
     const RequestQueue::UpdateMultipleRequestResults& results,
@@ skipping 18 matching lines @@
   // TODO(fgorski): check that request does not violate policy.
   store_->AddRequest(request, base::Bind(&AddRequestDone, callback, request));
 }
 
 void RequestQueue::UpdateRequest(const SavePageRequest& update_request,
                                  const UpdateRequestCallback& update_callback) {
   // We have to pass the update_callback *through* the get callback.  We do this
   // by currying the update_callback as a parameter to be used when calling
   // GetForUpdateDone.  The actual request queue store get operation will not
   // see this bound parameter, but just pass it along.  GetForUpdateDone then
-  // passes it into the AddOrUpdateRequest method, where it ends up calling back
+  // passes it into the UpdateRequests method, where it ends up calling back
   // to the request queue client.
   // TODO(petewil): This would be more efficient if the store supported a call
   // to get a single item by ID.  Change this code to use that API when added.
   // crbug.com/630657.
   store_->GetRequests(base::Bind(
       &RequestQueue::GetForUpdateDone, weak_ptr_factory_.GetWeakPtr(),
       update_callback, update_request));
 }
 
 // We need a different version of the GetCallback that can take the curried
 // update_callback as a parameter, and call back into the request queue store
 // implementation.  This must be a member function because we need access to
-// the store pointer to call AddOrUpdateRequest.
+// the store pointer to call UpdateRequests.
 void RequestQueue::GetForUpdateDone(
     const UpdateRequestCallback& update_callback,
     const SavePageRequest& update_request,
     bool success,
     std::vector<std::unique_ptr<SavePageRequest>> found_requests) {
   // If the result was not found, return now.
   if (!success) {
     update_callback.Run(
         RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST);
     return;
   }
   // If the found result does not contain the request we are looking for, return
   // now.
   bool found = false;
   std::vector<std::unique_ptr<SavePageRequest>>::const_iterator iter;
   for (iter = found_requests.begin(); iter != found_requests.end(); ++iter) {
     if ((*iter)->request_id() == update_request.request_id())
       found = true;
   }
   if (!found) {
     update_callback.Run(
         RequestQueue::UpdateRequestResult::REQUEST_DOES_NOT_EXIST);
     return;
   }
 
   // Since the request exists, update it.
-  store_->AddOrUpdateRequest(update_request,
-                             base::Bind(&UpdateRequestDone, update_callback));
+  std::vector<SavePageRequest> update_requests{update_request};
+  store_->UpdateRequests(update_requests,
+                         base::Bind(&UpdateRequestsDone, update_callback));
 }
 
 void RequestQueue::RemoveRequests(const std::vector<int64_t>& request_ids,
                                   const RemoveRequestsCallback& callback) {
   store_->RemoveRequests(request_ids, base::Bind(RemoveRequestsDone, callback));
 }
 
 void RequestQueue::ChangeRequestsState(
     const std::vector<int64_t>& request_ids,
     const SavePageRequest::RequestState new_state,
     const UpdateMultipleRequestsCallback& callback) {
   store_->ChangeRequestsState(request_ids, new_state,
                               base::Bind(UpdateMultipleRequestsDone, callback));
 }
 
 void RequestQueue::PurgeRequests(const PurgeRequestsCallback& callback) {}
 
 }  // namespace offline_pages