Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
course-discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
course-discovery
Commits
747c28a0
Commit
747c28a0
authored
Apr 26, 2016
by
Peter Fogg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Include courses with no end date in active course runs.
parent
a03d7675
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
course_discovery/apps/course_metadata/query.py
+5
-1
course_discovery/apps/course_metadata/tests/test_query.py
+5
-1
No files found.
course_discovery/apps/course_metadata/query.py
View file @
747c28a0
...
...
@@ -2,6 +2,7 @@ import datetime
import
pytz
from
django.db
import
models
from
django.db.models.query_utils
import
Q
class
CourseQuerySet
(
models
.
QuerySet
):
...
...
@@ -9,4 +10,7 @@ class CourseQuerySet(models.QuerySet):
""" Filters Courses to those with CourseRuns that are either currently open for enrollment,
or will be open for enrollment in the future. """
return
self
.
filter
(
course_runs__enrollment_end__gt
=
datetime
.
datetime
.
now
(
pytz
.
UTC
))
return
self
.
filter
(
Q
(
course_runs__enrollment_end__gt
=
datetime
.
datetime
.
now
(
pytz
.
UTC
))
|
Q
(
course_runs__enrollment_end__isnull
=
True
)
)
course_discovery/apps/course_metadata/tests/test_query.py
View file @
747c28a0
...
...
@@ -8,6 +8,7 @@ from course_discovery.apps.course_metadata.tests.factories import CourseRunFacto
class
CourseQuerySetTests
(
TestCase
):
def
test_active
(
self
):
""" Verify the method filters the Courses to those with active course runs. """
# Create an active course
...
...
@@ -18,4 +19,7 @@ class CourseQuerySetTests(TestCase):
enrollment_end
=
datetime
.
datetime
.
now
(
pytz
.
UTC
)
-
datetime
.
timedelta
(
days
=
30
)
CourseRunFactory
(
enrollment_end
=
enrollment_end
,
course__title
=
'ABC Test Course 2'
)
self
.
assertListEqual
(
list
(
Course
.
objects
.
active
()),
[
active_course
])
# Create a course with unrestricted enrollment
course_without_end
=
CourseRunFactory
(
enrollment_end
=
None
)
.
course
self
.
assertEqual
(
set
(
Course
.
objects
.
active
()),
{
active_course
,
course_without_end
})
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment