Process TeamDrive change in change list.

components/drive/chromeos/change_list_processor.cc

 // Copyright (c) 2012 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/drive/chromeos/change_list_processor.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 59 matching lines @@
 }
 
 ChangeList::ChangeList() {}
 
 ChangeList::ChangeList(const google_apis::ChangeList& change_list)
     : next_url_(change_list.next_link()),
       largest_changestamp_(change_list.largest_change_id()) {
   const std::vector<std::unique_ptr<google_apis::ChangeResource>>& items =
       change_list.items();
   entries_.resize(items.size());
+  team_drives_.resize(items.size());
   parent_resource_ids_.resize(items.size());
   size_t entries_index = 0;
+  size_t team_drives_index = 0;
   for (size_t i = 0; i < items.size(); ++i) {
-    if (ConvertChangeResourceToResourceEntry(
-            *items[i],
-            &entries_[entries_index],
-            &parent_resource_ids_[entries_index])) {
+    if (items[i]->type() == google_apis::ChangeResource::TEAM_DRIVE) {

[hashimoto, 2017/04/06 10:23:36]

I think Team Drive change can be also converted to ResourceEntry.
Can't we just let ConvertChangeResourceToResourceEntry convert ChangeResource to
ResourceEntry even when the type is TEAM_DRIVE?

[yamaguchi, 2017/04/07 03:57:43]

Changed to directly convert to ResourceEntry.
However, I am still having those separated from files because those are always 
direct descendants of the Team Drives directory.

+      if (ConvertChangeResourceToTeamDriveChange(
+              *items[i], &team_drives_[team_drives_index])) {
+        ++team_drives_index;
+      }
+    } else if (ConvertChangeResourceToResourceEntry(
+                   *items[i], &entries_[entries_index],
+                   &parent_resource_ids_[entries_index])) {
       ++entries_index;
     }
   }
   entries_.resize(entries_index);
+  team_drives_.resize(team_drives_index);
   parent_resource_ids_.resize(entries_index);
 }
 
 ChangeList::ChangeList(const google_apis::FileList& file_list)
     : next_url_(file_list.next_link()),
       largest_changestamp_(0) {
   const std::vector<std::unique_ptr<google_apis::FileResource>>& items =
       file_list.items();
   entries_.resize(items.size());
   parent_resource_ids_.resize(items.size());
@@ skipping 41 matching lines @@
 
     DVLOG(1) << "Root folder ID is " << about_resource->root_folder_id();
     DCHECK(!about_resource->root_folder_id().empty());
   }
 
   // Convert ChangeList to map.
   ChangeListToEntryMapUMAStats uma_stats;
   for (size_t i = 0; i < change_lists.size(); ++i) {
     ChangeList* change_list = change_lists[i].get();
 
+    const std::vector<TeamDriveChange>& team_drives =
+        change_list->team_drives();
+    for (size_t i = 0; i < team_drives.size(); ++i) {
+      ApplyTeamDriveChange(team_drives.at(i));
+    }
+
     std::vector<ResourceEntry>* entries = change_list->mutable_entries();
     for (size_t i = 0; i < entries->size(); ++i) {
       ResourceEntry* entry = &(*entries)[i];
 
       // Count the number of files.
       if (!entry->file_info().is_directory()) {
         uma_stats.IncrementNumFiles(
             entry->file_specific_info().is_hosted_document());
       }
       parent_resource_id_map_[entry->resource_id()] =
@@ skipping 27 matching lines @@
     return error;
   }
 
   // Shouldn't record histograms when processing delta update.
   if (!is_delta_update)
     uma_stats.UpdateFileCountUmaHistograms();
 
   return FILE_ERROR_OK;
 }
 
+FileError ChangeListProcessor::ApplyTeamDriveChange(
+    const TeamDriveChange& change) {
+  ResourceEntry entry;
+  FileError error =
+      resource_metadata_->GetResourceEntryById(change.id(), &entry);
+  if (error == FILE_ERROR_OK) {
+    return resource_metadata_->RefreshTeamDrive(change.id(), change.name());
+  }
+  if (error == FILE_ERROR_NOT_FOUND) {
+    return resource_metadata_->AddTeamDrive(change.id(), change.name());
+  }
+  return error;
+}
+
 FileError ChangeListProcessor::ApplyEntryMap(
     int64_t changestamp,
     std::unique_ptr<google_apis::AboutResource> about_resource) {
   DCHECK(about_resource);
 
   // Create the entry for "My Drive" directory with the latest changestamp.
   ResourceEntry root;
   FileError error = resource_metadata_->GetResourceEntryByPath(
       util::GetDriveMyDriveRootPath(), &root);
   if (error != FILE_ERROR_OK) {
@@ skipping 92 matching lines @@
         }
       }
       it = it_parent;
     }
 
     // Apply the parent first.
     std::reverse(entries.begin(), entries.end());
     for (size_t i = 0; i < entries.size(); ++i) {
       // Skip root entry in the change list. We don't expect servers to send
       // root entry, but we should better be defensive (see crbug.com/297259).
+      // TODO(yamaguchi): Apply this defensive logic to root directories of
+      // every Team Drive as well.
       ResourceEntryMap::iterator it = entries[i];
       if (it->first != root.resource_id()) {
         FileError error = ApplyEntry(it->second);
         if (error != FILE_ERROR_OK) {
           LOG(ERROR) << "ApplyEntry failed: " << FileErrorToString(error)
                      << ", title = " << it->second.title();
           return error;
         }
       }
       entry_map_.erase(it);
@@ skipping 20 matching lines @@
                  << ", resource_id = " << deleted_resource_ids[i];
       return error;
     }
   }
 
   return FILE_ERROR_OK;
 }
 
 FileError ChangeListProcessor::ApplyEntry(const ResourceEntry& entry) {
   DCHECK(!entry.deleted());
+  DCHECK(!entry.resource_id().empty());
   DCHECK(parent_resource_id_map_.count(entry.resource_id()));
   const std::string& parent_resource_id =
       parent_resource_id_map_[entry.resource_id()];
 
   ResourceEntry new_entry(entry);
   FileError error = SetParentLocalIdOfEntry(resource_metadata_, &new_entry,
                                             parent_resource_id);
   if (error != FILE_ERROR_OK)
     return error;
 
@@ skipping 130 matching lines @@
   if (!file_path.empty()) {
     FileChange::ChangeType type = entry.deleted()
                                       ? FileChange::CHANGE_TYPE_DELETE
                                       : FileChange::CHANGE_TYPE_ADD_OR_UPDATE;
     changed_files_->Update(file_path, entry, type);
   }
 }
 
 }  // namespace internal
 }  // namespace drive