Merge branch 'master' into master

Pipfile

@@ -21,6 +21,9 @@ python-firebase = "*"
 sass = "*"
 django-sass-processor = "*"
 sendgrid = "*"
+redis = "*"
+rq = "*"
+apscheduler = "*"
 
 [requires]
 python_version = "3.6"

Procfile

@@ -1 +1,3 @@
 web: gunicorn gettingstarted.wsgi
+worker: python worker.py
+clock: python clock.py

README.md

@@ -39,6 +39,17 @@ For PostGreSQL
 
 **Note:** `locations` and `message` are the initial data for all the locations and messages.
 
+
+### 4. Setup Scheduled tasks
+
+In your Heroku project root:
+
+```
+heroku addons:create redistogo
+heroku scale worker=1
+heroku scale clock=1
+```
+
 # TBD Django Commands
 
 These commands can be incorporated to your cron / scheduled tasks.

clock.py

@@ -0,0 +1,20 @@
+# encoding=utf8
+
+from apscheduler.schedulers.blocking import BlockingScheduler
+from tasks import maintask
+
+from rq import Queue
+from worker import conn
+
+sched = BlockingScheduler()
+
+@sched.scheduled_job('interval', minutes=6)
+def timed_for_task():
+    q = Queue(connection=conn)
+    result = q.enqueue(maintask.run_pull_data, timeout=500)
+
+    time.sleep(180)
+
+    result2  = q.enqueue(maintask.run_send_confirmation, timeout=500)
+
+sched.start()

tasks/maintask.py

@@ -0,0 +1,10 @@
+# encoding=utf8
+from django.core.management import call_command
+
+def run_pull_data():
+    print('RUN] Running Scheduled work: Pull Data');
+    call_command('pull_data')
+
+def run_send_confirmation():
+    print('RUN] Running Scheduled work: Pull Data');
+    call_command('send_confirmation')

twilio_mgr/migrations/0023_auto_20180420_1633.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.0.3 on 2018-04-20 16:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('twilio_mgr', '0022_auto_20180412_2125'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='message',
+            name='message',
+            field=models.CharField(max_length=1000),
+        ),
+    ]

twilio_mgr/models.py

@@ -50,7 +50,7 @@ def __str__(self):
 
 
 class Message(models.Model):
-    message = models.CharField(max_length=400)
+    message = models.CharField(max_length=1000)
     keyword = models.CharField(max_length=100,unique=True)
 
 

worker.py

@@ -0,0 +1,16 @@
+# encoding=utf8
+import os
+
+import redis
+from rq import Worker, Queue, Connection
+
+listen = ['high', 'default', 'low']
+
+redis_url = os.getenv('REDISTOGO_URL', 'redis://localhost:6379')
+
+conn = redis.from_url(redis_url)
+
+if __name__ == '__main__':
+    with Connection(conn):
+        worker = Worker(map(Queue, listen))
+        worker.work()