use nested atomic transaction for reversion

Author: sheppard

.travis.yml

@@ -14,6 +14,7 @@ env:
    - DJANGO="django==1.8.18" WITH_WQDB="pip install wq.db==1.0.0rc1"
    - DJANGO="django==1.11.1"
    - DJANGO="django==1.11.1" WITH_WQDB="pip install wq.db==1.0.0rc1"
+   - DJANGO="django==1.11.1" WITH_WQDB="pip install wq.db==1.0.0rc1" WITH_REVERSION="pip install django-reversion"
    - DJANGO="django==1.11.1" LINT="pip install flake8"
 before_script:
  - createdb -Upostgres data_wizard_test
@@ -24,6 +25,7 @@ install:
  - pip install psycopg2
  - pip install .
  - $WITH_WQDB
+ - $WITH_REVERSION
  - $LINT
 script:
  - ./runtests.sh

data_wizard/tasks.py

@@ -5,6 +5,7 @@
 from .signals import import_complete, new_metadata
 from functools import wraps
 
+from django.db import transaction
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth import get_user_model
 
@@ -780,7 +781,8 @@ def import_row(run, row, instance_globals, matched):
     try:
         serializer = Serializer(data=parse_json_form(record))
         if serializer.is_valid():
-            obj = serializer.save()
+            with transaction.atomic():
+                obj = serializer.save()
             error = None
         else:
             obj = None

tests/data_app/wizard.py

@@ -9,6 +9,17 @@ class Meta:
         fields = "__all__"
 
 
+class IncompleteSerializer(serializers.ModelSerializer):
+    # Serializer will report is_valid(), but save will fail
+
+    date = serializers.CharField()  # Should be date field
+    color = serializers.CharField()   # Should limit length (and choices)
+
+    class Meta:
+        model = SimpleModel
+        fields = "__all__"
+
+
 class FKSerializer(serializers.ModelSerializer):
     class Meta:
         model = FKModel
@@ -48,6 +59,7 @@ class Meta:
 
 
 registry.register('Simple Model', SimpleSerializer)
+registry.register('Simple Model - Incomplete', IncompleteSerializer)
 registry.register('FK Model', FKSerializer)
 registry.register('FK Model By Name', SlugSerializer)
 registry.register('New Type + FK Model', NestedSerializer)

tests/test_simple_import.py

@@ -134,3 +134,44 @@ def check_data(self, run):
             ' Use one of these formats instead: YYYY[-MM[-DD]]."]}'
         ])
         self.assert_urls(run, 'simplemodels/%s')
+
+
+class IncompleteTestCase(BaseImportTestCase):
+    serializer_name = 'tests.data_app.wizard.IncompleteSerializer'
+
+    def test_incomplete_serializer(self):
+        # Initialize identifier before auto import
+        self.create_identifier('field notes', 'notes')
+
+        # Should succeed since field notes is already mapped
+        run = self.upload_file('simplemodel.csv')
+        self.auto_import(run, expect_input_required=False)
+
+        # Verify results
+        self.check_data(run)
+        self.assert_log(run, [
+            'created',
+            'auto_import',
+            'parse_columns',
+            'parse_row_identifiers',
+            'do_import',
+            'import_complete',
+        ])
+
+    def check_data(self, run):
+        self.assert_status(run, 3)
+        self.assert_ranges(run, [
+            "Data Column 'date -> date' at Rows 1-5, Column 0",
+            "Data Column 'color -> color' at Rows 1-5, Column 1",
+            "Data Column 'field notes -> notes' at Rows 1-5, Column 2",
+        ])
+        self.assert_records(run, [
+            "imported '2017-06-01: red (Test Note 1)' at row 1",
+            "imported '2017-06-02: green (Test Note 2)' at row 2",
+            "imported '2017-06-03: blue (Test Note 3)' at row 3",
+            "failed at row 4: DataError('value too long for type character"
+            " varying(5)\\n',)",
+            "failed at row 5: ValidationError([\"'2017-06-50' value has the"
+            " correct format (YYYY-MM-DD) but it is an invalid date.\"])"
+        ])
+        self.assert_urls(run, 'simplemodels/%s')