From 442e136a4b4cf4496fbbe83a2d52dfd78476bf13 Mon Sep 17 00:00:00 2001
From: Patrick Smith <patrick+dds@promptworks.com>
Date: Tue, 18 Dec 2018 10:18:51 -0500
Subject: [PATCH] Don't return filename from upload

The uploader only needs to return the object_name of the uploaded
object. The filename is read directly from the input, so there's no need
to return it as well.
---
 atst/models/attachment.py       | 4 ++--
 atst/uploader.py                | 2 +-
 tests/models/test_attachment.py | 1 +
 tests/test_uploader.py          | 3 +--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/atst/models/attachment.py b/atst/models/attachment.py
index 89dfe7f8..30dee524 100644
--- a/atst/models/attachment.py
+++ b/atst/models/attachment.py
@@ -25,12 +25,12 @@ class Attachment(Base, mixins.TimestampsMixin):
     @classmethod
     def attach(cls, fyle, resource=None, resource_id=None):
         try:
-            filename, object_name = app.uploader.upload(fyle)
+            object_name = app.uploader.upload(fyle)
         except UploadError as e:
             raise AttachmentError("Could not add attachment. " + str(e))
 
         attachment = Attachment(
-            filename=filename,
+            filename=fyle.filename,
             object_name=object_name,
             resource=resource,
             resource_id=resource_id,
diff --git a/atst/uploader.py b/atst/uploader.py
index 03bc2460..5e44e2ee 100644
--- a/atst/uploader.py
+++ b/atst/uploader.py
@@ -35,7 +35,7 @@ class Uploader:
                 object_name=object_name,
                 extra={"acl": "private"},
             )
-        return (fyle.filename, object_name)
+        return object_name
 
     def download_stream(self, object_name):
         obj = self.container.get_object(object_name=object_name)
diff --git a/tests/models/test_attachment.py b/tests/models/test_attachment.py
index 00c54b88..5ddeda34 100644
--- a/tests/models/test_attachment.py
+++ b/tests/models/test_attachment.py
@@ -9,6 +9,7 @@ from tests.mocks import PDF_FILENAME
 def test_attach(pdf_upload):
     attachment = Attachment.attach(pdf_upload)
     assert attachment.filename == PDF_FILENAME
+    assert attachment.object_name is not None
 
 
 def test_attach_raises():
diff --git a/tests/test_uploader.py b/tests/test_uploader.py
index 131277f5..1e8b86ba 100644
--- a/tests/test_uploader.py
+++ b/tests/test_uploader.py
@@ -21,8 +21,7 @@ NONPDF_FILENAME = "tests/fixtures/disa-pki.html"
 
 
 def test_upload(uploader, upload_dir, pdf_upload):
-    filename, object_name = uploader.upload(pdf_upload)
-    assert filename == PDF_FILENAME
+    object_name = uploader.upload(pdf_upload)
     assert os.path.isfile(os.path.join(upload_dir, object_name))