feat(main): Add treeid field

Add treeid field handling Signed-off-by: Denys Fedoryshchenko <denys.f@collabora.com>
kernelci · Sep 4, 2024 · 06269ef · 06269ef
1 parent abf2609
commit 06269ef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/api/main.py b/api/main.py
@@ -633,13 +633,14 @@ async def put_node(node_id: str, node: Node,
 
 
 async def _set_node_ownership_recursively(user: User, hierarchy: Hierarchy,
-                                          submitter: str):
+                                          submitter: str, treeid: str):
     """Set node ownership information for a hierarchy of nodes"""
     if not hierarchy.node.owner:
         hierarchy.node.owner = user.username
     hierarchy.node.submitter = submitter
+    hierarchy.node.treeid = treeid
     for node in hierarchy.child_nodes:
-        await _set_node_ownership_recursively(user, node, submitter)
+        await _set_node_ownership_recursively(user, node, submitter, treeid)
 
 
 @app.put('/nodes/{node_id}', response_model=List[Node],
@@ -658,8 +659,9 @@ async def put_nodes(
             detail=f"Node not found with id: {node_id}"
         )
     submitter = node_from_id.submitter
+    treeid = node_from_id.treeid
 
-    await _set_node_ownership_recursively(user, nodes, submitter)
+    await _set_node_ownership_recursively(user, nodes, submitter, treeid)
     obj_list = await db.create_hierarchy(nodes, Node)
     data = _get_node_event_data('updated', obj_list[0], True)
     attributes = {}

diff --git a/tests/unit_tests/test_node_handler.py b/tests/unit_tests/test_node_handler.py
@@ -81,6 +81,7 @@ def test_create_node_endpoint(mock_db_create, mock_publish_cloudevent,
         'submitter',
         'state',
         'timeout',
+        'treeid',
         'updated',
         'user_groups',
     }
@@ -235,6 +236,7 @@ def test_get_node_by_id_endpoint(mock_db_find_by_id,
         'submitter',
         'state',
         'timeout',
+        'treeid',
         'updated',
         'user_groups',
     }
@@ -284,6 +286,7 @@ def test_get_all_nodes(mock_db_find_by_attributes,
         "parent": None,
         "state": "closing",
         "result": None,
+        "treeid": "61bda8f2eb1a63d2b7152418",
     }
 
     node_obj_2 = {
@@ -305,6 +308,7 @@ def test_get_all_nodes(mock_db_find_by_attributes,
         "parent": None,
         "state": "closing",
         "result": None,
+        "treeid": "61bda8f2eb1a63d2b7152418",
     }
 
     node_obj_3 = {
@@ -326,6 +330,7 @@ def test_get_all_nodes(mock_db_find_by_attributes,
         "parent": None,
         "state": "closing",
         "result": None,
+        "treeid": "61bda8f2eb1a63d2b7152418",
     }
 
     mock_db_find_by_attributes.return_value = PageModel(