Merge pull request #402 from wikimediabrasil/fix-396

Show error commands instead of ignoring them

Author: arcstur

src/core/parsers/v1.py

@@ -129,7 +129,7 @@ def parse_statement(self, elements, first_command):
         llen = len(elements)
         if llen < 3:
             raise ParserException(
-                "STATEMENT must contain at least entity, property and value"
+                "Statement must contain at least entity, property and value"
             )
 
         if first_command[0] == "-":
@@ -189,7 +189,7 @@ def parse_statement(self, elements, first_command):
             # We are adding / removing values
             pproperty = elements[1]
             if not self.is_valid_property_id(pproperty):
-                raise ParserException(f"Invalid property {pproperty}")
+                raise ParserException(f"Invalid property '{pproperty}'")
 
             data = {
                 "action": action,
@@ -390,5 +390,4 @@ def restore_placeholders(command):
                 bc.status = BatchCommand.STATUS_ERROR
                 bc.message = e.message
 
-            if bc.json:
-                yield bc
+            yield bc

src/core/tests/test_batch.py

@@ -354,6 +354,21 @@ def test_remove_reference(self):
             ],
         )
 
+    def test_errors(self):
+        v1 = V1CommandParser()
+        batch = BatchFactory.load_from_parser(
+            v1, "b", "u", """CREATE||LAST|abc|123||xyz"""
+        )
+        cmd0 = batch.commands()[0]
+        cmd1 = batch.commands()[1]
+        cmd2 = batch.commands()[2]
+        self.assertEqual(len(batch.commands()), 3)
+        self.assertEqual(cmd0.status,BatchCommand.STATUS_INITIAL)
+        self.assertEqual(cmd1.status,BatchCommand.STATUS_ERROR)
+        self.assertEqual(cmd1.message, "Invalid property 'abc'")
+        self.assertEqual(cmd2.status,BatchCommand.STATUS_ERROR)
+        self.assertEqual(cmd2.message, "Statement must contain at least entity, property and value")
+
 
 class TestCSVBatch(TestCase):
     def test_create_property(self):

src/web/views/new_batch.py

@@ -188,11 +188,14 @@ def new_batch(request):
                 combine_commands="do_not_combine_commands" not in request.POST,
             )
 
+            all_errors = True
             for batch_command in parser.parse(batch_commands):
+                if batch_command.status != BatchCommand.STATUS_ERROR:
+                    all_errors = False
                 batch_command.batch = batch
                 batch_command.save()
 
-            if not batch.batchcommand_set.exists():
+            if not batch.batchcommand_set.exists() or all_errors:
                 raise ParserException(
                     pgettext_lazy(
                         "batch-py-valid-command-not-found",