Skip to content

Commit f6730d3

Browse files
authored
Merge pull request #177 from pneumaticapp/backend/tasks/44805__remove_empty_placeholders
Backend/tasks/44805 remove empty placeholders
2 parents 3aba107 + 28d9ef7 commit f6730d3

22 files changed

Lines changed: 6912 additions & 1891 deletions

backend/src/processes/models/workflows/task.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ def _get_raw_performers_fields_dict(
223223
api_names.add(raw_performer_template['field']['api_name'])
224224
if api_names:
225225
fields_dict = self.workflow.get_fields_as_dict(
226-
tasks_filter_kwargs={'task__number__lt': self.number},
227226
fields_filter_kwargs={
228227
'type': FieldType.USER,
229228
'api_name__in': api_names,
@@ -368,7 +367,6 @@ def update_performers(
368367

369368
if api_names:
370369
user_fields = self.workflow.get_fields(
371-
tasks_filter_kwargs={'task__number__lt': self.number},
372370
fields_filter_kwargs={
373371
'type': FieldType.USER,
374372
'api_name__in': api_names.keys(),

backend/src/processes/serializers/workflows/mixins.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from django.contrib.auth import get_user_model
44

55
from src.processes.consts import WORKFLOW_NAME_LENGTH
6-
from src.processes.enums import TaskStatus
76
from src.processes.serializers.workflows.kickoff_value import (
87
KickoffValueSerializer,
98
)
@@ -26,8 +25,7 @@ def _update_tasks(
2625
if is_urgent is not None and not update_fields_values:
2726
tasks.update(is_urgent=is_urgent)
2827
elif update_fields_values:
29-
fields_values = self.instance.get_fields_markdown_values(
30-
tasks_filter_kwargs={'task__status': TaskStatus.COMPLETED})
28+
fields_values = self.instance.get_fields_markdown_values()
3129
for task in tasks:
3230
task_service = TaskService(
3331
instance=task,

backend/src/processes/serializers/workflows/workflow.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,6 @@ class Meta:
216216
is_urgent = serializers.BooleanField(required=False)
217217
due_date_tsp = TimeStampField(required=False, allow_null=True)
218218

219-
def validate_due_date(self, value):
220-
if value and value <= timezone.now():
221-
raise ValidationError(messages.MSG_PW_0051)
222-
return value
223-
224219
def validate_due_date_tsp(self, value):
225220
if value and value <= timezone.now():
226221
raise ValidationError(messages.MSG_PW_0051)
@@ -308,7 +303,7 @@ def validate(self, attrs):
308303
Q(id=task_id) | Q(api_name=task_api_name),
309304
).first()
310305
if task is None:
311-
raise ValidationError(messages.MSG_PW_0076)
306+
raise ValidationError(messages.MSG_PW_0077)
312307
if not task.is_active:
313308
raise ValidationError(messages.MSG_PW_0086)
314309

backend/src/processes/services/tasks/task_version.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
send_new_task_notification,
99
send_removed_task_notification, send_new_task_websocket,
1010
)
11-
from src.processes.enums import TaskStatus
1211
from src.processes.models.workflows.checklist import (
1312
ChecklistSelection,
1413
)
@@ -415,20 +414,18 @@ def update_from_version(
415414
"""
416415

417416
workflow = kwargs['workflow']
418-
completed_tasks_fields_values = workflow.get_fields_markdown_values(
419-
tasks_filter_kwargs={'task__status': TaskStatus.COMPLETED},
420-
)
417+
tasks_fields_values = workflow.get_fields_markdown_values()
421418
self._create_or_update_instance(
422419
data=data,
423420
workflow=workflow,
424-
fields_values=completed_tasks_fields_values,
421+
fields_values=tasks_fields_values,
425422
)
426423
self._update_fields(data=data.get('fields'))
427424
self._update_conditions(data=data.get('conditions'))
428425
self._update_checklists(
429426
data=data.get('checklists'),
430427
version=version,
431-
fields_values=completed_tasks_fields_values,
428+
fields_values=tasks_fields_values,
432429
)
433430
self._update_delay(new_duration=data.get('delay'))
434431
# Don't snooze active tasks if delay created

backend/src/processes/services/workflow_action.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -318,16 +318,10 @@ def skip_task(
318318
instance=task,
319319
user=self.user or self.workflow.account.get_owner(),
320320
)
321-
fields_values = self.workflow.get_fields_markdown_values(
322-
tasks_filter_kwargs={'task__status__in': (
323-
TaskStatus.COMPLETED, TaskStatus.SKIPPED,
324-
)},
325-
)
326-
321+
fields_values = self.workflow.get_fields_markdown_values()
327322
fields_values['workflow-starter'] = get_workflow_starter_name(
328323
self.workflow.workflow_starter,
329324
)
330-
331325
task_service.insert_fields_values(fields_values=fields_values)
332326

333327
WorkflowEventService.task_skip_event(task)
@@ -639,16 +633,10 @@ def start_task(
639633
instance=task,
640634
user=self.user or self.workflow.account.get_owner(),
641635
)
642-
fields_values = self.workflow.get_fields_markdown_values(
643-
tasks_filter_kwargs={'task__status__in': (
644-
TaskStatus.COMPLETED, TaskStatus.SKIPPED,
645-
)},
646-
)
647-
636+
fields_values = self.workflow.get_fields_markdown_values()
648637
fields_values['workflow-starter'] = get_workflow_starter_name(
649638
self.workflow.workflow_starter,
650639
)
651-
652640
task_service.insert_fields_values(fields_values=fields_values)
653641
task.update_performers(restore_performers=True)
654642
task_performers_exists = (

backend/src/processes/tests/fixtures.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ def create_test_user(
166166
) -> UserModel:
167167

168168
"""
169+
TODO Do not call directly!
169170
Creating users with custom configuration.
170171
Instead of this method use:
171172
- create_test_owner

0 commit comments

Comments
 (0)