Merge pull request #181 from pneumaticapp/backend/workflow/45289__the_task_name_is_substituted_with_raw_text_workflow_starter

45289 backend [ workflow ] The task name is substituted with raw text {{workflow starter}}

Author: Maria-Lordwill

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

@@ -16,6 +16,7 @@
     TaskFieldQuerySet,
     WorkflowQuerySet,
 )
+from src.processes.utils.common import get_workflow_starter_name
 
 UserModel = get_user_model()
 
@@ -185,3 +186,39 @@ def is_running(self):
     @property
     def is_completed(self):
         return self.status == WorkflowStatus.DONE
+
+    def get_kickoff_fields_markdown_values(
+        self,
+        fields_filter_kwargs: Optional[Dict] = None,
+    ) -> Dict[str, str]:
+        """Extends parent method by adding the workflow-starter
+            system variable to the substitution dictionary."""
+
+        fields_values = super().get_kickoff_fields_markdown_values(
+            fields_filter_kwargs=fields_filter_kwargs,
+        )
+
+        fields_values['workflow-starter'] = get_workflow_starter_name(
+            self.workflow_starter,
+        )
+        return fields_values
+
+    def get_fields_markdown_values(
+        self,
+        tasks_filter_kwargs: Optional[Dict] = None,
+        tasks_exclude_kwargs: Optional[Dict] = None,
+        fields_filter_kwargs: Optional[Dict] = None,
+    ) -> Dict[str, str]:
+        """Extends parent method by adding the workflow-starter
+            system variable to the substitution dictionary."""
+
+        fields_values = super().get_fields_markdown_values(
+            tasks_filter_kwargs=tasks_filter_kwargs,
+            tasks_exclude_kwargs=tasks_exclude_kwargs,
+            fields_filter_kwargs=fields_filter_kwargs,
+        )
+
+        fields_values['workflow-starter'] = get_workflow_starter_name(
+            self.workflow_starter,
+        )
+        return fields_values

backend/src/processes/services/workflow_action.py

@@ -7,7 +7,6 @@
 from django.db.models import Q
 from django.utils import timezone
 
-from src.processes.utils.common import get_workflow_starter_name
 from src.analysis.services import AnalyticService
 from src.authentication.enums import AuthTokenType
 from src.authentication.services.guest_auth import GuestJWTAuthService
@@ -319,9 +318,6 @@ def skip_task(
             user=self.user or self.workflow.account.get_owner(),
         )
         fields_values = self.workflow.get_fields_markdown_values()
-        fields_values['workflow-starter'] = get_workflow_starter_name(
-            self.workflow.workflow_starter,
-        )
         task_service.insert_fields_values(fields_values=fields_values)
 
         WorkflowEventService.task_skip_event(task)
@@ -403,9 +399,6 @@ def start_workflow(self):
         for task in tasks:
             task_service = TaskService(instance=task, user=self.user)
             fields_values = self.workflow.get_kickoff_fields_markdown_values()
-            fields_values['workflow-starter'] = get_workflow_starter_name(
-                self.workflow.workflow_starter,
-            )
 
             task_service.insert_fields_values(fields_values=fields_values)
 
@@ -634,9 +627,6 @@ def start_task(
             user=self.user or self.workflow.account.get_owner(),
         )
         fields_values = self.workflow.get_fields_markdown_values()
-        fields_values['workflow-starter'] = get_workflow_starter_name(
-            self.workflow.workflow_starter,
-        )
         task_service.insert_fields_values(fields_values=fields_values)
         task.update_performers(restore_performers=True)
         task_performers_exists = (

backend/src/processes/tests/test_models/test_workflow.py

@@ -80,3 +80,27 @@ def test_get_kickoff_fields_values__ok(self, mocker):
 
         # assert
         kickoff_output_fields_mock.assert_called_once()
+
+    def test_get_fields_markdown_values__workflow_starter__ok(self):
+        # arrange
+        user = create_test_user()
+        workflow = create_test_workflow(user=user)
+
+        # act
+        fields_values = workflow.get_fields_markdown_values()
+
+        # assert
+        assert 'workflow-starter' in fields_values
+        assert fields_values['workflow-starter'] == user.name
+
+    def test_get_kickoff_fields_markdown_values__workflow_starter__ok(self):
+        # arrange
+        user = create_test_user()
+        workflow = create_test_workflow(user=user)
+
+        # act
+        fields_values = workflow.get_kickoff_fields_markdown_values()
+
+        # assert
+        assert 'workflow-starter' in fields_values
+        assert fields_values['workflow-starter'] == user.name

backend/src/processes/tests/test_services/test_tasks/test_task_version_service.py

@@ -220,17 +220,21 @@ def test_update_from_version__only_required_fields__ok(mocker):
     )
 
     # assert
+    expected_fields_values = {
+        field_api_name: field_markdown_value,
+        'workflow-starter': user.name,
+    }
     create_or_update_instance_mock.assert_called_once_with(
         data=data,
         workflow=workflow,
-        fields_values={field_api_name: field_markdown_value},
+        fields_values=expected_fields_values,
     )
     update_fields_mock.assert_called_once_with(data=None)
     update_conditions_mock.assert_called_once_with(data=None)
     update_checklists_mock.assert_called_once_with(
         data=None,
         version=version,
-        fields_values={field_api_name: field_markdown_value},
+        fields_values=expected_fields_values,
     )
     update_raw_due_date_mock.assert_called_once_with(data=None)
     set_due_date_from_template.assert_called_once()
@@ -376,10 +380,14 @@ def test_update_from_version__all_fields__active_task__ok(mocker):
     )
 
     # assert
+    expected_fields_values = {
+        field_api_name: field_markdown_value,
+        'workflow-starter': user.name,
+    }
     create_or_update_instance_mock.assert_called_once_with(
         data=data,
         workflow=workflow,
-        fields_values={field_api_name: field_markdown_value},
+        fields_values=expected_fields_values,
     )
     update_fields_mock.assert_called_once_with(
         data=data['fields'],
@@ -390,7 +398,7 @@ def test_update_from_version__all_fields__active_task__ok(mocker):
     update_checklists_mock.assert_called_once_with(
         data=data['checklists'],
         version=version,
-        fields_values={field_api_name: field_markdown_value},
+        fields_values=expected_fields_values,
     )
     update_raw_due_date_mock.assert_called_once_with(
         data=data['raw_due_date'],
@@ -540,10 +548,14 @@ def test_update_from_version__inactive_task_field_value__insert_null(
     )
 
     # assert
+    expected_fields_values = {
+        field_api_name: None,
+        'workflow-starter': user.name,
+    }
     create_or_update_instance_mock.assert_called_once_with(
         data=data,
         workflow=workflow,
-        fields_values={field_api_name: None},
+        fields_values=expected_fields_values,
     )
     update_fields_mock.assert_called_once_with(
         data=data['fields'],
@@ -554,7 +566,7 @@ def test_update_from_version__inactive_task_field_value__insert_null(
     update_checklists_mock.assert_called_once_with(
         data=data['checklists'],
         version=version,
-        fields_values={field_api_name: None},
+        fields_values=expected_fields_values,
     )
     update_raw_due_date_mock.assert_called_once_with(
         data=data['raw_due_date'],

frontend/src/public/lang/locales/ru_RU.ts

@@ -800,7 +800,7 @@ export const ruMessages = {
   'workflows.log-workflow-ended': 'Процесс завершен',
   'workflows.log-comment-field-placeholder': 'Ваш комментарий...',
   'workflows.log-task-started': 'Начато',
-  'workflows.log-skipped-tasks': 'Пропущенные',
+  'workflows.log-skipped-tasks': 'Пропущено',
   'workflows.log-task-skipped': 'Шаг пропущен по условию',
   'workflows.empty-tasks-reminder': 'Пожалуйста, создайте ваш первый шаблон и запустите Процесс:',
   'workflows.tasks-failed-to-delete-file': 'Не удалось удалить файл',
@@ -834,7 +834,7 @@ export const ruMessages = {
   'workflows.user-added': 'Пользователь добавлен',
   'workflows.user-removed': 'Пользователь удален',
   'workflows.name': 'Название процесса',
-  'workflows.tooltip-header': 'Завершено {completedTasks} из {tasksCountWithoutSkipped}',
+  'workflows.tooltip-header': 'Выполнено {completedTasks} из {tasksCountWithoutSkipped}',
   'workflows.checklists-header': 'Чек листы',
   'workflows.checklists-counter': '{marked}/{total}',
   'workflows.event-snoozed-until': 'Процесс отложен до {date}',