resolved merge conflicts

Author: briancaffey

backend/.dockerignore

@@ -0,0 +1,6 @@
+data/*
+static/*
+backup.json
+media/*
+notebooks/*
+.pytest_cache/

backend/apps/accounts/urls.py

@@ -1,4 +1,4 @@
-from django.urls import include, path, re_path
+from django.urls import include, path
 
 from . import views
 

backend/apps/banking/tasks.py

@@ -3,16 +3,17 @@
 from io import StringIO
 
 import celery
-from celery.task import task
 
 from apps.banking.models import StatementFile, Transaction
 
+from backend.celery_app import app
+
 
 class BaseTask(celery.Task):
     pass
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def process_statement_file(self, statement_file_id):
 
     """

backend/apps/core/constants.py

@@ -2,7 +2,7 @@
 # https://developers.google.com/identity/protocols/OpenIDConnect
 
 OAUTH = {
-    "github": {"name": "github", "url": "https://github.com/login/oauth/access_token",},
+    "github": {"name": "github", "url": "https://github.com/login/oauth/access_token"},
     "google-oauth2": {
         "name": "google-oauth2",
         "url": "https://oauth2.googleapis.com/token",

backend/apps/core/management/commands/watch_celery_beat.py

@@ -3,6 +3,5 @@
 from . import consumers
 
 websocket_urlpatterns = [
-    url(r"^ws/ping-pong/$", consumers.CoreConsumer),
-    # url(r'^ws/chat/(?P<room_name>[^/]+)/$', consumers.CoreConsumer),
+    url(r"^ws/ping-pong/$", consumers.CoreConsumer.as_asgi(),),
 ]

backend/apps/core/management/commands/watch_daphne.py

@@ -1,30 +1,27 @@
 import time
 
 import celery
-from celery.decorators import periodic_task
-from celery.task import task
-from celery.task.schedules import crontab
 from django.core.mail import send_mail
 
+from backend.celery_app import app
+
 
 # http://docs.celeryproject.org/en/latest/userguide/tasks.html#task-inheritance
 class BaseTask(celery.Task):
     pass
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def debug_task(self):
     time.sleep(10)
 
 
-@periodic_task(
-    run_every=(crontab(minute="*/1")), name="debug_periodic_task", ignore_result=True,
-)
-def debug_periodic_task():
+@app.task(bind=True, base=BaseTask)
+def debug_periodic_task(self):
     print("Periodic task complete")
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def send_test_email_task(self):
     send_mail(
         "Email subject",
@@ -35,7 +32,7 @@ def send_test_email_task(self):
     )
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def sleep_task(self, seconds):
     time.sleep(int(seconds))
     return f"Slept {seconds} seconds"

backend/apps/core/routing.py

@@ -1,11 +1,13 @@
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
+from django.core.asgi import get_asgi_application
 
 import apps.core.routing
 
 application = ProtocolTypeRouter(
     {
         # Empty for now (http->django views is added by default)
+        "http": get_asgi_application(),
         "websocket": AuthMiddlewareStack(
             URLRouter(apps.core.routing.websocket_urlpatterns)
         ),

backend/apps/core/tasks.py

@@ -12,7 +12,7 @@
 
 import os
 
-from kombu import Queue
+from kombu import Exchange, Queue
 import redis
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -167,15 +167,30 @@
 
 # Channels
 
+CACHES = {
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": f"redis://{REDIS_SERVICE_HOST}:6379/4",
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
+        "KEY_PREFIX": "djangoredis",
+    }
+}
+
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
-        "CONFIG": {"hosts": [(REDIS_SERVICE_HOST, 6379)],},  # noqa
+        "CONFIG": {
+            "hosts": [(REDIS_SERVICE_HOST, 6379)],
+        },  # noqa
     },
 }
 
 REDIS = redis.Redis(
-    host=REDIS_SERVICE_HOST, port=6379, db=3, charset="utf-8", decode_responses=True,
+    host=REDIS_SERVICE_HOST,
+    port=6379,
+    db=3,
+    charset="utf-8",
+    decode_responses=True,
 )
 
 # REST FRAMEWORK
@@ -190,15 +205,41 @@
 }
 
 # Celery Configuration
+CELERY_QUEUE_DEFAULT = "default"
+CELERY_QUEUE_OTHER = "other"
+
+CELERY_BROKER_URL = f"redis://{REDIS_SERVICE_HOST}:6379/1"  # noqa
+CELERY_RESULT_BACKEND = f"redis://{REDIS_SERVICE_HOST}:6379/2"  # noqa
 CELERY_ACCEPT_CONTENT = ["application/json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
-CELERY_BROKER_URL = f"redis://{REDIS_SERVICE_HOST}:6379/1"  # noqa
-CELERY_RESULT_BACKEND = f"redis://{REDIS_SERVICE_HOST}:6379/2"  # noqa
 
 CELERY_QUEUE_DEFAULT = "default"
 
-CELERY_QUEUES = (Queue(CELERY_QUEUE_DEFAULT, routing_key="default"),)
+CELERY_QUEUES = (
+    Queue(
+        CELERY_QUEUE_DEFAULT,
+        Exchange(CELERY_QUEUE_DEFAULT),
+        routing_key=CELERY_QUEUE_DEFAULT,
+    ),
+    Queue(
+        CELERY_QUEUE_OTHER,
+        Exchange(CELERY_QUEUE_OTHER),
+        routing_key=CELERY_QUEUE_OTHER,
+    ),
+)
+
+CELERY_DEFAULT_EXCHANGE_TYPE = "direct"
+CELERY_TASK_DEFAULT_QUEUE = CELERY_QUEUE_DEFAULT
+CELERY_TASK_DEFAULT_EXCHANGE = CELERY_QUEUE_DEFAULT
+CELERY_TASK_DEFAULT_ROUTING_KEY = CELERY_QUEUE_DEFAULT
+
+CELERY_BEAT_SCHEDULE = {
+    "debug-periodic": {
+        "task": "apps.core.tasks.debug_periodic_task",
+        "schedule": 30,  # scrape suppliers once every 5 minutes
+    },
+}
 
 
 AUTH_USER_MODEL = "accounts.CustomUser"
@@ -210,7 +251,9 @@
     {
         "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",  # noqa
     },
-    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",},  # noqa
+    {
+        "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
+    },  # noqa
     {
         "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",  # noqa
     },