Merge branch 'nh/iter_repeaters_1' into autostaging

corehq/apps/reports/filters/select.py

@@ -144,6 +144,7 @@ def options(self):
             State.Pending,
             State.Cancelled,
             State.Fail,
+            State.InvalidPayload,
         ]]
 
 

corehq/apps/zapier/tests/test_zapier_forwarding.py

@@ -1,11 +1,13 @@
 import uuid
+from collections import namedtuple
 from datetime import datetime, timedelta
+from unittest.mock import patch
 
 from django.test import TestCase
 
 from casexml.apps.case.mock import CaseBlock
-from corehq.apps.hqcase.utils import submit_case_blocks
 
+from corehq.apps.hqcase.utils import submit_case_blocks
 from corehq.apps.zapier.consts import EventTypes
 from corehq.apps.zapier.models import ZapierSubscription
 from corehq.apps.zapier.tests.test_utils import bootrap_domain_for_zapier
@@ -15,19 +17,26 @@
 ZAPIER_CASE_TYPE = 'animal'
 
 
+ResponseMock = namedtuple('ResponseMock', ['status_code', 'reason'])
+
+
 class TestZapierCaseForwarding(TestCase):
 
     @classmethod
     def setUpClass(cls):
         super(TestZapierCaseForwarding, cls).setUpClass()
         cls.domain = DOMAIN
         cls.domain_object, cls.web_user, cls.api_key = bootrap_domain_for_zapier(cls.domain)
-
-    @classmethod
-    def tearDownClass(cls):
-        cls.web_user.delete(cls.domain, deleted_by=None)
-        cls.domain_object.delete()
-        super(TestZapierCaseForwarding, cls).tearDownClass()
+        cls.addClassCleanup(cls.domain_object.delete)
+        cls.addClassCleanup(cls.web_user.delete, cls.domain, deleted_by=None)
+
+        simple_request_patch = patch('corehq.motech.repeaters.models.simple_request')
+        simple_request_func = simple_request_patch.start()
+        simple_request_func.return_value = ResponseMock(
+            status_code=503,
+            reason='Service Unavailable',
+        )
+        cls.addClassCleanup(simple_request_patch.stop)
 
     def tearDown(self):
         ZapierSubscription.objects.all().delete()

corehq/motech/repeaters/const.py

@@ -13,6 +13,8 @@
 CHECK_REPEATERS_INTERVAL = timedelta(minutes=5)
 CHECK_REPEATERS_PARTITION_COUNT = settings.CHECK_REPEATERS_PARTITION_COUNT
 CHECK_REPEATERS_KEY = 'check-repeaters-key'
+PROCESS_REPEATERS_INTERVAL = timedelta(minutes=1)
+PROCESS_REPEATERS_KEY = 'process-repeaters-key'
 ENDPOINT_TIMER = 'endpoint_timer'
 # Number of attempts to an online endpoint before cancelling payload
 MAX_ATTEMPTS = 3
@@ -27,13 +29,15 @@ class State(IntegerChoices):
     Success = 4, _('Succeeded')
     Cancelled = 8, _('Cancelled')
     Empty = 16, _('Empty')  # There was nothing to send. Implies Success.
+    InvalidPayload = 32, _('Invalid Payload')  # Implies Cancelled.
 
 
 RECORD_PENDING_STATE = State.Pending
 RECORD_SUCCESS_STATE = State.Success
 RECORD_FAILURE_STATE = State.Fail
 RECORD_CANCELLED_STATE = State.Cancelled
 RECORD_EMPTY_STATE = State.Empty
+RECORD_INVALIDPAYLOAD_STATE = State.InvalidPayload
 
 
 class UCRRestrictionFFStatus(IntegerChoices):

corehq/motech/repeaters/migrations/0013_alter_repeatrecord_state_and_more.py

@@ -0,0 +1,40 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("repeaters", "0012_formexpressionrepeater_arcgisformexpressionrepeater"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="repeatrecord",
+            name="state",
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, "Pending"),
+                    (2, "Failed"),
+                    (4, "Succeeded"),
+                    (8, "Cancelled"),
+                    (16, "Empty"),
+                    (32, "Invalid Payload"),
+                ],
+                default=1,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="repeatrecordattempt",
+            name="state",
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, "Pending"),
+                    (2, "Failed"),
+                    (4, "Succeeded"),
+                    (8, "Cancelled"),
+                    (16, "Empty"),
+                    (32, "Invalid Payload"),
+                ]
+            ),
+        ),
+    ]

corehq/motech/repeaters/migrations/0014_repeater_max_workers.py

@@ -0,0 +1,16 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("repeaters", "0013_alter_repeatrecord_state_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="repeater",
+            name="max_workers",
+            field=models.IntegerField(default=0),
+        ),
+    ]

corehq/motech/repeaters/migrations/0015_alter_repeater_is_paused_and_more.py

@@ -0,0 +1,37 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("repeaters", "0014_repeater_max_workers"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="repeater",
+            name="is_paused",
+            field=models.BooleanField(db_index=True, default=False),
+        ),
+        migrations.AlterField(
+            model_name="repeater",
+            name="next_attempt_at",
+            field=models.DateTimeField(blank=True, db_index=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name="repeatrecord",
+            name="state",
+            field=models.PositiveSmallIntegerField(
+                choices=[
+                    (1, "Pending"),
+                    (2, "Failed"),
+                    (4, "Succeeded"),
+                    (8, "Cancelled"),
+                    (16, "Empty"),
+                    (32, "Invalid Payload"),
+                ],
+                db_index=True,
+                default=1,
+            ),
+        ),
+    ]