Merge pull request #403 from wikimediabrasil/batch-title-in-edit-summary

batch title in edit summary

Author: arcstur

src/core/models.py

@@ -1463,10 +1463,9 @@ def edit_summary(self):
         summaries.extend([c.user_summary for c in getattr(self, "previous_commands", [])])
         combined = " | ".join([s for s in summaries[::-1] if bool(s)])
         editgroups = self.editgroups_summary()
-        if editgroups:
-            return f"{editgroups}: {combined}" if combined else editgroups
-        else:
-            return combined
+        title = str(self.batch.name)
+        summary_parts = [editgroups, title, combined]
+        return ": ".join([s for s in summary_parts if len(s) > 0])
 
     def editgroups_summary(self):
         """

src/core/tests/test_api.py

@@ -647,7 +647,7 @@ def test_api_body(self):
         batch_id = batch.id
         cmd = batch.commands()[0]
         comment = (
-            f"QuickStatements 3.0 [[:toollabs:qs-dev/batch/{batch_id}|batch #{batch_id}]]: hello"
+            f"QuickStatements 3.0 [[:toollabs:qs-dev/batch/{batch_id}|batch #{batch_id}]]: b: hello"
         )
         self.assertEqual(
             cmd.api_body(self.api_client),

src/core/tests/test_batch.py

@@ -271,6 +271,20 @@ def test_edit_summary_with_editgroups(self):
         )
         batch_id = batch.id
         cmd = BatchCommand.objects.get(batch=batch, index=0)
+        self.assertEqual(
+            cmd.edit_summary(),
+            f"QuickStatements 3.0 [[:toollabs:abcdef/batch/{batch_id}|batch #{batch_id}]]: b: my comment",
+        )
+        cmd = BatchCommand.objects.get(batch=batch, index=1)
+        self.assertEqual(
+            cmd.edit_summary(),
+            f"QuickStatements 3.0 [[:toollabs:abcdef/batch/{batch_id}|batch #{batch_id}]]: b",
+        )
+        batch = BatchFactory.load_from_parser(
+            v1, "", "u", "Q1|P1|Q2 /* my comment */||Q1|P1|Q3"
+        )
+        batch_id = batch.id
+        cmd = BatchCommand.objects.get(batch=batch, index=0)
         self.assertEqual(
             cmd.edit_summary(),
             f"QuickStatements 3.0 [[:toollabs:abcdef/batch/{batch_id}|batch #{batch_id}]]: my comment",
@@ -821,6 +835,18 @@ def test_edit_summary_with_editgroups(self):
         batch = BatchFactory.load_from_parser(par, "b", "u", COMMAND)
         batch_id = batch.id
         cmd = BatchCommand.objects.get(batch=batch, index=0)
+        self.assertEqual(
+            cmd.edit_summary(),
+            f"QuickStatements 3.0 [[:toollabs:abcdef/batch/{batch_id}|batch #{batch_id}]]: b: my comment",
+        )
+        cmd = BatchCommand.objects.get(batch=batch, index=1)
+        self.assertEqual(
+            cmd.edit_summary(),
+            f"QuickStatements 3.0 [[:toollabs:abcdef/batch/{batch_id}|batch #{batch_id}]]: b",
+        )
+        batch = BatchFactory.load_from_parser(par, "", "u", COMMAND)
+        batch_id = batch.id
+        cmd = BatchCommand.objects.get(batch=batch, index=0)
         self.assertEqual(
             cmd.edit_summary(),
             f"QuickStatements 3.0 [[:toollabs:abcdef/batch/{batch_id}|batch #{batch_id}]]: my comment",
@@ -838,11 +864,16 @@ def test_edit_summary_without_editgroups(self):
 Q4115189,Q5,
 """
         par = CSVCommandParser()
-        batch = BatchFactory.load_from_parser(par, "b", "u", COMMAND)
+        batch = BatchFactory.load_from_parser(par, "", "u", COMMAND)
         cmd = BatchCommand.objects.get(batch=batch, index=0)
         self.assertEqual(cmd.edit_summary(), "my comment")
         cmd = BatchCommand.objects.get(batch=batch, index=1)
         self.assertEqual(cmd.edit_summary(), "")
+        batch = BatchFactory.load_from_parser(par, "b", "u", COMMAND)
+        cmd = BatchCommand.objects.get(batch=batch, index=0)
+        self.assertEqual(cmd.edit_summary(), "b: my comment")
+        cmd = BatchCommand.objects.get(batch=batch, index=1)
+        self.assertEqual(cmd.edit_summary(), "b")
 
     def test_remove_statemeny_by_value(self):
         COMMAND = """qid,P31,-P31