From ee83645814d26e8c28931017613924fd9cf7fe29 Mon Sep 17 00:00:00 2001
From: Jonas Incius <108419085+incjo@users.noreply.github.com>
Date: Wed, 19 Oct 2022 11:07:49 +0100
Subject: [PATCH] Support video upload time in Koofr video importer (#1171)

Co-authored-by: Ernest Sadykov <xkr@fb.com>
---
 .../transfer/koofr/videos/KoofrVideosImporter.java         | 7 ++++++-
 .../transfer/koofr/videos/KoofrVideosImporterTest.java     | 7 +++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/extensions/data-transfer/portability-data-transfer-koofr/src/main/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporter.java b/extensions/data-transfer/portability-data-transfer-koofr/src/main/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporter.java
index c4bea0b98..3d0c44ad9 100644
--- a/extensions/data-transfer/portability-data-transfer-koofr/src/main/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporter.java
+++ b/extensions/data-transfer/portability-data-transfer-koofr/src/main/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporter.java
@@ -141,7 +141,12 @@ private String importSingleVideo(
       }
 
       return koofrClient.uploadFile(
-              parentPath, name, inputStream, video.getEncodingFormat(), null, description);
+          parentPath,
+          name,
+          inputStream,
+          video.getEncodingFormat(),
+          video.getUploadedTime(),
+          description);
     } catch (FileNotFoundException e) {
       monitor.info(
               () -> String.format("Video resource was missing for id: %s", video.getDataId()), e);
diff --git a/extensions/data-transfer/portability-data-transfer-koofr/src/test/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporterTest.java b/extensions/data-transfer/portability-data-transfer-koofr/src/test/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporterTest.java
index 4a9107d42..a03ee6f1f 100644
--- a/extensions/data-transfer/portability-data-transfer-koofr/src/test/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporterTest.java
+++ b/extensions/data-transfer/portability-data-transfer-koofr/src/test/java/org/datatransferproject/transfer/koofr/videos/KoofrVideosImporterTest.java
@@ -1,6 +1,8 @@
 package org.datatransferproject.transfer.koofr.videos;
 
 import com.google.common.collect.ImmutableList;
+import java.time.Instant;
+import java.util.Date;
 import okhttp3.mockwebserver.MockResponse;
 import okhttp3.mockwebserver.MockWebServer;
 import org.datatransferproject.api.launcher.Monitor;
@@ -97,6 +99,7 @@ public void testImportItemFromURLWithAlbum() throws Exception {
             new VideoAlbum("id1", "Album 1", "This is a fake album"),
             new VideoAlbum("id2", "", description1001));
 
+    Date uploadedTime = Date.from(Instant.parse("2020-09-04T12:40:57.741Z"));
     Collection<VideoModel> videos =
         ImmutableList.of(
             new VideoModel(
@@ -107,7 +110,7 @@ public void testImportItemFromURLWithAlbum() throws Exception {
                 "video1",
                 "id1",
                 false,
-                null),
+                uploadedTime),
             new VideoModel(
                 "video2.mp4",
                 server.url("/2.mp4").toString(),
@@ -146,7 +149,7 @@ public void testImportItemFromURLWithAlbum() throws Exception {
             eq("video1.mp4"),
             any(),
             eq("video/mp4"),
-            isNull(),
+            eq(uploadedTime),
             eq("A video 1"));
     clientInOrder.verify(client).fileExists(eq("/root/Album 1/video2.mp4"));
     clientInOrder.verify(client).fileExists(eq("/root/Album/video3.mp4"));