Changed 'if' statement to avoid early return. Improved test.

pyeventsourcing · May 2, 2017 · f176f67 · f176f67
1 parent ac72fe7
commit f176f67
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/eventsourcing/infrastructure/cassandra/activerecords.py b/eventsourcing/infrastructure/cassandra/activerecords.py
@@ -10,21 +10,20 @@
 class CassandraActiveRecordStrategy(AbstractActiveRecordStrategy):
     def append(self, sequenced_item_or_items):
         if isinstance(sequenced_item_or_items, list):
-            if len(sequenced_item_or_items) == 0:
-                return
-            b = BatchQuery()
-            for i in sequenced_item_or_items:
-                assert isinstance(i, self.sequenced_item_class), (type(i), self.sequenced_item_class)
-                self.active_record_class.batch(b).if_not_exists().create(
-                    s=i.sequence_id,
-                    p=i.position,
-                    t=i.topic,
-                    d=i.data,
-                )
-            try:
-                b.execute()
-            except LWTException as e:
-                self.raise_sequenced_item_error(sequenced_item_or_items, e)
+            if len(sequenced_item_or_items):
+                b = BatchQuery()
+                for i in sequenced_item_or_items:
+                    assert isinstance(i, self.sequenced_item_class), (type(i), self.sequenced_item_class)
+                    self.active_record_class.batch(b).if_not_exists().create(
+                        s=i.sequence_id,
+                        p=i.position,
+                        t=i.topic,
+                        d=i.data,
+                    )
+                try:
+                    b.execute()
+                except LWTException as e:
+                    self.raise_sequenced_item_error(sequenced_item_or_items, e)
         else:
             active_record = self.to_active_record(sequenced_item_or_items)
             try:

diff --git a/eventsourcing/tests/sequenced_item_tests/base.py b/eventsourcing/tests/sequenced_item_tests/base.py
@@ -144,6 +144,11 @@ def test(self):
         retrieved_items = self.active_record_strategy.get_items(sequence_id1)
         self.assertEqual(len(retrieved_items), 1)
 
+        # Check adding an empty list does nothing.
+        self.active_record_strategy.append([])
+        retrieved_items = self.active_record_strategy.get_items(sequence_id1)
+        self.assertEqual(len(retrieved_items), 1)
+
         # Append a second and third item at the next positions.
         self.active_record_strategy.append([item4, item5])