Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
edx-platform-release
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
1
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
code.vt.edu will be down for maintenance from 0530-0630 EDT Wednesday, April 9th
Show more breadcrumbs
Hsin-Yu Chien
edx-platform-release
Commits
c79518d8
Commit
c79518d8
authored
3 years ago
by
Bianca Severino
Browse files
Options
Downloads
Patches
Plain Diff
fix: use course overviews instead of modulestore in enrollments service
parent
c190616e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
openedx/core/djangoapps/enrollments/services.py
+4
-4
4 additions, 4 deletions
openedx/core/djangoapps/enrollments/services.py
openedx/core/djangoapps/enrollments/tests/test_services.py
+6
-6
6 additions, 6 deletions
openedx/core/djangoapps/enrollments/tests/test_services.py
with
10 additions
and
10 deletions
openedx/core/djangoapps/enrollments/services.py
+
4
−
4
View file @
c79518d8
...
...
@@ -10,7 +10,7 @@ from django.db.models import Q
from
opaque_keys.edx.keys
import
CourseKey
from
common.djangoapps.course_modes.models
import
CourseMode
from
common.djangoapps.student.models
import
CourseEnrollment
from
xmodule.modulestore.django
import
modulestor
e
from
openedx.core.djangoapps.content.course_overviews.api
import
get_course_overview_or_non
e
class
EnrollmentsService
:
...
...
@@ -68,12 +68,12 @@ class EnrollmentsService:
* text_search: the string against which to do a match on users
'
username or email; optional
"""
course_id_coursekey
=
CourseKey
.
from_string
(
course_id
)
course_
module
=
modulestore
().
get_cours
e
(
course_id_coursekey
)
if
not
course_
module
or
not
course_
module
.
enable_proctored_exams
:
course_
overview
=
get_course_overview_or_non
e
(
course_id_coursekey
)
if
not
course_
overview
or
not
course_
overview
.
enable_proctored_exams
:
return
None
allow_honor_mode
=
settings
.
PROCTORING_BACKENDS
.
get
(
course_
module
.
proctoring_provider
,
{}
course_
overview
.
proctoring_provider
,
{}
).
get
(
'
allow_honor_mode
'
,
False
)
enrollments
=
self
.
_get_enrollments_for_course_proctoring_eligible_modes
(
course_id
,
allow_honor_mode
)
...
...
This diff is collapsed.
Click to expand it.
openedx/core/djangoapps/enrollments/tests/test_services.py
+
6
−
6
View file @
c79518d8
...
...
@@ -7,9 +7,9 @@ from common.djangoapps.course_modes.models import CourseMode
from
common.djangoapps.course_modes.tests.factories
import
CourseModeFactory
from
common.djangoapps.student.models
import
CourseEnrollment
from
common.djangoapps.student.tests.factories
import
UserFactory
from
openedx.core.djangoapps.content.course_overviews.tests.factories
import
CourseOverviewFactory
from
openedx.core.djangoapps.enrollments.services
import
EnrollmentsService
from
xmodule.modulestore.tests.django_utils
import
ModuleStoreTestCase
from
xmodule.modulestore.tests.factories
import
CourseFactory
@ddt.ddt
...
...
@@ -28,7 +28,7 @@ class EnrollmentsServiceTests(ModuleStoreTestCase):
CourseMode
.
PROFESSIONAL
,
CourseMode
.
VERIFIED
]
self
.
course
=
CourseFactory
.
create
(
enable_proctored_exams
=
True
)
self
.
course
=
Course
Overview
Factory
.
create
(
enable_proctored_exams
=
True
)
for
index
in
range
(
len
(
self
.
course_modes
)):
course_mode
=
self
.
course_modes
[
index
]
...
...
@@ -74,7 +74,7 @@ class EnrollmentsServiceTests(ModuleStoreTestCase):
"""
Test that an empty list is returned if a course has no enrollments
"""
course
=
CourseFactory
.
create
(
enable_proctored_exams
=
True
)
course
=
Course
Overview
Factory
.
create
(
enable_proctored_exams
=
True
)
enrollments
=
self
.
service
.
get_enrollments_can_take_proctored_exams
(
str
(
course
.
id
))
# pylint: disable=no-member
...
...
@@ -82,7 +82,7 @@ class EnrollmentsServiceTests(ModuleStoreTestCase):
def
test_get_enrollments_can_take_proctored_exams_allow_honor
(
self
):
self
.
course
.
proctoring_provider
=
'
test
'
self
.
store
.
update_item
(
self
.
course
,
self
.
user
.
id
)
self
.
course
.
save
(
)
mock_proctoring_backend
=
{
'
test
'
:
{
...
...
@@ -104,7 +104,7 @@ class EnrollmentsServiceTests(ModuleStoreTestCase):
def
test_get_enrollments_can_take_proctored_exams_not_enable_proctored_exams
(
self
):
self
.
course
.
enable_proctored_exams
=
False
self
.
store
.
update_item
(
self
.
course
,
self
.
user
.
id
)
self
.
course
.
save
(
)
enrollments
=
self
.
service
.
get_enrollments_can_take_proctored_exams
(
str
(
self
.
course
.
id
))
...
...
@@ -170,7 +170,7 @@ class EnrollmentsServicePerformanceTests(ModuleStoreTestCase):
def
setUp
(
self
):
super
().
setUp
()
self
.
service
=
EnrollmentsService
()
self
.
course
=
CourseFactory
.
create
(
enable_proctored_exams
=
True
)
self
.
course
=
Course
Overview
Factory
.
create
(
enable_proctored_exams
=
True
)
self
.
course_modes
=
[
CourseMode
.
AUDIT
,
CourseMode
.
EXECUTIVE_EDUCATION
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment