Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hr/api_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Position,
)
from hr.pagination import SmallSetPagination
from hr.permissions import IsNotRussianEmail
from hr.permissions import IsNotRussianEmail, EmployeePermission
from hr.pydantic_models import WorkingDays
from hr.serializers import (
EmployeeSerializer,
Expand All @@ -27,7 +27,7 @@ class EmployeeViewSet(viewsets.ModelViewSet):
queryset = Employee.objects.all().order_by()
serializer_class = EmployeeSerializer
pagination_class = SmallSetPagination
permission_classes = [IsNotRussianEmail]
permission_classes = [IsNotRussianEmail, EmployeePermission]

def get_queryset(self):
queryset = super().get_queryset()
Expand Down
4 changes: 4 additions & 0 deletions hr/permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ def has_permission(self, request, view):
if request.user and request.user.email:
return not request.user.email.endswith('.ru')
return False

class EmployeePermission(permissions.BasePermission):
def has_object_permission(self, request, view, obj):
return obj.position is not None
11 changes: 8 additions & 3 deletions hr/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Employee,
Position,
)
from hr.validators import validate_positive
from hr.validators import validate_positive, validate_holiday_days


class EmployeeSerializer(serializers.ModelSerializer):
Expand All @@ -21,8 +21,8 @@ class Meta:

class SalarySerializer(serializers.Serializer):
employee = serializers.PrimaryKeyRelatedField(queryset=Employee.objects.all())
working_days = serializers.IntegerField(validators=[validate_positive])
holiday_days = serializers.IntegerField()
working_days = serializers.IntegerField(validators=[validate_positive], max_value=31)
holiday_days = serializers.IntegerField(validators=[validate_holiday_days])
sick_days = serializers.IntegerField(default=0, max_value=4)
vacation_days = serializers.IntegerField(default=0)

Expand All @@ -44,3 +44,8 @@ def validate_sick_days(self, value):
if value > 3:
raise serializers.ValidationError('The number of sick days cannot be more than 3.')
return value

def validate_vacation_days(self, value):
if value > 5:
raise serializers.ValidationError('The number of vacation days cannot be more than 5.')
return value
4 changes: 4 additions & 0 deletions hr/validators.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,7 @@
def validate_positive(value):
if value < 0:
raise serializers.ValidationError('This field must be positive.')

def validate_holiday_days(value):
if value > 10:
raise serializers.ValidationError('This field must be between 1 and 10.')
29 changes: 26 additions & 3 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions poetry.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[virtualenvs]
in-project = true