Merge pull request #188 from matematikk-mooc/staging

Staging

.github/workflows/tests.yml

@@ -4,7 +4,7 @@ name: Test, build and deploy
 on:
   workflow_dispatch:
   push:
-    branches: 
+    branches:
     - staging
     - master
     - test
@@ -106,19 +106,19 @@ jobs:
           mysql --port=3307 --protocol=tcp --host=127.0.0.1 -uroot -proot -e 'CREATE DATABASE `canvas-api`;'
           DB_DATABASE=canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py makemigrations
           DB_DATABASE=canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py migrate
-          mysql --port=3307 --protocol=tcp --host=127.0.0.1 -uroot -proot -e 'CREATE DATABASE `test_canvas-api`;'
-          DB_DATABASE=test_canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py makemigrations
-          DB_DATABASE=test_canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py migrate
+      # mysql --port=3307 --protocol=tcp --host=127.0.0.1 -uroot -proot -e 'CREATE DATABASE `test_canvas-api`;'
+      # DB_DATABASE=test_canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py makemigrations
+      # DB_DATABASE=test_canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py migrate
 
-      - name: Seed statistics_api test database
-        run: |
-          git lfs fetch --all
-          git lfs pull
-          unzip $GITHUB_WORKSPACE/statistics_api/tests/data/test_canvas-api.zip -d /tmp/
-          mysql --port=3307 --protocol=tcp --host=127.0.0.1 -uroot -proot test_canvas-api < /tmp/test_canvas-api.sql 
+      # - name: Seed statistics_api test database
+      #   run: |
+      #     git lfs fetch --all
+      #     git lfs pull
+      #     unzip $GITHUB_WORKSPACE/statistics_api/tests/data/test_canvas-api.zip -d /tmp/
+      #     mysql --port=3307 --protocol=tcp --host=127.0.0.1 -uroot -proot test_canvas-api < /tmp/test_canvas-api.sql
       - name: Run Django unit tests
         run: |
-          DJANGO_DEBUG=True CANVAS_ACCESS_KEY=${{ secrets.CANVAS_ACCESS_KEY }} DJANGO_SETTINGS_MODULE=statistics_api.tests.test_settings DB_DATABASE=canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py test --keepdb --settings statistics_api.tests.test_settings --verbosity=3
+          DJANGO_DEBUG=True CANVAS_ACCESS_KEY=${{ secrets.CANVAS_ACCESS_KEY }} DJANGO_SETTINGS_MODULE=statistics_api.tests.test_settings DB_DATABASE=canvas-api DB_USERNAME=root DB_PASSWORD=root DB_PORT=3307 PYTHONPATH="${GITHUB_WORKSPACE}" python3 manage.py test --settings statistics_api.tests.test_settings --verbosity=3
 
       # Checking that only the issue is the SECURE_HSTS_SECONDS warning
       - name: Run manage.py check --deploy

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.10.4
+FROM python:3.12.2
 
 ########            SYSTEM          #########
 
@@ -14,7 +14,11 @@ RUN apt-get update &&  \
                         python3-venv \
                         libmariadb-dev \
                         gdal-bin \
-                        gosu
+                        gosu \
+                        python3-dev \
+                        default-libmysqlclient-dev \
+                        build-essential \
+                        pkg-config
 
 # Set virtual environment
 RUN /usr/bin/python3 -m venv /app/venv

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM python:3.10.4
+FROM python:3.12.2
 
 ########            SYSTEM          #########
 

requirements.txt

@@ -1,13 +1,13 @@
 django-cors-headers==3.5.0
-mysql-connector-python==8.0.20
-sqlalchemy==1.3.17
+mysql-connector-python==8.3.0
+sqlalchemy==2.0.27
 requests==2.31.0
-SQLAlchemy-Utils==0.36.6
+SQLAlchemy-Utils==0.41.1
 APScheduler==3.10.4
-mysqlclient==1.4.6
-django~=3.1
-gunicorn~=20.0.4
-arrow~=0.15.6
+django~=3.2
+gunicorn~=21.2.0
+mysqlclient==2.1.1
+arrow~=1.3.0
 python-graphql-client~=0.4.3
-djangorestframework>=3.13,<3.14
+djangorestframework>=3.14
 bugsnag

start_web_app.sh

@@ -3,11 +3,7 @@
 set -e
 source venv/bin/activate
 python manage.py migrate
-python manage.py remove_stale_contenttypes --include-stale-apps --noinput
 python manage.py import_school_teacher_counts_from_csv
 python manage.py import_county_teacher_counts_from_csv
-if [ "$PULL_MEMBER_COUNTS_FROM_CANVAS_ON_STARTUP" = "True" ]
-then
-  python manage.py pull_course_member_counts_from_canvas
-fi
+
 gunicorn --bind 0.0.0.0:"${WEBSITES_PORT}" --timeout "${GUNICORN_TIMEOUT}" statistics_api.wsgi:application --log-level "${GUNICORN_LOG_LEVEL}" --access-logfile - --error-logfile -

statistics_api/enrollment_activity/models.py

@@ -14,3 +14,6 @@ class EnrollmentActivity(models.Model):
     created_at = models.DateTimeField(
         auto_now_add=True,
         auto_now=False, )
+
+    class Meta():
+        app_label = 'enrollment_activity'

statistics_api/enrollment_activity/views.py

@@ -1,6 +1,7 @@
 from rest_framework import viewsets, serializers
 from rest_framework.response import Response
 from django.core.exceptions import ValidationError
+from rest_framework.decorators import action
 
 # Create your views here.
 from statistics_api.enrollment_activity.models import EnrollmentActivity
@@ -10,7 +11,6 @@ class EnrollmentActivityViewSet(viewsets.ViewSet):
     """
     A enrollment ViewSet for listing or retrieving enrollment activity.
     """
-
     def list(self, request):
         from_date = request.GET.get("from")
         to_date = request.GET.get("to")

statistics_api/history/models.py

@@ -15,3 +15,6 @@ class History(models.Model):
     asset_readable_category = models.CharField(max_length=255, null=True, blank=True)
     asset_name = models.CharField(max_length=512, null=True, blank=True)
     context_name = models.CharField(max_length=255, null=True, blank=True)
+
+    class Meta:
+        app_label = 'history'

statistics_api/history/views.py

@@ -22,7 +22,10 @@ def user_history_on_context(self, user_id: int, context_id: int):
     try:
         history_events = History.objects.all().filter(canvas_userid = user_id, context_id = context_id)
         statistics = activity_history(history_events)
-        return Response({"Result": statistics})
+        if(len(statistics) != 0):
+            return Response({"Result": statistics})
+        else:
+            raise ObjectDoesNotExist
     except ObjectDoesNotExist:
         return Response({"Error": f"No history found for user {user_id} in context {context_id}"}, status=404)
     except Exception as e:
@@ -33,7 +36,10 @@ def context_history(self, context_id: int):
     try:
         history_events = History.objects.all().filter(context_id = context_id)
         statistics = activity_history(history_events)
-        return Response({"Result": statistics})
+        if(len(statistics) != 0):
+            return Response({"Result": statistics})
+        else:
+            raise ObjectDoesNotExist
     except ObjectDoesNotExist:
         return Response({"Error": f"No history found for context {context_id}"}, status=404)
     except Exception as e:
@@ -44,7 +50,10 @@ def user_aggregated_history(self, user_id: int):
     try:
         history_events = History.objects.all().filter(canvas_userid = user_id)
         statistics = activity_history(history_events)
-        return Response({"Result": statistics})
+        if(len(statistics) != 0):
+            return Response({"Result": statistics})
+        else:
+            raise ObjectDoesNotExist
     except ObjectDoesNotExist:
         return Response({"Error": f"No history found for user {user_id}"}, status=404)
     except Exception as e:

statistics_api/settings.py

@@ -92,7 +92,8 @@
 ]
 
 WSGI_APPLICATION = 'statistics_api.wsgi.application'
-TEST_RUNNER = 'statistics_api.tests.override_test_runner.MyTestRunner'
+# TEST_RUNNER = 'statistics_api.tests.override_test_runner.MyTestRunner'
+# TEST_RUNNER = 'django.test.runner.DiscoverRunner'
 
 # Database
 # https://docs.djangoproject.com/en/1.11/ref/settings/#databases
@@ -107,7 +108,10 @@
         'OPTIONS': {
             'init_command': "SET sql_mode='STRICT_TRANS_TABLES'",
         },
-        'CONN_MAX_AGE': 7200
+        'CONN_MAX_AGE': 7200,
+        'TEST': {
+            'NAME': 'test_' + DB_DATABASE,
+        },
     },
 }