fix: include timestamp in DriveImporter root folder (#1309)

dtinit · Dec 8, 2023 · 2cffbf2 · 2cffbf2
1 parent 8a14321
commit 2cffbf2
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/...google/src/main/java/org/datatransferproject/datatransfer/google/drive/DriveImporter.java b/...google/src/main/java/org/datatransferproject/datatransfer/google/drive/DriveImporter.java
@@ -12,6 +12,8 @@
 import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.UUID;
 import org.datatransferproject.api.launcher.Monitor;
 import org.datatransferproject.datatransfer.google.common.GoogleCredentialFactory;
@@ -30,6 +32,7 @@
 public final class DriveImporter
     implements Importer<TokensAndUrlAuthData, BlobbyStorageContainerResource> {
   private static final String ROOT_FOLDER_ID = "root-id";
+  private static final String ROOT_FOLDER_FORMAT_STRING = "transfer-%s";
 
   private final GoogleCredentialFactory credentialFactory;
   private final TemporaryPerJobDataStore jobStore;
@@ -63,7 +66,7 @@ public ImportResult importItem(
           idempotentExecutor.executeOrThrowException(
               ROOT_FOLDER_ID,
               data.getName(),
-              () -> importSingleFolder(driveInterface, "MigratedContent", null));
+              () -> importSingleFolder(driveInterface, getRootFolderName(), null));
     } else {
       parentId = idempotentExecutor.getCachedValue(data.getId());
     }
@@ -153,4 +156,11 @@ private synchronized Drive getDriveInterface(TokensAndUrlAuthData authData) {
 
     return driveInterface;
   }
+
+  private String getRootFolderName() {
+    // TODO(alexeyqu): use PortabilityJob.createdTimestamp here for consistency
+    return String.format(
+            ROOT_FOLDER_FORMAT_STRING,
+            new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date()));
+  }
 }