👷 Resolve inconsistent repeat_records order.

dimagi · Jan 22, 2021 · b302830 · b302830
1 parent 406ff20
commit b302830
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/corehq/motech/repeaters/models.py b/corehq/motech/repeaters/models.py
@@ -219,8 +219,10 @@ def repeater(self):
 
     @property
     def repeat_records_ready(self):
-        return self.repeat_records.filter(state__in=(RECORD_PENDING_STATE,
-                                                     RECORD_FAILURE_STATE))
+        return (self.repeat_records
+                .order_by('registered_at')
+                .filter(state__in=(RECORD_PENDING_STATE,
+                                   RECORD_FAILURE_STATE)))
 
     @property
     def is_ready(self):

diff --git a/corehq/motech/repeaters/tests/test_tasks.py b/corehq/motech/repeaters/tests/test_tasks.py
@@ -93,7 +93,7 @@ def test_send_request_fails(self):
             process_repeater_stub(self.repeater_stub)
 
         # Only the first record was attempted, the rest are still pending
-        states = [r.state for r in self.repeater_stub.repeat_records.all()]
+        states = [r.state for r in self.repeater_stub.repeat_records_ready]
         self.assertListEqual(states, ([RECORD_FAILURE_STATE]
                                       + [RECORD_PENDING_STATE] * 9))