Tracking pull request to merge emergency release-1.9.0.1 to main (#272)

* update to 1.10.0 * Update to 1.9.0-1 * django-q-settings-and-mass-email (#271) * update to 1.10.0 * django-q-settings-and-mass-email Co-authored-by: Kuan Fan <[email protected]> Co-authored-by: tim738745 <[email protected]>
bcgov · Aug 24, 2022 · 8ae77b7 · 8ae77b7
1 parent 0fd0b8e
commit 8ae77b7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 3 deletions.
diff --git a/django/api/apps.py b/django/api/apps.py
@@ -16,13 +16,15 @@ def ready(self):
             schedule_get_ncda_redeemed_rebates,
             schedule_cancel_untouched_household_applications,
             schedule_expire_expired_applications,
+            schedule_send_mass_approval_email_once,
         )
 
         if settings.RUN_JOBS and "qcluster" in sys.argv:
             schedule_send_rebates_to_ncda()
             schedule_get_ncda_redeemed_rebates()
             schedule_cancel_untouched_household_applications()
             schedule_expire_expired_applications()
+            schedule_send_mass_approval_email_once()
 
 
 class ITVRAdminConfig(AdminConfig):

diff --git a/django/api/scheduled_jobs.py b/django/api/scheduled_jobs.py
@@ -52,3 +52,15 @@ def schedule_expire_expired_applications():
         )
     except IntegrityError:
         pass
+
+
+def schedule_send_mass_approval_email_once():
+    try:
+        schedule(
+            "api.tasks.send_mass_approval_email_once",
+            name="send_mass_approval_email_once",
+            schedule_type="O",
+            repeats=1,
+        )
+    except IntegrityError:
+        pass
diff --git a/django/api/settings.py b/django/api/settings.py
@@ -197,8 +197,8 @@
 Q_CLUSTER = {
     "name": "ITVR",
     "workers": 4,
-    "timeout": 90,
-    "retry": 120,
+    "timeout": 1200,
+    "retry": 1260,
     "queue_limit": 50,
     "bulk": 10,
     "orm": "default",

diff --git a/django/api/tasks.py b/django/api/tasks.py
@@ -444,3 +444,23 @@ def expire_expired_applications():
         status=GoElectricRebateApplication.Status.EXPIRED,
         modified=timezone.now(),
     )
+
+
+def send_mass_approval_email_once():
+    rebates = GoElectricRebate.objects.filter(ncda_id__isnull=False)
+    approved_applications = []
+    for rebate in rebates:
+        application = rebate.application
+        if application and (
+            application.status == GoElectricRebateApplication.Status.APPROVED
+        ):
+            application.rebate_amount = rebate.rebate_max_amount
+            approved_applications.append(application)
+
+    for application in approved_applications:
+        async_task(
+            "api.tasks.send_approve",
+            application.email,
+            application.id,
+            application.rebate_amount,
+        )
diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "1.9.0",
+  "version": "1.9.0-1",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^2.14.0",