Refactor: CSR Architecture - Phase 4

.cursor/rules/AGENTS.md

@@ -0,0 +1,30 @@
+# ModelGrader Backend Project Rules
+
+## Virtual Environment
+- ALWAYS activate the virtual environment before running any Python scripts
+- Use `source env/bin/activate` to activate the environment
+- All Python commands should be run with the activated environment
+
+## Python Scripts
+- When running Django management commands, ensure the environment is activated first
+- For testing: `source env/bin/activate && python manage.py test [test_path]`
+- For running the server: `source env/bin/activate && python manage.py runserver`
+- For migrations: `source env/bin/activate && python manage.py migrate`
+
+## Test Execution
+- Always activate environment before running tests
+- Use the project's test runner: `source env/bin/activate && python run_all_tests.py`
+- Individual test files: `source env/bin/activate && python manage.py test [test_path]`
+
+## Project Structure
+- This is a Django REST Framework project
+- Main application is in the `api/` directory
+- Services are in `api/services/`
+- Tests are in `api/services/*/test_*.py`
+- Configuration files: `manage.py`, `requirements.txt`, `Dockerfile`
+
+## Dependencies
+- Django REST Framework
+- PostgreSQL (production)
+- SQLite (development/testing)
+- Various Python packages listed in `requirements.txt`

.cursor/rules/active-python-env.mdc

@@ -0,0 +1,30 @@
+---
+description: Active Python Environment for ModelGrader Backend
+globs:
+alwaysApply: true
+---
+
+# Virtual Environment Activation Rules
+
+## Always Activate Virtual Environment
+- ALWAYS activate the virtual environment before running any Python scripts
+- Use `source env/bin/activate` to activate the environment
+- All Python commands should be run with the activated environment
+
+## Django Management Commands
+- When running Django management commands, ensure the environment is activated first
+- For testing: `source env/bin/activate && python manage.py test [test_path]`
+- For running the server: `source env/bin/activate && python manage.py runserver`
+- For migrations: `source env/bin/activate && python manage.py migrate`
+
+## Test Execution
+- Always activate environment before running tests
+- Use the project's test runner: `source env/bin/activate && python run_all_tests.py`
+- Individual test files: `source env/bin/activate && python manage.py test [test_path]`
+
+## Project Context
+- This is a Django REST Framework project
+- Main application is in the `api/` directory
+- Services are in `api/services/`
+- Tests are in `api/services/*/test_*.py`
+- Configuration files: `manage.py`, `requirements.txt`, `Dockerfile`

.github/workflows/run-tests.yml

@@ -0,0 +1,78 @@
+name: Run Tests on PR
+
+on:
+  pull_request:
+    branches: [ "*" ]
+  push:
+    branches: [ main, dev ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Cache pip dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+
+    - name: Set up environment variables
+      run: |
+        echo "PORT=8000" >> $GITHUB_ENV
+        echo "FRONTEND_URL=http://localhost:3000" >> $GITHUB_ENV
+        echo "TOKEN_LIFETIME_SECOND=3600" >> $GITHUB_ENV
+        echo "DATABASE_NAME=test_db.sqlite3" >> $GITHUB_ENV
+        echo "DATABASE_USER=test_user" >> $GITHUB_ENV
+        echo "DATABASE_PASSWORD=test_password" >> $GITHUB_ENV
+        echo "DATABASE_HOST=localhost" >> $GITHUB_ENV
+        echo "DATABASE_PORT=5432" >> $GITHUB_ENV
+        echo "SECRET_KEY=test-secret-key-for-github-actions" >> $GITHUB_ENV
+        echo "DEBUG=True" >> $GITHUB_ENV
+
+    - name: Run all tests
+      run: |
+        python run_all_tests.py --verbose
+
+    - name: Run tests with coverage
+      run: |
+        pip install coverage
+        python run_all_tests.py --coverage --verbose
+
+    - name: Test individual services
+      run: |
+        echo "Testing Account Service..."
+        python run_all_tests.py --services account --verbose
+
+        echo "Testing Problem Service..."
+        python run_all_tests.py --services problem --verbose
+
+        echo "Testing Auth Service..."
+        python run_all_tests.py --services auth --verbose
+
+        echo "Testing Collection Service..."
+        python run_all_tests.py --services collection --verbose
+
+        echo "Testing Group Service..."
+        python run_all_tests.py --services group --verbose
+
+        echo "Testing Submission Service..."
+        python run_all_tests.py --services submission --verbose
+
+        echo "Testing Topic Service..."
+        python run_all_tests.py --services topic --verbose

.github/workflows/simple-test.yml

@@ -0,0 +1,42 @@
+name: Simple Test Runner
+
+on:
+  pull_request:
+    branches: [ "*" ]
+  push:
+    branches: [ main, dev ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python 3.11
+      uses: actions/setup-python@v4
+      with:
+        python-version: '3.11'
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+
+    - name: Set up environment variables
+      run: |
+        echo "PORT=8000" >> $GITHUB_ENV
+        echo "FRONTEND_URL=http://localhost:3000" >> $GITHUB_ENV
+        echo "TOKEN_LIFETIME_SECOND=3600" >> $GITHUB_ENV
+        echo "DATABASE_NAME=test_db.sqlite3" >> $GITHUB_ENV
+        echo "DATABASE_USER=test_user" >> $GITHUB_ENV
+        echo "DATABASE_PASSWORD=test_password" >> $GITHUB_ENV
+        echo "DATABASE_HOST=localhost" >> $GITHUB_ENV
+        echo "DATABASE_PORT=5432" >> $GITHUB_ENV
+        echo "SECRET_KEY=test-secret-key-for-github-actions" >> $GITHUB_ENV
+        echo "DEBUG=True" >> $GITHUB_ENV
+
+    - name: Run tests
+      run: |
+        python run_all_tests.py --verbose

.github/workflows/test.yml

@@ -0,0 +1,66 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches: [ "*" ]
+  push:
+    branches: [ main, dev ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        python-version: [3.11]
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v4
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Cache pip dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/pip
+        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements.txt') }}
+        restore-keys: |
+          ${{ runner.os }}-pip-
+
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+
+    - name: Set up environment variables
+      run: |
+        echo "PORT=8000" >> $GITHUB_ENV
+        echo "FRONTEND_URL=http://localhost:3000" >> $GITHUB_ENV
+        echo "TOKEN_LIFETIME_SECOND=3600" >> $GITHUB_ENV
+        echo "DATABASE_NAME=test_db.sqlite3" >> $GITHUB_ENV
+        echo "DATABASE_USER=test_user" >> $GITHUB_ENV
+        echo "DATABASE_PASSWORD=test_password" >> $GITHUB_ENV
+        echo "DATABASE_HOST=localhost" >> $GITHUB_ENV
+        echo "DATABASE_PORT=5432" >> $GITHUB_ENV
+        echo "SECRET_KEY=test-secret-key-for-github-actions" >> $GITHUB_ENV
+        echo "DEBUG=True" >> $GITHUB_ENV
+
+    - name: Run tests
+      run: |
+        python run_all_tests.py --verbose
+
+    - name: Run tests with coverage
+      run: |
+        pip install coverage
+        python run_all_tests.py --coverage --verbose
+
+    - name: Upload coverage reports
+      uses: codecov/codecov-action@v3
+      if: matrix.python-version == '3.11'
+      with:
+        file: ./coverage.xml
+        fail_ci_if_error: false

Backend/settings.py

@@ -102,24 +102,24 @@
 # Database
 # https://docs.djangoproject.com/en/4.1/ref/settings/#databases
 
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': config('DATABASE_NAME'),
-        'USER': config('DATABASE_USER'),
-        'PASSWORD': config('DATABASE_PASSWORD'),
-        'HOST': config('DATABASE_HOST'),
-        'PORT': config('DATABASE_PORT'),
-    }
-}
-
 # DATABASES = {
 #     'default': {
-#         'ENGINE': 'django.db.backends.sqlite3',
-#         'NAME': BASE_DIR / 'ModelGrader.sqlite3',
+#         'ENGINE': 'django.db.backends.mysql',
+#         'NAME': config('DATABASE_NAME'),
+#         'USER': config('DATABASE_USER'),
+#         'PASSWORD': config('DATABASE_PASSWORD'),
+#         'HOST': config('DATABASE_HOST'),
+#         'PORT': config('DATABASE_PORT'),
 #     }
 # }
 
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': BASE_DIR / 'ModelGrader.sqlite3',
+    }
+}
+
 # Password validation
 # https://docs.djangoproject.com/en/4.1/ref/settings/#auth-password-validators