From 9490b74f36f23c5fa77b1c122ea39856184dc95e Mon Sep 17 00:00:00 2001
From: Hironsan <light.tree.1.13@gmail.com>
Date: Tue, 12 Apr 2022 08:30:22 +0900
Subject: [PATCH] Use upload_name as an export file name

---
 backend/data_export/pipeline/repositories.py   |  6 ++----
 backend/data_export/tests/test_repositories.py | 12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/backend/data_export/pipeline/repositories.py b/backend/data_export/pipeline/repositories.py
index 9734b193..f1f881d3 100644
--- a/backend/data_export/pipeline/repositories.py
+++ b/backend/data_export/pipeline/repositories.py
@@ -31,7 +31,7 @@ class FileRepository(BaseRepository):
             for user, label in label_per_user.items():
                 yield Record(
                     data_id=example.id,
-                    data=str(example.filename).split("/")[-1],
+                    data=example.upload_name,
                     label=label,
                     user=user,
                     metadata=example.meta,
@@ -43,9 +43,7 @@ class FileRepository(BaseRepository):
             # with the user who approved the doc.
             # This means I will allow each user to be able to approve the doc.
             if len(label_per_user) == 0:
-                yield Record(
-                    data_id=example.id, data=str(example.filename).split("/")[-1], label=[], user="unknown", metadata={}
-                )
+                yield Record(data_id=example.id, data=example.upload_name, label=[], user="unknown", metadata={})
 
     def label_per_user(self, example) -> Dict:
         label_per_user = defaultdict(list)
diff --git a/backend/data_export/tests/test_repositories.py b/backend/data_export/tests/test_repositories.py
index 410089af..491ec890 100644
--- a/backend/data_export/tests/test_repositories.py
+++ b/backend/data_export/tests/test_repositories.py
@@ -279,12 +279,12 @@ class TestSpeech2TextRepository(TestRepository):
         self.prepare_data(project)
         expected = [
             {
-                "data": self.example.filename,
+                "data": self.example.upload_name,
                 "label": [self.text1.text],
                 "user": project.admin.username,
             },
             {
-                "data": self.example.filename,
+                "data": self.example.upload_name,
                 "label": [self.text2.text],
                 "user": project.annotator.username,
             },
@@ -297,7 +297,7 @@ class TestSpeech2TextRepository(TestRepository):
         self.prepare_data(project)
         expected = [
             {
-                "data": self.example.filename,
+                "data": self.example.upload_name,
                 "label": [self.text1.text, self.text2.text],
                 "user": "all",
             }
@@ -317,12 +317,12 @@ class TestFileRepository(TestRepository):
         self.prepare_data(project)
         expected = [
             {
-                "data": self.example.filename,
+                "data": self.example.upload_name,
                 "label": [self.category1.label.text],
                 "user": project.admin.username,
             },
             {
-                "data": self.example.filename,
+                "data": self.example.upload_name,
                 "label": [self.category2.label.text],
                 "user": project.annotator.username,
             },
@@ -335,7 +335,7 @@ class TestFileRepository(TestRepository):
         self.prepare_data(project)
         expected = [
             {
-                "data": self.example.filename,
+                "data": self.example.upload_name,
                 "label": [self.category1.label.text, self.category2.label.text],
                 "user": "all",
             }