From e2924a3c7cb370d9886ccc2c906b1c64305344a5 Mon Sep 17 00:00:00 2001 From: Jaimyn Mayer Date: Thu, 28 Sep 2023 14:50:04 +1000 Subject: [PATCH] fixed bug with INDUCTION_COURSE_ID and added prometheus db engine --- memberportal/api_billing/views.py | 2 +- memberportal/membermatters/settings.py | 6 +++--- memberportal/requirements.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/memberportal/api_billing/views.py b/memberportal/api_billing/views.py index 96fa7bab..09dfc2ca 100644 --- a/memberportal/api_billing/views.py +++ b/memberportal/api_billing/views.py @@ -401,7 +401,7 @@ def post(self, request): score = ( canvas_api.get_student_score_for_course( - config.INDUCTION_COURSE_ID, request.user.email + config.CANVAS_INDUCTION_COURSE_ID, request.user.email ) or 0 ) diff --git a/memberportal/membermatters/settings.py b/memberportal/membermatters/settings.py index b540d006..6818dc13 100644 --- a/memberportal/membermatters/settings.py +++ b/memberportal/membermatters/settings.py @@ -142,7 +142,7 @@ if "MM_USE_POSTGRES" in os.environ: DATABASES = { "default": { - "ENGINE": "django.db.backends.postgresql", + "ENGINE": "django_prometheus.db.backends.postgresql", "NAME": os.environ.get("POSTGRES_DB", "membermatters"), "USER": os.environ.get("POSTGRES_USER", "membermatters"), "PASSWORD": os.environ.get("POSTGRES_PASSWORD", "membermatters"), @@ -158,7 +158,7 @@ database_config = json.loads(os.environ["MMDB_SECRET"]) DATABASES = { "default": { - "ENGINE": "django.db.backends.mysql", + "ENGINE": "django_prometheus.db.backends.mysql", "NAME": database_config.get("dbname"), "USER": database_config.get("username"), "PASSWORD": database_config.get("password"), @@ -169,7 +169,7 @@ else: DATABASES = { "default": { - "ENGINE": "django.db.backends.sqlite3", + "ENGINE": "django_prometheus.db.backends.sqlite3", "NAME": os.environ.get("MM_DB_LOCATION", "/usr/src/data/db.sqlite3"), } } diff --git a/memberportal/requirements.txt b/memberportal/requirements.txt index f338f88f..ff81a650 100644 --- a/memberportal/requirements.txt +++ b/memberportal/requirements.txt @@ -25,6 +25,6 @@ django-celery-results~=2.3.1 django-celery-beat~=2.2.1 redis~=4.3.1 twilio~=7.9.2 -django-prometheus==2.2.0 +django-prometheus==2.3.1 psycopg2-binary~=2.9.6 -django-oidc-provider~=0.8.0 +django-oidc-provider~=0.8.0 \ No newline at end of file