Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
kszkepzes-backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
JetBrains YouTrack
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
Show more breadcrumbs
KSZK
DevTeam
kszkepzes
old
kszkepzes-backend
Commits
4eb1394a
Commit
4eb1394a
authored
7 years ago
by
Bodor Máté
Committed by
Barnabás Czémán
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
update model & deadline validation
parent
d37b2cd2
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/homework/models.py
+3
-20
3 additions, 20 deletions
src/homework/models.py
src/homework/serializers.py
+8
-8
8 additions, 8 deletions
src/homework/serializers.py
src/homework/views.py
+20
-21
20 additions, 21 deletions
src/homework/views.py
with
31 additions
and
49 deletions
src/homework/models.py
+
3
−
20
View file @
4eb1394a
...
...
@@ -16,10 +16,6 @@ def validate_deadline(date):
raise
ValidationError
(
_
(
'
Date must be greater than now
'
),
code
=
'
invalid
'
)
# def validate_file_size(file):
# if file._size > __MAX_UPLOAD_SIZE:
# raise ValidationError(_('Please keep filesize under' + __MAX_UPLOAD_SIZE))
class
Task
(
models
.
Model
):
title
=
models
.
CharField
(
max_length
=
150
)
date
=
models
.
DateTimeField
(
auto_now_add
=
True
,
editable
=
False
)
...
...
@@ -34,17 +30,9 @@ class Task(models.Model):
)],
blank
=
True
,
)
# files = myfields.RestrictedFileField(
# content_types=['image/png', 'image/jpeg', 'application/zip'],
# max_upload_size=MAX_UPLOAD_SIZE,
# blank=True,
# null=True,
# )
# solution_file = models.BooleanField()
#
# def clean(self):
# if self.deadline <= timezone.now():
# raise ValidationError(_('Invalid date'), code='invalid')
def
__str__
(
self
):
return
self
.
title
class
Solution
(
models
.
Model
):
...
...
@@ -62,8 +50,3 @@ class Solution(models.Model):
blank
=
True
,
)
created_by
=
models
.
ForeignKey
(
User
,
on_delete
=
models
.
CASCADE
)
# files = myfields.RestrictedFileField(
# content_types=['image/png', 'image/jpeg', 'application/zip'],
# max_upload_size=MAX_UPLOAD_SIZE,
# blank=True,
# )
This diff is collapsed.
Click to expand it.
src/homework/serializers.py
+
8
−
8
View file @
4eb1394a
...
...
@@ -17,11 +17,11 @@ class SolutionSerializer(serializers.ModelSerializer):
extra_kwargs
=
{
'
created_by
'
:
{
'
default
'
:
serializers
.
CurrentUserDefault
()}}
fields
=
(
'
task
'
,
'
date
'
,
'
accepted
'
,
'
files
'
,
'
created_by
'
)
def
validate
(
self
,
attrs
):
task
=
attrs
[
'
task
'
]
date
=
attrs
[
'
date
'
]
if
task
.
deadline
<
date
:
raise
serializers
.
ValidationError
(
"
You cannot submit homework after the deadline
"
)
return
attrs
#
def validate(self, attrs):
#
task = attrs['task']
#
date = attrs['date']
#
#
if task.deadline < date:
#
raise serializers.ValidationError("You cannot submit homework after the deadline")
#
#
return attrs
This diff is collapsed.
Click to expand it.
src/homework/views.py
+
20
−
21
View file @
4eb1394a
...
...
@@ -4,6 +4,8 @@ from rest_framework import status
from
rest_framework.decorators
import
list_route
from
django.http
import
Http404
from
django.shortcuts
import
get_object_or_404
import
datetime
from
django.utils.timezone
import
utc
from
.
import
serializers
from
.
import
models
...
...
@@ -21,24 +23,21 @@ class SolutionsViewSet(viewsets.ModelViewSet):
queryset
=
models
.
Solution
.
objects
.
all
()
permission_classes
=
(
permissions
.
IsStaffOrReadOnlyForAuthenticated
,
)
def
create
(
self
,
request
,
*
args
,
**
kwargs
):
serializer
=
self
.
get_serializer
(
data
=
request
.
data
)
serializer
.
is_valid
(
raise_exception
=
True
)
# serializer.validated_data['accepted'] = False
# task_id = serializer.validated_data.get('task')
# date = serializer.validated_data['date']
# task = get_object_or_404(models.Task, pk=task_id)
# if task_id.deadline < date:
# return Http404("Deadline")
headers
=
self
.
get_success_headers
(
serializer
.
data
)
return
Response
(
serializer
.
data
,
status
=
status
.
HTTP_201_CREATED
,
headers
=
headers
)
def
get_queryset
(
self
):
user
=
self
.
request
.
user
if
user
.
has_perm
(
permissions
.
IsStaffUser
):
return
models
.
Solution
.
objects
.
all
()
@list_route
(
methods
=
[
'
get
'
])
def
me
(
self
,
request
):
serializer
=
self
.
serializer_class
(
request
.
user
.
profile
)
#request ?
return
Response
(
serializer
.
data
)
\ No newline at end of file
def
perform_create
(
self
,
serializer
):
serializer
.
validated_data
[
'
accepted
'
]
=
False
task
=
serializer
.
validated_data
[
'
task
'
]
# task = get_object_or_404(models.Task, pk=task_id.id)
now
=
datetime
.
datetime
.
utcnow
().
replace
(
tzinfo
=
utc
)
if
task
.
deadline
<
now
:
raise
Http404
(
"
Deadline
"
)
serializer
.
save
()
# def get_queryset(self):
# user = self.request.user
# if user.has_perm(permissions.IsStaffUser):
# return models.Solution.objects.all()
#
# @list_route(methods=['get'])
# def me(self, request):
# serializer = self.serializer_class(request.user.profile) #request ?
# return Response(serializer.data)
\ No newline at end of file
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