#6 fix: nested files

Author: remigermain

nested_multipart_parser/drf.py

@@ -30,7 +30,10 @@ class DrfNestedParser(MultiPartParser):
     def parse(self, stream, media_type=None, parser_context=None):
         clsDataAndFile = super().parse(stream, media_type, parser_context)
 
-        parser = NestedParser(clsDataAndFile.data.dict())
+        data = clsDataAndFile.data.dict()
+        data.update(clsDataAndFile.files.dict()) # add files to data
+
+        parser = NestedParser(data)
         if parser.is_valid():
-            return DataAndFiles(parser.validate_data, clsDataAndFile.files)
+            return parser.validate_data
         raise ParseError(parser.errors)

setup.py

@@ -5,10 +5,7 @@
 import sys
 import subprocess
 
-
-# tags = subprocess.check_output("git tag -l | cat", shell=True).decode("utf-8")
-# version = list(filter(None, tags.split("\n")))[-1]
-version = "v1.3.1"
+version = "1.4.0"
 
 if sys.argv[-1] == 'publish':
     if os.system("pip freeze | grep twine"):

tests/test_drf.py

@@ -10,7 +10,7 @@
 from nested_multipart_parser.drf import DrfNestedParser, NestedParser  # noqa: E402
 from rest_framework.request import Request  # noqa: E402
 from rest_framework.exceptions import ParseError  # noqa: E402
-
+from django.core.files.uploadedfile import SimpleUploadedFile, InMemoryUploadedFile
 
 def toQueryDict(data):
     q = QueryDict(mutable=True)
@@ -212,3 +212,48 @@ def test_views_options_mixed_valid(self):
         }
 
         self.assertEqual(results.data, toQueryDict(expected))
+
+    def test_nested_files(self):
+        file =  SimpleUploadedFile("file.png", b"file_content", content_type="image/png")
+        file1 = SimpleUploadedFile("file.pdf", b"file_content", content_type="application/pdf")
+
+        data = {
+            "file": file,
+            "title": "title",
+            'files[0].description': 'description',
+            'files[1].file': file1,
+            'files[1].description': 'description2',
+        }
+        results = self.parser_boundary(data)
+
+        # files is not in
+        expected = {
+            "file": file,
+            "title": "title",
+            "files": [
+                {
+                    "description": "description",
+                },
+                {
+                    "file": file1,
+                    "description": "description2",
+                }
+            ],
+        }
+        data = results.data.dict()
+        self.assertEqual(len(data), 3)
+
+        self.assertIsInstance(data["file"], InMemoryUploadedFile)
+        self.assertEqual(data["title"], expected["title"])
+
+        self.assertEqual(len(data["files"]), 2)
+        self.assertIsInstance(data["files"], list)
+
+        self.assertIsInstance(data["files"][0], dict)
+        self.assertEqual(len(data["files"][0]), 1)
+        self.assertEqual(data["files"][0]["description"], "description")
+
+        self.assertIsInstance(data["files"][1], dict)
+        self.assertEqual(len(data["files"][1]), 2)
+        self.assertEqual(data["files"][1]["description"], "description2")
+        self.assertIsInstance(data["files"][1]["file"], InMemoryUploadedFile)