patch oko teksta PDFa i UI tablica
Some checks failed
ERP CI/CD Pipeline / test (push) Has been cancelled
ERP CI/CD Pipeline / Deploy (server git pull + compose) (push) Has been cancelled

This commit is contained in:
mariomitte
2026-07-12 03:25:03 +02:00
parent 3b54499b17
commit 4e3bf6dab0
40 changed files with 2149 additions and 331 deletions

View File

@@ -18,6 +18,9 @@ class TaskService:
raise ValidationError({"status": "Samo admini mogu odmah označiti zadatak kao gotov."})
payload = dict(data)
title = (payload.get('title') or '').strip()
if title and len(title) < 3:
raise ValidationError({"title": "Naslov zadatka mora imati barem 3 znaka."})
if user and 'assigned_to' not in payload:
payload['assigned_to'] = user
@@ -40,6 +43,8 @@ class TaskService:
# Spremanje
for attr, value in data.items():
setattr(instance, attr, value)
if 'title' in data and len(str(data.get('title') or '').strip()) < 3:
raise ValidationError({"title": "Naslov zadatka mora imati barem 3 znaka."})
try:
instance.full_clean()
except DjangoValidationError as exc:

View File

@@ -7,26 +7,28 @@ from modules.fleet.models import Vehicle, WorkOrder
class TaskSerializerTests(TestCase):
def setUp(self):
User = get_user_model()
self.user = User.objects.create_user(username="task-user-base", email="task-user-base@example.test", password="pass")
self.vehicle = Vehicle.objects.create(registration_number="ZG-TSK-01", asset_type='crane')
def test_validate_title_too_short_raises(self):
serializer = TaskSerializer(data={"title": "ab", "description": "", "status": "aktivan"})
serializer = TaskSerializer(data={"title": "ab", "description": "", "status": "aktivan", "vehicle": str(self.vehicle.id)})
with self.assertRaises(ValidationError):
serializer.is_valid(raise_exception=True)
def test_validate_title_ok(self):
serializer = TaskSerializer(data={"title": "Valid title", "description": "", "status": "aktivan"})
serializer = TaskSerializer(data={"title": "Valid title", "description": "", "status": "aktivan", "vehicle": str(self.vehicle.id)})
assert serializer.is_valid(), serializer.errors
def test_cannot_close_without_work_order(self):
serializer = TaskSerializer(data={"title": "Task 1", "description": "", "status": "neaktivan"})
serializer = TaskSerializer(data={"title": "Task 1", "description": "", "status": "neaktivan", "vehicle": str(self.vehicle.id)})
with self.assertRaises(ValidationError):
serializer.is_valid(raise_exception=True)
def test_can_close_with_work_order(self):
User = get_user_model()
user = User.objects.create_user(username="task-user", email="task-user@example.test", password="pass")
vehicle = Vehicle.objects.create(registration_number="ZG-TSK-02", asset_type='crane')
work_order = WorkOrder.objects.create(vehicle=vehicle, creator=user, purpose='defektaza')
task = Task.objects.create(title="Task 2", description="", status="servis", assigned_to=user)
work_order = WorkOrder.objects.create(vehicle=self.vehicle, creator=self.user, purpose='defektaza')
task = Task.objects.create(title="Task 2", description="", status="servis", assigned_to=self.user, vehicle=self.vehicle)
serializer = TaskSerializer(instance=task, data={"status": "neaktivan", "work_order": str(work_order.id)}, partial=True)
assert serializer.is_valid(), serializer.errors

View File

@@ -5,6 +5,7 @@ from unittest.mock import patch
from modules.task_management.views import TaskViewSet
from modules.task_management.serializers import TaskSerializer
from modules.task_management.models import Task
from modules.fleet.models import Vehicle
class TaskViewSetTests(TestCase):
@@ -15,10 +16,11 @@ class TaskViewSetTests(TestCase):
self.view = TaskViewSet()
self.view.request = self.factory.post("/")
self.view.request.user = self.user
self.vehicle = Vehicle.objects.create(registration_number="ZG-TV-01", asset_type='crane')
@patch("modules.task_management.views.TaskService.create_task_entry")
def test_perform_create_calls_service(self, mock_create):
data = {"title": "Task from view", "description": "", "status": "aktivan"}
data = {"title": "Task from view", "description": "", "status": "aktivan", "vehicle": str(self.vehicle.id)}
serializer = TaskSerializer(data=data, context={"request": self.view.request})
assert serializer.is_valid(), serializer.errors