Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-ora2
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
edx-ora2
Commits
65c65454
Commit
65c65454
authored
Jan 24, 2014
by
Stephen Sanchez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates to the API.
parent
c041d4a3
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
38 additions
and
8 deletions
+38
-8
apps/submissions/api.py
+35
-8
apps/submissions/tests/test_api.py
+3
-0
No files found.
apps/submissions/api.py
View file @
65c65454
...
...
@@ -2,16 +2,34 @@
Public interface for the submissions app.
"""
import
copy
from
django.db
import
DatabaseError
from
django.utils.encoding
import
force_unicode
from
submissions.serializers
import
SubmissionSerializer
from
submissions.models
import
Submission
,
StudentItem
,
SubmissionStruct
from
apps.submissions.serializers
import
StudentItemSerializer
class
Submission
Access
Error
(
Exception
):
class
Submission
Internal
Error
(
Exception
):
pass
class
SubmissionRequestError
(
Exception
):
def
__init__
(
self
,
field_errors
):
print
field_errors
self
.
field_errors
=
copy
.
deepcopy
(
field_errors
)
super
(
SubmissionRequestError
,
self
)
.
__init__
()
def
__unicode__
(
self
):
return
repr
(
self
)
def
__repr__
(
self
):
return
"SubmissionRequestError({!r})"
.
format
(
self
.
field_errors
)
class
SubmissionNotFoundError
(
Exception
):
pass
...
...
@@ -44,17 +62,17 @@ def create_submission(student_item_struct, answer, submitted_at=None,
"""
try
:
student_item_model
,
_
=
StudentItem
.
objects
.
get_or_create
(
**
student_item_struct
.
_asdict
())
**
student_item_struct
.
_asdict
()
)
except
DatabaseError
as
err
:
raise
SubmissionAccessError
(
err
)
raise
SubmissionInternalError
(
err
)
if
attempt_number
is
None
:
try
:
submissions
=
Submission
.
objects
.
filter
(
student_item
=
student_item_model
)[:
0
]
except
DatabaseError
as
err
:
raise
Submission
Access
Error
(
err
)
raise
Submission
Internal
Error
(
err
)
attempt_number
=
submissions
[
0
]
.
attempt_number
+
1
if
submissions
else
1
model_kwargs
=
{
...
...
@@ -68,7 +86,8 @@ def create_submission(student_item_struct, answer, submitted_at=None,
try
:
submission
=
Submission
.
objects
.
create
(
**
model_kwargs
)
except
DatabaseError
as
err
:
raise
SubmissionAccessError
(
err
)
raise
SubmissionInternalError
(
err
)
return
SubmissionStruct
(
**
SubmissionSerializer
(
submission
)
.
data
)
...
...
@@ -100,9 +119,10 @@ def get_submissions(student_item_struct, limit=None):
"""
try
:
student_item_model
,
_
=
StudentItem
.
objects
.
get_or_create
(
**
student_item_struct
.
_asdict
())
**
student_item_struct
.
_asdict
()
)
except
DatabaseError
as
err
:
raise
Submission
Access
Error
(
err
)
raise
Submission
Internal
Error
(
err
)
try
:
submission_models
=
Submission
.
objects
.
filter
(
...
...
@@ -127,3 +147,10 @@ def get_scores(course_id, student_id, types=None):
def
set_score
(
student_item
):
pass
def
_validate_student_item
(
student_item_struct
):
student_item_serializer
=
StudentItemSerializer
(
data
=
student_item_struct
.
_asdict
())
student_item_serializer
.
is_valid
()
if
student_item_serializer
.
errors
:
raise
SubmissionRequestError
(
student_item_serializer
.
errors
)
apps/submissions/tests/test_api.py
View file @
65c65454
...
...
@@ -47,6 +47,9 @@ class TestApi(TestCase):
submissions
=
get_submissions
(
STUDENT_ITEM
)
self
.
_assert_submission
(
submissions
[
0
],
ANSWER_ONE
,
1
,
2
)
def
test_error_checking
(
self
):
create_submission
(
STUDENT_ITEM
,
-
100
)
def
_assert_submission
(
self
,
submission
,
expected_answer
,
expected_item
,
expected_attempt
):
self
.
assertIsNotNone
(
submission
)
...
...
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