From 5755abcbb20eb011bb9e5fc3dbfad2f3794784d4 Mon Sep 17 00:00:00 2001
From: Aleksandr Kolchugin <akolchugin@cubewise.com>
Date: Fri, 22 Nov 2024 01:13:26 +0100
Subject: [PATCH] fixed extraction of expanded tasks

The function has generated wrong execution order if processes have the same ID
---
 .vscode/launch.json               |  16 ++++++++++++++++
 __pycache__/utils.cpython-310.pyc | Bin 0 -> 4415 bytes
 rushti.py                         |   8 ++++++--
 3 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/launch.json
 create mode 100644 __pycache__/utils.cpython-310.pyc

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..c727cea
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python Debugger: Current File",
+            "type": "debugpy",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal",
+            "args": ["C:\\Scripts\\rushti\\tasks_opt_case2.txt","4","opt"]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/__pycache__/utils.cpython-310.pyc b/__pycache__/utils.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..17f7320eb1c0c1a4d76bf1af9615078940b60633
GIT binary patch
literal 4415
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
R%VNJ)tyPxKE?+uR{V)3`?hXI|

literal 0
HcmV?d00001

diff --git a/rushti.py b/rushti.py
index c9b1cee..9572302 100644
--- a/rushti.py
+++ b/rushti.py
@@ -330,12 +330,16 @@ def extract_tasks_from_file_type_opt(
                     tasks[task.id].append(task)
 
     # expand tasks
+    expanded_tasks = dict()
     if expand:
         for task_id in tasks:
             for task in tasks[task_id]:
                 for expanded_task in expand_task(tm1_services, task):
-                    tasks[task.id].append(expanded_task)
-                tasks[task.id].remove(task)
+                    if task.id not in expanded_tasks:
+                        expanded_tasks[task.id] = [expanded_task]
+                    else:
+                        expanded_tasks[task.id].append(expanded_task)
+        tasks = expanded_tasks
 
     # Populate the successors attribute
     for task_id in tasks: