diff --git a/app.json b/app.json
index 3b7526f66..7be017ad5 100644
--- a/app.json
+++ b/app.json
@@ -409,10 +409,6 @@
"description": "The SL tracking ID",
"required": false
},
- "STATUS_TOKEN": {
- "description": "Token to access the status API.",
- "required": true
- },
"USE_X_FORWARDED_HOST": {
"description": "Set HOST header to original domain accessed by user",
"required": false
diff --git a/applications/__init__.py b/applications/__init__.py
index 891b6e15d..cd1e1174f 100644
--- a/applications/__init__.py
+++ b/applications/__init__.py
@@ -1,3 +1 @@
"""Initialize applications app"""
-
-default_app_config = "applications.apps.ApplicationConfig"
diff --git a/applications/admin.py b/applications/admin.py
index d86a62916..5e24c7612 100644
--- a/applications/admin.py
+++ b/applications/admin.py
@@ -10,30 +10,42 @@
from django.utils.safestring import mark_safe
from mitol.common.admin import TimestampedModelAdmin
-from applications import models
+from applications.models import (
+ ApplicationStep,
+ ApplicationStepSubmission,
+ BootcampRunApplicationStep,
+ BootcampApplication,
+ VideoInterviewSubmission,
+ QuizSubmission,
+ ApplicantLetter,
+ Interview,
+)
from ecommerce.models import Order
from main.utils import get_field_names
+@admin.register(ApplicationStep)
class ApplicationStepAdmin(admin.ModelAdmin):
"""Admin for ApplicationStep"""
- model = models.ApplicationStep
+ model = ApplicationStep
list_display = ("id", "get_bootcamp_title", "submission_type", "step_order")
ordering = ("bootcamp", "step_order")
+ @admin.display(
+ description="Bootcamp",
+ ordering="bootcamp__title",
+ )
def get_bootcamp_title(self, obj):
"""Returns the bootcamp title"""
return obj.bootcamp.title
- get_bootcamp_title.short_description = "Bootcamp"
- get_bootcamp_title.admin_order_field = "bootcamp__title"
-
+@admin.register(BootcampRunApplicationStep)
class BootcampRunApplicationStepAdmin(admin.ModelAdmin):
"""Admin for BootcampRunApplicationStep"""
- model = models.BootcampRunApplicationStep
+ model = BootcampRunApplicationStep
list_display = (
"id",
"get_run_display_title",
@@ -53,27 +65,30 @@ def get_queryset(self, request):
"""Overrides base queryset"""
return super().get_queryset(request).select_related("bootcamp_run__bootcamp")
+ @admin.display(
+ description="Bootcamp Run",
+ ordering="bootcamp_run__title",
+ )
def get_run_display_title(self, obj):
"""Returns the bootcamp run display title"""
return obj.bootcamp_run.display_title
- get_run_display_title.short_description = "Bootcamp Run"
- get_run_display_title.admin_order_field = "bootcamp_run__title"
-
+ @admin.display(
+ description="Submission Type",
+ ordering="application_step__submission_type",
+ )
def get_submission_type(self, obj):
"""Returns the application step submission type"""
return obj.application_step.submission_type
- get_submission_type.short_description = "Submission Type"
- get_submission_type.admin_order_field = "application_step__submission_type"
-
+ @admin.display(
+ description="Step Order",
+ ordering="application_step__step_order",
+ )
def get_step_order(self, obj):
"""Returns the application step order"""
return obj.application_step.step_order
- get_step_order.short_description = "Step Order"
- get_step_order.admin_order_field = "application_step__step_order"
-
class OrderInline(admin.StackedInline):
"""Inline form for Order"""
@@ -90,10 +105,11 @@ def has_add_permission(self, request, obj=None):
return False
+@admin.register(BootcampApplication)
class BootcampApplicationAdmin(TimestampedModelAdmin):
"""Admin for BootcampApplication"""
- model = models.BootcampApplication
+ model = BootcampApplication
include_timestamps_in_list = True
inlines = [OrderInline]
list_display = ("id", "get_user_email", "get_run_display_title", "state")
@@ -114,25 +130,27 @@ def get_queryset(self, request):
.select_related("user", "bootcamp_run__bootcamp")
)
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
+ @admin.display(
+ description="Bootcamp Run",
+ ordering="bootcamp_run__title",
+ )
def get_run_display_title(self, obj):
"""Returns the bootcamp run display title"""
return obj.bootcamp_run.display_title
- get_run_display_title.short_description = "Bootcamp Run"
- get_run_display_title.admin_order_field = "bootcamp_run__title"
-
class AppStepSubmissionInline(GenericTabularInline):
"""Admin class for ApplicationStepSubmission"""
- model = models.ApplicationStepSubmission
+ model = ApplicationStepSubmission
max_num = 1
raw_id_fields = ("bootcamp_application", "run_application_step")
@@ -170,6 +188,10 @@ def get_queryset(self, request):
)
)
+ @admin.display(
+ description="Application User",
+ ordering="app_step_submission__bootcamp_application__user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
app_step_submissions = obj.app_step_submissions.all()
@@ -179,11 +201,10 @@ def get_user_email(self, obj):
else app_step_submissions[0].bootcamp_application.user.email
)
- get_user_email.short_description = "Application User"
- get_user_email.admin_order_field = (
- "app_step_submission__bootcamp_application__user__email"
+ @admin.display(
+ description="App Bootcamp Run",
+ ordering="app_step_submission__bootcamp_application__bootcamp_run__title",
)
-
def get_run_display_title(self, obj):
"""Returns the bootcamp run display title"""
app_step_submissions = obj.app_step_submissions.all()
@@ -193,11 +214,7 @@ def get_run_display_title(self, obj):
else app_step_submissions[0].bootcamp_application.bootcamp_run.display_title
)
- get_run_display_title.short_description = "App Bootcamp Run"
- get_run_display_title.admin_order_field = (
- "app_step_submission__bootcamp_application__bootcamp_run__title"
- )
-
+ @admin.display(description="Submission")
def app_step_submission_link(self, obj):
"""Returns a link to the related bootcamp application"""
app_step_submissions = obj.app_step_submissions.all()
@@ -208,7 +225,7 @@ def app_step_submission_link(self, obj):
'Submission ({})'.format(
reverse(
"admin:applications_{}_change".format(
- models.ApplicationStepSubmission._meta.model_name
+ ApplicationStepSubmission._meta.model_name
),
args=(app_step_submission.id,),
), # pylint: disable=protected-access
@@ -216,19 +233,19 @@ def app_step_submission_link(self, obj):
)
)
- app_step_submission_link.short_description = "Submission"
-
+@admin.register(VideoInterviewSubmission)
class VideoInterviewSubmissionAdmin(SubmissionTypeAdmin):
"""Admin class for VideoInterviewSubmission"""
- model = models.VideoInterviewSubmission
+ model = VideoInterviewSubmission
raw_id_fields = ("interview",)
def get_list_display(self, request):
return tuple(super().get_list_display(request) or ()) + ("interview_link",)
+ @admin.display(description="Interview")
def interview_link(self, obj):
"""Returns a link to the related interview record"""
if not hasattr(obj, "interview") or obj.interview is None:
@@ -236,20 +253,19 @@ def interview_link(self, obj):
return mark_safe(
'Interview ({})'.format(
reverse(
- "admin:jobma_{}_change".format(models.Interview._meta.model_name),
+ "admin:jobma_{}_change".format(Interview._meta.model_name),
args=(obj.interview.id,),
), # pylint: disable=protected-access
obj.interview.id,
)
)
- interview_link.short_description = "Interview"
-
+@admin.register(QuizSubmission)
class QuizSubmissionAdmin(SubmissionTypeAdmin):
"""Admin for QuizSubmission"""
- model = models.QuizSubmission
+ model = QuizSubmission
def get_list_display(self, request):
return tuple(super().get_list_display(request) or ()) + ("started_date",)
@@ -272,10 +288,11 @@ def clean_object_id(self):
return object_id
+@admin.register(ApplicationStepSubmission)
class ApplicationStepSubmissionAdmin(TimestampedModelAdmin):
"""Admin for ApplicationStepSubmission"""
- model = models.ApplicationStepSubmission
+ model = ApplicationStepSubmission
form = ApplicationStepSubmissionForm
list_display = (
"id",
@@ -313,6 +330,7 @@ def get_readonly_fields(self, request, obj=None):
return tuple(self.readonly_fields or ()) + ("content_type", "object_id")
return self.readonly_fields
+ @admin.display(description="submission object")
def submission_content_obj_link(self, obj):
"""Returns a link to the content object"""
if obj.content_object is None:
@@ -329,27 +347,28 @@ def submission_content_obj_link(self, obj):
)
)
- submission_content_obj_link.short_description = "submission object"
-
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.bootcamp_application.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
+ @admin.display(
+ description="Bootcamp Run",
+ ordering="bootcamp_run__title",
+ )
def get_run_display_title(self, obj):
"""Returns the bootcamp run display title"""
return obj.bootcamp_application.bootcamp_run.display_title
- get_run_display_title.short_description = "Bootcamp Run"
- get_run_display_title.admin_order_field = "bootcamp_run__title"
-
+@admin.register(ApplicantLetter)
class ApplicantLetterAdmin(TimestampedModelAdmin):
"""Admin for ApplicantLetter"""
- model = models.ApplicantLetter
+ model = ApplicantLetter
list_display = ("id", "letter_type", "get_user_email", "get_run_display_title")
list_filter = ("letter_type",)
raw_id_fields = ("application",)
@@ -358,27 +377,20 @@ class ApplicantLetterAdmin(TimestampedModelAdmin):
"application__bootcamp_run__title",
"application__bootcamp_run__bootcamp__title",
)
- readonly_fields = get_field_names(models.ApplicantLetter)
+ readonly_fields = get_field_names(ApplicantLetter)
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.application.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
+ @admin.display(
+ description="Bootcamp Run",
+ ordering="bootcamp_run__title",
+ )
def get_run_display_title(self, obj):
"""Returns the bootcamp run display title"""
return obj.application.bootcamp_run.display_title
-
- get_run_display_title.short_description = "Bootcamp Run"
- get_run_display_title.admin_order_field = "bootcamp_run__title"
-
-
-admin.site.register(models.ApplicationStep, ApplicationStepAdmin)
-admin.site.register(models.BootcampRunApplicationStep, BootcampRunApplicationStepAdmin)
-admin.site.register(models.BootcampApplication, BootcampApplicationAdmin)
-admin.site.register(models.VideoInterviewSubmission, VideoInterviewSubmissionAdmin)
-admin.site.register(models.QuizSubmission, QuizSubmissionAdmin)
-admin.site.register(models.ApplicationStepSubmission, ApplicationStepSubmissionAdmin)
-admin.site.register(models.ApplicantLetter, ApplicantLetterAdmin)
diff --git a/applications/urls.py b/applications/urls.py
index b8b658475..b0475246b 100644
--- a/applications/urls.py
+++ b/applications/urls.py
@@ -3,7 +3,7 @@
"""
from django.urls import path
-from django.conf.urls import url, include
+from django.urls import include
from rest_framework import routers
from applications.views import (
@@ -20,9 +20,9 @@
router.register(r"submissions", ReviewSubmissionViewSet, basename="submissions_api")
urlpatterns = [
- url(r"^api/", include(router.urls)),
- url(
- r"^api/applications/(?P\d+)/resume/$",
+ path("api/", include(router.urls)),
+ path(
+ "api/applications//resume/",
UploadResumeView.as_view(),
name="upload-resume",
),
diff --git a/authentication/middleware.py b/authentication/middleware.py
index 9993d4e94..66cf5a453 100644
--- a/authentication/middleware.py
+++ b/authentication/middleware.py
@@ -1,7 +1,7 @@
"""Authentication middleware"""
+from urllib.parse import quote
from django.shortcuts import redirect
-from django.utils.http import urlquote
from social_core.exceptions import SocialAuthBaseException
from social_django.middleware import SocialAuthExceptionMiddleware
@@ -31,6 +31,6 @@ def process_exception(self, request, exception):
if url:
url += ("?" in url and "&" or "?") + "message={0}&backend={1}".format(
- urlquote(message), backend_name
+ quote(message), backend_name
)
return redirect(url)
diff --git a/authentication/middleware_test.py b/authentication/middleware_test.py
index 61baef1a3..f5ec0e8ff 100644
--- a/authentication/middleware_test.py
+++ b/authentication/middleware_test.py
@@ -2,7 +2,7 @@
from django.contrib.sessions.middleware import SessionMiddleware
from django.shortcuts import reverse
-from django.utils.http import urlquote
+from urllib.parse import quote
from rest_framework import status
from social_core.exceptions import AuthAlreadyAssociated
from social_django.utils import load_backend, load_strategy
@@ -23,7 +23,7 @@ def test_process_exception(mocker, rf, settings):
settings.DEBUG = False
request = rf.get(reverse("social:complete", args=("email",)))
# social_django depends on request.sesssion, so use the middleware to set that
- SessionMiddleware().process_request(request)
+ SessionMiddleware(get_response=mocker.Mock()).process_request(request)
strategy = load_strategy(request)
backend = load_backend(strategy, "email", None)
request.social_strategy = strategy
@@ -34,7 +34,7 @@ def test_process_exception(mocker, rf, settings):
result = middleware.process_exception(request, error)
assert result.status_code == status.HTTP_302_FOUND
assert result.url == "{}?message={}&backend={}".format(
- reverse("login"), urlquote(error.__str__()), backend.name
+ reverse("login"), quote(error.__str__()), backend.name
)
@@ -43,7 +43,7 @@ def test_process_exception_non_auth_error(mocker, rf, settings):
settings.DEBUG = False
request = rf.get(reverse("social:complete", args=("email",)))
# social_django depends on request.sesssion, so use the middleware to set that
- SessionMiddleware().process_request(request)
+ SessionMiddleware(get_response=mocker.Mock()).process_request(request)
strategy = load_strategy(request)
backend = load_backend(strategy, "email", None)
request.social_strategy = strategy
diff --git a/authentication/pipeline/user_test.py b/authentication/pipeline/user_test.py
index cb277e25a..8e6669d77 100644
--- a/authentication/pipeline/user_test.py
+++ b/authentication/pipeline/user_test.py
@@ -46,10 +46,10 @@ def validate_email_auth_request_not_email_backend(mocker):
"has_user,expected", [(True, {"flow": SocialAuthState.FLOW_LOGIN}), (False, {})]
)
@pytest.mark.django_db
-def test_validate_email_auth_request(rf, has_user, expected):
+def test_validate_email_auth_request(rf, has_user, expected, mocker):
"""Test that validate_email_auth_request returns correctly given the input"""
request = rf.post("/complete/email")
- middleware = SessionMiddleware()
+ middleware = SessionMiddleware(get_response=mocker.Mock())
middleware.process_request(request)
request.session.save()
strategy = load_strategy(request)
@@ -105,7 +105,7 @@ def test_user_password_not_email_backend(mocker):
@pytest.mark.parametrize("user_password", ["abc123", "def456"])
-def test_user_password_login(rf, user, user_password):
+def test_user_password_login(rf, user, user_password, mocker):
"""Tests that user_password works for login case"""
request_password = "abc123"
user.set_password(user_password)
@@ -113,7 +113,7 @@ def test_user_password_login(rf, user, user_password):
request = rf.post(
"/complete/email", {"password": request_password, "email": user.email}
)
- middleware = SessionMiddleware()
+ middleware = SessionMiddleware(get_response=mocker.Mock())
middleware.process_request(request)
request.session.save()
strategy = load_strategy(request)
@@ -141,7 +141,7 @@ def test_user_password_login(rf, user, user_password):
)
-def test_user_password_not_login(rf, user):
+def test_user_password_not_login(rf, user, mocker):
"""
Tests that user_password performs denies authentication
for an existing user if password not provided regardless of auth_type
@@ -149,7 +149,7 @@ def test_user_password_not_login(rf, user):
user.set_password("abc123")
user.save()
request = rf.post("/complete/email", {"email": user.email})
- middleware = SessionMiddleware()
+ middleware = SessionMiddleware(get_response=mocker.Mock())
middleware.process_request(request)
request.session.save()
strategy = load_strategy(request)
@@ -165,12 +165,12 @@ def test_user_password_not_login(rf, user):
)
-def test_user_password_not_exists(rf):
+def test_user_password_not_exists(rf, mocker):
"""Tests that user_password raises auth error for nonexistent user"""
request = rf.post(
"/complete/email", {"password": "abc123", "email": "doesntexist@localhost"}
)
- middleware = SessionMiddleware()
+ middleware = SessionMiddleware(get_response=mocker.Mock())
middleware.process_request(request)
request.session.save()
strategy = load_strategy(request)
diff --git a/authentication/views.py b/authentication/views.py
index d798c00a6..43ccc7092 100644
--- a/authentication/views.py
+++ b/authentication/views.py
@@ -41,7 +41,7 @@ def get_serializer_cls(self): # pragma: no cover
def post(self, request, backend_name=EmailAuth.name):
"""Processes a request"""
- if request.session.get("is_hijacked_user", False):
+ if bool(request.session.get("hijack_history")):
return Response(status=status.HTTP_403_FORBIDDEN)
serializer_cls = self.get_serializer_cls()
@@ -83,7 +83,7 @@ def get_serializer_cls(self):
def post(self, request, backend_name=EmailAuth.name):
"""Verify recaptcha response before proceeding"""
- if request.session.get("is_hijacked_user", False):
+ if bool(request.session.get("hijack_history")):
return Response(status=status.HTTP_403_FORBIDDEN)
if settings.RECAPTCHA_SITE_KEY:
r = requests.post(
diff --git a/authentication/views_test.py b/authentication/views_test.py
index 55c029381..10cb1d52a 100644
--- a/authentication/views_test.py
+++ b/authentication/views_test.py
@@ -829,7 +829,7 @@ def test_login_email_error(client, mocker):
def test_login_email_hijacked(client, user, admin_user):
"""Test that a 403 response is returned for email login view if user is hijacked"""
client.force_login(admin_user)
- client.post("/hijack/{}/".format(user.id))
+ client.post("/hijack/acquire/", {"user_pk": user.id})
response = client.post(
reverse("psa-login-email"),
{"flow": SocialAuthState.FLOW_LOGIN, "email": "anything@example.com"},
@@ -840,7 +840,7 @@ def test_login_email_hijacked(client, user, admin_user):
def test_register_email_hijacked(client, user, admin_user):
"""Test that a 403 response is returned for email register view if user is hijacked"""
client.force_login(admin_user)
- client.post("/hijack/{}/".format(user.id))
+ client.post("/hijack/acquire/", {"user_pk": user.id})
response = client.post(
reverse("psa-register-email"),
{"flow": SocialAuthState.FLOW_LOGIN, "email": "anything@example.com"},
diff --git a/cms/__init__.py b/cms/__init__.py
index df7b240ba..850a660df 100644
--- a/cms/__init__.py
+++ b/cms/__init__.py
@@ -1,3 +1 @@
"""Initialize cms app"""
-
-default_app_config = "cms.apps.CMSConfig"
diff --git a/compliance/admin.py b/compliance/admin.py
index 22a486413..2acb11daf 100644
--- a/compliance/admin.py
+++ b/compliance/admin.py
@@ -13,6 +13,7 @@
from .models import ExportsInquiryLog
+@admin.register(ExportsInquiryLog)
class ExportsInquiryLogAdmin(admin.ModelAdmin):
"""Admin for ExportsInquiryLog"""
@@ -33,6 +34,7 @@ def country(self, instance):
"""generate country name from pycountry"""
return pycountry.countries.get(alpha_2=instance.user.legal_address.country).name
+ @admin.action(description="Manually approve selected records")
def manually_approve_inquiry(self, request, queryset):
"""Admin action to manually approve export compliance inquiry records"""
eligible_objects = queryset.exclude(
@@ -42,8 +44,6 @@ def manually_approve_inquiry(self, request, queryset):
ensure_active_user(obj.user)
eligible_objects.update(computed_result=RESULT_MANUALLY_APPROVED)
- manually_approve_inquiry.short_description = "Manually approve selected records"
-
def has_add_permission(self, request):
# We want to allow this while debugging
return settings.DEBUG
@@ -51,6 +51,3 @@ def has_add_permission(self, request):
def has_delete_permission(self, request, obj=None):
# We want to allow this while debugging
return settings.DEBUG
-
-
-admin.site.register(ExportsInquiryLog, ExportsInquiryLogAdmin)
diff --git a/ecommerce/admin.py b/ecommerce/admin.py
index ddbfbe649..9f787925b 100644
--- a/ecommerce/admin.py
+++ b/ecommerce/admin.py
@@ -12,6 +12,7 @@
from applications import models as application_models
+@admin.register(Line)
class LineAdmin(TimestampedModelAdmin):
"""Admin for Line"""
@@ -41,6 +42,7 @@ def has_add_permission(self, request, obj=None):
return False
+@admin.register(Order)
class OrderAdmin(TimestampedModelAdmin):
"""Admin for Order"""
@@ -78,13 +80,15 @@ def get_queryset(self, request):
"""Overrides base queryset"""
return super().get_queryset(request).select_related("user")
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
+ @admin.display(description="Application")
def application_link(self, obj):
"""Returns a link to the related application"""
if not hasattr(obj, "application") or obj.application is None:
@@ -101,9 +105,8 @@ def application_link(self, obj):
)
)
- application_link.short_description = "Application"
-
+@admin.register(OrderAudit)
class OrderAuditAdmin(admin.ModelAdmin):
"""Admin for OrderAudit"""
@@ -117,6 +120,7 @@ def has_delete_permission(self, request, obj=None):
return False
+@admin.register(Receipt)
class ReceiptAdmin(TimestampedModelAdmin):
"""Admin for Receipt"""
@@ -136,24 +140,27 @@ def get_queryset(self, request):
"""Overrides base queryset"""
return super().get_queryset(request).select_related("order__user")
+ @admin.display(
+ description="User",
+ ordering="order__user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
if obj.order is None:
return None
return obj.order.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "order__user__email"
-
+ @admin.display(
+ description="Status",
+ ordering="order__status",
+ )
def get_order_status(self, obj):
"""Returns the order status"""
if obj.order is None:
return None
return obj.order.status
- get_order_status.short_description = "Status"
- get_order_status.admin_order_field = "order__status"
-
+ @admin.display(description="Order")
def order_link(self, obj):
"""Returns a link to the related order"""
if obj.order is None:
@@ -168,9 +175,8 @@ def order_link(self, obj):
)
)
- order_link.short_description = "Order"
-
+@admin.register(WireTransferReceipt)
class WireTransferReceiptAdmin(TimestampedModelAdmin):
"""Admin for WireTransferReceipt"""
@@ -193,24 +199,27 @@ def get_queryset(self, request):
"""Overrides base queryset"""
return super().get_queryset(request).select_related("order__user")
+ @admin.display(
+ description="User",
+ ordering="order__user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
if obj.order is None:
return None
return obj.order.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "order__user__email"
-
+ @admin.display(
+ description="Status",
+ ordering="order__status",
+ )
def get_order_status(self, obj):
"""Returns the order status"""
if obj.order is None:
return None
return obj.order.status
- get_order_status.short_description = "Status"
- get_order_status.admin_order_field = "order__status"
-
+ @admin.display(description="Order")
def order_link(self, obj):
"""Returns a link to the related order"""
if obj.order is None:
@@ -224,12 +233,3 @@ def order_link(self, obj):
obj.order.id,
)
)
-
- order_link.short_description = "Order"
-
-
-admin.site.register(Line, LineAdmin)
-admin.site.register(Order, OrderAdmin)
-admin.site.register(OrderAudit, OrderAuditAdmin)
-admin.site.register(Receipt, ReceiptAdmin)
-admin.site.register(WireTransferReceipt, WireTransferReceiptAdmin)
diff --git a/ecommerce/migrations/0001_initial.py b/ecommerce/migrations/0001_initial.py
index 4e773f084..a1283b12b 100644
--- a/ecommerce/migrations/0001_initial.py
+++ b/ecommerce/migrations/0001_initial.py
@@ -3,7 +3,6 @@
from __future__ import unicode_literals
from django.conf import settings
-import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
@@ -91,15 +90,11 @@ class Migration(migrations.Migration):
("updated_on", models.DateTimeField(auto_now=True)),
(
"data_before",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"data_after",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"acting_user",
@@ -134,7 +129,7 @@ class Migration(migrations.Migration):
),
("created_on", models.DateTimeField(auto_now_add=True)),
("updated_on", models.DateTimeField(auto_now=True)),
- ("data", django.contrib.postgres.fields.jsonb.JSONField()),
+ ("data", models.JSONField()),
(
"order",
models.ForeignKey(
diff --git a/ecommerce/migrations/0010_wire_transfers.py b/ecommerce/migrations/0010_wire_transfers.py
index 07a7b977d..69e00556e 100644
--- a/ecommerce/migrations/0010_wire_transfers.py
+++ b/ecommerce/migrations/0010_wire_transfers.py
@@ -1,6 +1,5 @@
# Generated by Django 2.2.13 on 2020-07-15 19:33
-import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
@@ -37,7 +36,7 @@ class Migration(migrations.Migration):
("created_on", models.DateTimeField(auto_now_add=True)),
("updated_on", models.DateTimeField(auto_now=True)),
("wire_transfer_id", models.IntegerField()),
- ("data", django.contrib.postgres.fields.jsonb.JSONField()),
+ ("data", models.JSONField()),
(
"order",
models.ForeignKey(
diff --git a/ecommerce/urls.py b/ecommerce/urls.py
index 60d519919..fe41e0df8 100644
--- a/ecommerce/urls.py
+++ b/ecommerce/urls.py
@@ -2,8 +2,7 @@
URLs for ecommerce
"""
-from django.conf.urls import url
-from django.urls import path
+from django.urls import path, re_path
from ecommerce.views import (
CheckoutDataView,
@@ -17,27 +16,27 @@
urlpatterns = [
- url(r"^api/v0/payment/$", PaymentView.as_view(), name="create-payment"),
- url(
- r"^api/v0/order_fulfillment/$",
+ path("api/v0/payment/", PaymentView.as_view(), name="create-payment"),
+ path(
+ "api/v0/order_fulfillment/",
OrderFulfillmentView.as_view(),
name="order-fulfillment",
),
- url(
+ re_path(
r"^api/v0/bootcamps/(?P[-\w.]+)/$",
UserBootcampRunList.as_view(),
name="bootcamp-run-list",
),
- url(
+ re_path(
r"^api/v0/bootcamps/(?P[-\w.]+)/(?P[\d]+)/$",
UserBootcampRunDetail.as_view(),
name="bootcamp-run-detail",
),
- url(
- r"statement/(?P[0-9]+)/$",
+ path(
+ "statement//",
UserBootcampRunStatement.as_view(),
name="bootcamp-run-statement",
),
- url(r"api/orders/(?P[0-9]+)/$", OrderView.as_view(), name="order-api"),
+ path("api/orders//", OrderView.as_view(), name="order-api"),
path("api/checkout/", CheckoutDataView.as_view(), name="checkout-data-detail"),
]
diff --git a/jobma/admin.py b/jobma/admin.py
index 3f1db6a2f..845fb7c42 100644
--- a/jobma/admin.py
+++ b/jobma/admin.py
@@ -7,6 +7,7 @@
from jobma.models import Interview, Job, InterviewAudit
+@admin.register(Interview)
class InterviewAdmin(admin.ModelAdmin):
"""Admin for Interview"""
@@ -29,21 +30,24 @@ def get_fields(self, request, obj=None):
fields.insert(applicant_index + 1, "status")
return fields
+ @admin.display(
+ description="Applicant",
+ ordering="applicant__email",
+ )
def get_applicant_email(self, obj):
"""Returns the user email"""
return obj.applicant.email
- get_applicant_email.short_description = "Applicant"
- get_applicant_email.admin_order_field = "applicant__email"
-
+ @admin.display(
+ description="Job Title",
+ ordering="job__job_title",
+ )
def get_job_title(self, obj):
"""Returns the job title"""
return obj.job.job_title
- get_job_title.short_description = "Job Title"
- get_job_title.admin_order_field = "job__job_title"
-
+@admin.register(Job)
class JobAdmin(admin.ModelAdmin):
"""Admin for Job"""
@@ -58,14 +62,16 @@ def get_queryset(self, request):
"""Overrides base queryset"""
return super().get_queryset(request).select_related("run__bootcamp")
+ @admin.display(
+ description="Bootcamp Run",
+ ordering="run__title",
+ )
def get_run_display_title(self, obj):
"""Returns the bootcamp run display title"""
return obj.run.display_title
- get_run_display_title.short_description = "Bootcamp Run"
- get_run_display_title.admin_order_field = "run__title"
-
+@admin.register(InterviewAudit)
class InterviewAuditAdmin(admin.ModelAdmin):
"""Admin for Interview Audit model"""
@@ -79,8 +85,3 @@ def has_delete_permission(self, request, obj=None):
def has_change_permission(self, request, obj=None):
return False
-
-
-admin.site.register(Interview, InterviewAdmin)
-admin.site.register(Job, JobAdmin)
-admin.site.register(InterviewAudit, InterviewAuditAdmin)
diff --git a/jobma/migrations/0001_initial.py b/jobma/migrations/0001_initial.py
index 346f8d885..132f04769 100644
--- a/jobma/migrations/0001_initial.py
+++ b/jobma/migrations/0001_initial.py
@@ -1,7 +1,6 @@
# Generated by Django 2.2.10 on 2020-05-01 16:29
from django.conf import settings
-import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
@@ -88,15 +87,11 @@ class Migration(migrations.Migration):
("updated_on", models.DateTimeField(auto_now=True)),
(
"data_before",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"data_after",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"acting_user",
@@ -133,15 +128,11 @@ class Migration(migrations.Migration):
("updated_on", models.DateTimeField(auto_now=True)),
(
"data_before",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"data_after",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"acting_user",
diff --git a/jobma/urls.py b/jobma/urls.py
index 44d33d705..92d752506 100644
--- a/jobma/urls.py
+++ b/jobma/urls.py
@@ -1,12 +1,12 @@
"""urls for jobma"""
-from django.conf.urls import url
+from django.urls import path
from jobma.views import JobmaWebhookView
urlpatterns = [
- url(
- r"api/v0/jobma_webhook/(?P\d+)/$",
+ path(
+ "api/v0/jobma_webhook//",
JobmaWebhookView.as_view(),
name="jobma-webhook",
)
diff --git a/klasses/__init__.py b/klasses/__init__.py
index f23d9ed8c..e1d7b8317 100644
--- a/klasses/__init__.py
+++ b/klasses/__init__.py
@@ -1,3 +1 @@
"""Initialize klasses app"""
-
-default_app_config = "klasses.apps.KlassesConfig"
diff --git a/klasses/admin.py b/klasses/admin.py
index a402a636c..9c59e5dc1 100644
--- a/klasses/admin.py
+++ b/klasses/admin.py
@@ -5,13 +5,20 @@
from django.contrib import admin
from mitol.common.admin import TimestampedModelAdmin
-from klasses import models
+from klasses.models import (
+ Bootcamp,
+ BootcampRun,
+ BootcampRunCertificate,
+ BootcampRunEnrollment,
+ Installment,
+ PersonalPrice,
+)
class BootcampRunInline(admin.StackedInline):
"""Admin Inline for BootcampRun objects"""
- model = models.BootcampRun
+ model = BootcampRun
extra = 1
show_change_link = True
@@ -19,15 +26,16 @@ class BootcampRunInline(admin.StackedInline):
class InstallmentInline(admin.StackedInline):
"""Admin Inline for Installment objects"""
- model = models.Installment
+ model = Installment
extra = 1
show_change_link = True
+@admin.register(Bootcamp)
class BootcampAdmin(admin.ModelAdmin):
"""Admin for Bootcamp"""
- model = models.Bootcamp
+ model = Bootcamp
list_display = (
"title",
"readable_id",
@@ -39,10 +47,11 @@ class BootcampAdmin(admin.ModelAdmin):
inlines = [BootcampRunInline]
+@admin.register(BootcampRun)
class BootcampRunAdmin(admin.ModelAdmin):
"""Admin for BootcampRun"""
- model = models.BootcampRun
+ model = BootcampRun
list_display = (
"display_title",
"bootcamp_run_id",
@@ -60,10 +69,11 @@ class BootcampRunAdmin(admin.ModelAdmin):
inlines = [InstallmentInline]
+@admin.register(BootcampRunEnrollment)
class BootcampRunEnrollmentAdmin(TimestampedModelAdmin):
"""Admin for BootcampRunEnrollment"""
- model = models.BootcampRunEnrollment
+ model = BootcampRunEnrollment
include_created_on_in_list = True
list_display = (
"id",
@@ -96,18 +106,20 @@ def get_queryset(self, request):
.select_related("user", "bootcamp_run__bootcamp")
)
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
+@admin.register(Installment)
class InstallmentAdmin(admin.ModelAdmin):
"""Admin for Installment"""
- model = models.Installment
+ model = Installment
list_display = ("id", "bootcamp_run", "deadline", "amount")
raw_id_fields = ("bootcamp_run",)
search_fields = (
@@ -116,10 +128,11 @@ class InstallmentAdmin(admin.ModelAdmin):
)
+@admin.register(PersonalPrice)
class PersonalPriceAdmin(admin.ModelAdmin):
"""Admin for PersonalPrice"""
- model = models.PersonalPrice
+ model = PersonalPrice
list_display = ("id", "get_user_email", "bootcamp_run", "price")
list_filter = ("bootcamp_run__bootcamp",)
raw_id_fields = ("bootcamp_run", "user")
@@ -141,18 +154,20 @@ def get_queryset(self, request):
.select_related("user", "bootcamp_run__bootcamp")
)
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.user.email
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
+@admin.register(BootcampRunCertificate)
class BootcampRunCertificateAdmin(TimestampedModelAdmin):
"""Admin for BootcampRunCertificate"""
- model = models.BootcampRunCertificate
+ model = BootcampRunCertificate
include_timestamps_in_list = True
list_display = ["uuid", "get_user_email", "bootcamp_run", "get_revoked_state"]
search_fields = [
@@ -168,24 +183,18 @@ def get_queryset(self, request):
"user", "bootcamp_run"
)
+ @admin.display(
+ description="Active",
+ boolean=True,
+ )
def get_revoked_state(self, obj):
"""return the revoked state"""
return obj.is_revoked is not True
- get_revoked_state.short_description = "Active"
- get_revoked_state.boolean = True
-
+ @admin.display(
+ description="User",
+ ordering="user__email",
+ )
def get_user_email(self, obj):
"""Returns the user email"""
return obj.user.email
-
- get_user_email.short_description = "User"
- get_user_email.admin_order_field = "user__email"
-
-
-admin.site.register(models.Bootcamp, BootcampAdmin)
-admin.site.register(models.BootcampRun, BootcampRunAdmin)
-admin.site.register(models.Installment, InstallmentAdmin)
-admin.site.register(models.PersonalPrice, PersonalPriceAdmin)
-admin.site.register(models.BootcampRunEnrollment, BootcampRunEnrollmentAdmin)
-admin.site.register(models.BootcampRunCertificate, BootcampRunCertificateAdmin)
diff --git a/klasses/migrations/0004_admission_cache.py b/klasses/migrations/0004_admission_cache.py
index a8cf7fd2a..3cb6bcef0 100644
--- a/klasses/migrations/0004_admission_cache.py
+++ b/klasses/migrations/0004_admission_cache.py
@@ -3,7 +3,6 @@
from __future__ import unicode_literals
from django.conf import settings
-import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
@@ -27,7 +26,7 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
- ("data", django.contrib.postgres.fields.jsonb.JSONField()),
+ ("data", models.JSONField()),
(
"klass",
models.ForeignKey(
diff --git a/klasses/migrations/0026_add_bootcamprunenrollmentaudit_defer_enrollment_field.py b/klasses/migrations/0026_add_bootcamprunenrollmentaudit_defer_enrollment_field.py
index 6372dc8e4..1762839ac 100644
--- a/klasses/migrations/0026_add_bootcamprunenrollmentaudit_defer_enrollment_field.py
+++ b/klasses/migrations/0026_add_bootcamprunenrollmentaudit_defer_enrollment_field.py
@@ -1,7 +1,6 @@
# Generated by Django 2.2.18 on 2021-04-26 09:07
from django.conf import settings
-import django.contrib.postgres.fields.jsonb
from django.db import migrations, models
import django.db.models.deletion
@@ -39,15 +38,11 @@ class Migration(migrations.Migration):
("updated_on", models.DateTimeField(auto_now=True)),
(
"data_before",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"data_after",
- django.contrib.postgres.fields.jsonb.JSONField(
- blank=True, null=True
- ),
+ models.JSONField(blank=True, null=True),
),
(
"acting_user",
diff --git a/klasses/models_test.py b/klasses/models_test.py
index c999b96ad..d10b229af 100644
--- a/klasses/models_test.py
+++ b/klasses/models_test.py
@@ -138,7 +138,7 @@ def test_bootcamp_run_is_payable(future_start_date, expected_result):
bootcamp_run = None
if future_start_date is None:
start_date = None
- bootcamp_run = BootcampRunFactory.build(start_date=start_date)
+ bootcamp_run = BootcampRunFactory.create(start_date=start_date)
elif future_start_date:
start_date = now_in_utc() + timedelta(days=10)
else:
diff --git a/mail/urls.py b/mail/urls.py
index 6683e00b6..1e6aa8fbd 100644
--- a/mail/urls.py
+++ b/mail/urls.py
@@ -1,7 +1,7 @@
"""URL configurations for mail"""
from django.conf import settings
-from django.conf.urls import url
+from django.urls import path
from mail.views import EmailDebuggerView
@@ -9,5 +9,5 @@
if settings.DEBUG:
urlpatterns += [
- url(r"^__emaildebugger__/$", EmailDebuggerView.as_view(), name="email-debugger")
+ path("__emaildebugger__/", EmailDebuggerView.as_view(), name="email-debugger")
]
diff --git a/mail/v2/verification_api_test.py b/mail/v2/verification_api_test.py
index 992d1a4a4..18d704bb4 100644
--- a/mail/v2/verification_api_test.py
+++ b/mail/v2/verification_api_test.py
@@ -24,7 +24,7 @@ def test_send_verification_email(mocker, rf):
email = "test@localhost"
request = rf.post(reverse("social:complete", args=("email",)), {"email": email})
# social_django depends on request.sesssion, so use the middleware to set that
- SessionMiddleware().process_request(request)
+ SessionMiddleware(get_response=mocker.Mock()).process_request(request)
strategy = load_strategy(request)
backend = load_backend(strategy, EmailAuth.name, None)
code = mocker.Mock(code="abc")
diff --git a/main/hijack_support_middleware.py b/main/hijack_support_middleware.py
new file mode 100644
index 000000000..a431b750d
--- /dev/null
+++ b/main/hijack_support_middleware.py
@@ -0,0 +1,18 @@
+from django.utils.deprecation import MiddlewareMixin
+
+
+class HijackSupportMiddleware(MiddlewareMixin):
+ """Middleware to support HijackMiddleware"""
+
+ def process_request(self, request):
+ """
+ HijackMiddleware needs the session to be in accessed state in order to work properly. However, It doesn't work properly
+ with our current architecture and django-hijack implementation because when the request reaches HijackMiddleware the
+ session is not in accessed state. As a result it is unable to add the notification in DOM.
+
+ This middleware is written to ensure that the request session has accessed=True when the request reaches HijackMiddleware.
+
+ We will probably need to add a more robust solution to django-hijack package.
+ """
+ if hasattr(request, "session"):
+ request.session.get("hijack_history", [])
diff --git a/main/middleware_test.py b/main/middleware_test.py
index 822578e35..09b83fb39 100644
--- a/main/middleware_test.py
+++ b/main/middleware_test.py
@@ -15,11 +15,11 @@
],
)
def test_cacheless_api_middleware(
- rf, view, cache_value, cacheable_endpoints_cache_value
+ rf, view, cache_value, cacheable_endpoints_cache_value, mocker
):
"""Tests that the response has a cache-control header for API URLs"""
request = rf.get(reverse(view))
- middleware = CachelessAPIMiddleware()
+ middleware = CachelessAPIMiddleware(get_response=mocker.Mock())
assert (
middleware.process_response(request, {}).get("Cache-Control", None)
== cache_value
diff --git a/main/settings.py b/main/settings.py
index aed1711df..62f0d4c6c 100644
--- a/main/settings.py
+++ b/main/settings.py
@@ -127,13 +127,10 @@
"django.contrib.humanize",
"rest_framework",
"rest_framework.authtoken",
- "server_status",
"social_django",
"mathfilters",
- # Hijack
"hijack",
- "compat",
- "hijack_admin",
+ "hijack.contrib.admin",
# other third party APPS
# wagtail
"wagtail.contrib.forms",
@@ -195,6 +192,8 @@
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
+ "hijack.middleware.HijackUserMiddleware",
+ "main.hijack_support_middleware.HijackSupportMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"social_django.middleware.SocialAuthExceptionMiddleware",
@@ -401,8 +400,7 @@
WSGI_APPLICATION = "main.wsgi.application"
# Hijack
-HIJACK_ALLOW_GET_REQUESTS = True
-HIJACK_LOGOUT_REDIRECT_URL = "/admin/auth/user"
+HIJACK_INSERT_BEFORE = " "
# Database
# https://github.com/kennethreitz/dj-database-url
@@ -443,7 +441,6 @@
USE_I18N = True
-USE_L10N = True
USE_TZ = True
@@ -683,15 +680,6 @@
LOGGING["loggers"]["ui"]["handlers"] = ["console"]
LOGGING["loggers"]["django"]["handlers"] = ["console"]
-# server-status
-STATUS_TOKEN = get_string(
- name="STATUS_TOKEN",
- default="",
- description="Token to access the status API.",
- required=True,
-)
-HEALTH_CHECK = ["CELERY", "REDIS", "POSTGRES", "ELASTIC_SEARCH"]
-
ADWORDS_CONVERSION_ID = get_string(
name="ADWORDS_CONVERSION_ID", default="", description="Id for adwords conversion"
)
diff --git a/main/templates/base.html b/main/templates/base.html
index d0a6436b8..049576e3d 100644
--- a/main/templates/base.html
+++ b/main/templates/base.html
@@ -3,7 +3,7 @@