infrahub-server 1.6.3__py3-none-any.whl → 1.7.0b0__py3-none-any.whl

infrahub/core/diff/query/merge.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
+from infrahub.core.constants import GLOBAL_BRANCH_NAME
 from infrahub.core.query import Query, QueryType
 
 if TYPE_CHECKING:
@@ -14,6 +15,7 @@ class DiffMergeQuery(Query):
     name = "diff_merge"
     type = QueryType.WRITE
     insert_return = False
+    raise_error_if_empty = False
 
     def __init__(
         self,
@@ -56,7 +58,7 @@ END AS node_db_id
 // ------------------------------
 CALL (node_diff_map, node_db_id) {
     MATCH (n:Node {uuid: node_diff_map.uuid})-[n_is_part_of:IS_PART_OF]->(:Root)
-    WHERE node_db_id IS NULL OR %(id_func)s(n) = node_db_id
+    WHERE node_db_id IS NULL OR elementId(n) = node_db_id
     AND n_is_part_of.branch IN [$source_branch, $target_branch]
     RETURN n
     ORDER BY n_is_part_of.branch_level DESC, n_is_part_of.from DESC, n_is_part_of.status ASC
@@ -79,65 +81,80 @@ CALL (n, node_diff_map, is_node_kind_migration) {
         AND is_node_kind_migration = FALSE
         MATCH (root:Root)
         // ------------------------------
+        // get from_user_id from source branch edge for creating new edges
+        // and to_user_id from source branch deleted edge for closing edges
+        // ------------------------------
+        CALL (n, root, node_rel_status) {
+            OPTIONAL MATCH (n)-[source_is_part_of:IS_PART_OF {branch: $source_branch, status: node_rel_status}]->(root)
+            WHERE source_is_part_of.from <= $at AND source_is_part_of.to IS NULL
+            RETURN source_is_part_of.from_user_id AS source_from_user_id
+            ORDER BY source_is_part_of.from DESC
+            LIMIT 1
+        }
+        // ------------------------------
         // set IS_PART_OF.to, optionally, target branch
         // ------------------------------
-        WITH root, n, node_rel_status
-        CALL (root, n, node_rel_status) {
+        WITH root, n, node_rel_status, source_from_user_id
+        CALL (root, n, node_rel_status, source_from_user_id) {
             OPTIONAL MATCH (root)<-[target_r_root:IS_PART_OF {branch: $target_branch, status: "active"}]-(n)
             WHERE node_rel_status = "deleted"
             AND target_r_root.from <= $at AND target_r_root.to IS NULL
-            SET target_r_root.to = $at
+            SET target_r_root.to = $at, target_r_root.to_user_id = source_from_user_id
         }
         // ------------------------------
         // create new IS_PART_OF relationship on target_branch
+        // also set created_at/created_by on Node vertex when adding
         // ------------------------------
-        WITH root, n, node_rel_status
-        CALL (root, n, node_rel_status) {
+        WITH root, n, node_rel_status, source_from_user_id
+        CALL (root, n, node_rel_status, source_from_user_id) {
             OPTIONAL MATCH (root)<-[r_root:IS_PART_OF {branch: $target_branch}]-(n)
             WHERE r_root.status = node_rel_status
             AND r_root.from <= $at
             AND (r_root.to >= $at OR r_root.to IS NULL)
-            WITH r_root
+            WITH n, r_root, source_from_user_id
             WHERE r_root IS NULL
             CREATE (root)
-                <-[:IS_PART_OF { branch: $target_branch, branch_level: $branch_level, from: $at, status: node_rel_status }]
+                <-[:IS_PART_OF { branch: $target_branch, branch_level: $branch_level, from: $at, status: node_rel_status, from_user_id: source_from_user_id }]
                 -(n)
+            WITH node_rel_status
+            WHERE node_rel_status = "active"
+            SET n.created_at = $at, n.created_by = source_from_user_id
         }
         // ------------------------------
         // shortcut to delete all attributes and relationships for this node if the node is deleted
         // ------------------------------
-        CALL (n, node_rel_status) {
-            WITH n, node_rel_status
+        CALL (n, node_rel_status, source_from_user_id) {
+            WITH n, node_rel_status, source_from_user_id
             WHERE node_rel_status = "deleted"
             CALL (n) {
-                OPTIONAL MATCH (n)-[rel1:IS_RELATED]-(:Relationship)-[rel2]-(p)
+                OPTIONAL MATCH (n)-[rel1:IS_RELATED]-(attr_rel:Relationship)-[rel2]-(p)
                 WHERE (p.uuid IS NULL OR n.uuid <> p.uuid)
                 AND rel1.branch = $target_branch
                 AND rel2.branch = $target_branch
                 AND rel1.status = "active"
                 AND rel2.status = "active"
-                RETURN rel1, rel2
+                RETURN rel1, rel2, attr_rel
                 UNION
-                OPTIONAL MATCH (n)-[rel1:HAS_ATTRIBUTE]->(:Attribute)-[rel2]->()
+                OPTIONAL MATCH (n)-[rel1:HAS_ATTRIBUTE]->(attr_rel:Attribute)-[rel2]->()
                 WHERE type(rel2) <> "HAS_ATTRIBUTE"
                 AND rel1.branch = $target_branch
                 AND rel2.branch = $target_branch
                 AND rel1.status = "active"
                 AND rel2.status = "active"
-                RETURN rel1, rel2
+                RETURN rel1, rel2, attr_rel
             }
-            WITH rel1, rel2
+            WITH rel1, rel2, attr_rel, source_from_user_id
             WHERE rel1.to IS NULL
             AND rel2.to IS NULL
             AND rel1.from <= $at
             AND rel2.from <= $at
-            SET rel1.to = $at
-            SET rel2.to = $at
+            SET rel1.to = $at, rel1.to_user_id = source_from_user_id
+            SET rel2.to = $at, rel2.to_user_id = source_from_user_id
             // ------------------------------
             // and delete HAS_OWNER and HAS_SOURCE edges to this node if the node is deleted
             // ------------------------------
-            WITH n
-            CALL (n) {
+            WITH n, source_from_user_id
+            CALL (n, source_from_user_id) {
                 CALL (n) {
                     MATCH (n)<-[rel:HAS_OWNER]-()
                     WHERE rel.branch = $target_branch
@@ -153,7 +170,7 @@ CALL (n, node_diff_map, is_node_kind_migration) {
                     AND rel.to IS NULL
                     RETURN rel
                 }
-                SET rel.to = $at
+                SET rel.to = $at, rel.to_user_id = source_from_user_id
             }
         }
     }
@@ -180,32 +197,48 @@ CALL (n, node_diff_map, is_node_kind_migration) {
                 ORDER BY has_attr.from DESC
                 LIMIT 1
             }
-            WITH n, attr_rel_status, a
+            // ------------------------------
+            // get from_user_id from source branch edge
+            // ------------------------------
+            CALL (n, a, attr_rel_status) {
+                OPTIONAL MATCH (n)-[source_has_attr:HAS_ATTRIBUTE {branch: $source_branch, status: attr_rel_status}]->(a)
+                WHERE source_has_attr.from <= $at AND source_has_attr.to IS NULL
+                RETURN source_has_attr.from_user_id AS attr_source_from_user_id
+                ORDER BY source_has_attr.from DESC
+                LIMIT 1
+            }
+            WITH n, attr_rel_status, a, attr_source_from_user_id
             // ------------------------------
             // set HAS_ATTRIBUTE.to on target branch if necessary
+            // set Attribute.created_at/by vertex when adding
             // ------------------------------
-            CALL (n, attr_rel_status, a) {
+            CALL (n, attr_rel_status, a, attr_source_from_user_id) {
                 OPTIONAL MATCH (n)
                     -[target_r_attr:HAS_ATTRIBUTE {branch: $target_branch, status: "active"}]
                     ->(a)
                 WHERE attr_rel_status = "deleted"
                 AND target_r_attr.from <= $at AND target_r_attr.to IS NULL
-                SET target_r_attr.to = $at
+                SET target_r_attr.to = $at, target_r_attr.to_user_id = attr_source_from_user_id
             }
-            WITH n, attr_rel_status, a
+            WITH n, attr_rel_status, a, attr_source_from_user_id
             // ------------------------------
             // conditionally create new HAS_ATTRIBUTE relationship on target_branch, if necessary
+            // also set created_at/created_by on Attribute vertex when adding
             // ------------------------------
-            CALL (n, attr_rel_status, a) {
-                WITH n, attr_rel_status, a
+            CALL (n, attr_rel_status, a, attr_source_from_user_id) {
+                WITH n, attr_rel_status, a, attr_source_from_user_id
                 WHERE a IS NOT NULL
                 OPTIONAL MATCH (n)-[r_attr:HAS_ATTRIBUTE {branch: $target_branch}]->(a)
                 WHERE r_attr.status = attr_rel_status
                 AND r_attr.from <= $at
                 AND (r_attr.to >= $at OR r_attr.to IS NULL)
-                WITH r_attr
+                WITH a, r_attr, attr_source_from_user_id
                 WHERE r_attr IS NULL
-                CREATE (n)-[:HAS_ATTRIBUTE { branch: $target_branch, branch_level: $branch_level, from: $at, status: attr_rel_status }]->(a)
+                CREATE (n)-[:HAS_ATTRIBUTE { branch: $target_branch, branch_level: $branch_level, from: $at, status: attr_rel_status, from_user_id: attr_source_from_user_id }]->(a)
+                WITH attr_rel_status
+                WHERE attr_rel_status = "active"
+                AND a.created_at IS NULL
+                SET a.created_at = $at, a.created_by = attr_source_from_user_id
             }
             RETURN 1 AS done
         }
@@ -236,7 +269,7 @@ CALL (n, node_diff_map, is_node_kind_migration) {
             // ------------------------------
             CALL (rel_peer_id, rel_peer_db_id) {
                 MATCH (rel_peer:Node {uuid: rel_peer_id})-[target_is_part_of:IS_PART_OF]->(:Root)
-                WHERE (rel_peer_db_id IS NULL OR %(id_func)s(rel_peer) = rel_peer_db_id)
+                WHERE (rel_peer_db_id IS NULL OR elementId(rel_peer) = rel_peer_db_id)
                 AND target_is_part_of.branch IN [$source_branch, $target_branch]
                 RETURN rel_peer
                 ORDER BY target_is_part_of.branch_level DESC, target_is_part_of.from DESC, target_is_part_of.status ASC
@@ -244,7 +277,7 @@ CALL (n, node_diff_map, is_node_kind_migration) {
             }
             WITH rel_name, related_rel_status, rel_peer
             // ------------------------------
-            // determine the directions of each IS_RELATED
+            // determine the directions of each IS_RELATED and get from_user_id from source branch
             // ------------------------------
             CALL (n, rel_name, rel_peer, related_rel_status) {
                 MATCH (n)
@@ -268,26 +301,32 @@ CALL (n, node_diff_map, is_node_kind_migration) {
                     ELSE "l"
                 END AS r2_dir,
                 source_r_rel_1.hierarchy AS r1_hierarchy,
-                source_r_rel_2.hierarchy AS r2_hierarchy
+                source_r_rel_2.hierarchy AS r2_hierarchy,
+                source_r_rel_1.from_user_id AS r1_from_user_id,
+                source_r_rel_2.from_user_id AS r2_from_user_id
             }
-            WITH n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, rel_name, rel_peer, related_rel_status
-            CALL (n, rel_name, rel_peer, related_rel_status) {
+            WITH n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, r1_from_user_id, r2_from_user_id, rel_name, rel_peer, related_rel_status
+            // ------------------------------
+            // set IS_RELATED.to on target branch when deleting relationship
+            // ------------------------------
+            CALL (n, r, rel_name, rel_peer, related_rel_status, r1_from_user_id, r2_from_user_id) {
                 OPTIONAL MATCH (n)
                     -[target_r_rel_1:IS_RELATED {branch: $target_branch, status: "active"}]
-                    -(:Relationship {name: rel_name})
+                    -(r:Relationship {name: rel_name})
                     -[target_r_rel_2:IS_RELATED {branch: $target_branch, status: "active"}]
                     -(rel_peer)
                 WHERE related_rel_status = "deleted"
                 AND target_r_rel_1.from <= $at AND target_r_rel_1.to IS NULL
                 AND target_r_rel_2.from <= $at AND target_r_rel_2.to IS NULL
-                SET target_r_rel_1.to = $at
-                SET target_r_rel_2.to = $at
+                SET target_r_rel_1.to = $at, target_r_rel_1.to_user_id = r1_from_user_id
+                SET target_r_rel_2.to = $at, target_r_rel_2.to_user_id = r2_from_user_id
             }
-            WITH n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, rel_name, rel_peer, related_rel_status
+            WITH n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, r1_from_user_id, r2_from_user_id, rel_name, rel_peer, related_rel_status
             // ------------------------------
             // conditionally create new IS_RELATED relationships on target_branch, if necessary
+            // also set created_at/created_by on Relationship vertex when adding
             // ------------------------------
-            CALL (n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, rel_name, rel_peer, related_rel_status) {
+            CALL (n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, r1_from_user_id, r2_from_user_id, rel_name, rel_peer, related_rel_status) {
                 OPTIONAL MATCH (n)
                     -[r_rel_1:IS_RELATED {branch: $target_branch, status: related_rel_status}]
                     -(:Relationship {name: rel_name})
@@ -297,46 +336,50 @@ CALL (n, node_diff_map, is_node_kind_migration) {
                 AND (r_rel_1.to >= $at OR r_rel_1.to IS NULL)
                 AND r_rel_2.from <= $at
                 AND (r_rel_2.to >= $at OR r_rel_2.to IS NULL)
-                WITH rel_peer, r_rel_1, r_rel_2
+                WITH r, rel_peer, r_rel_1, r_rel_2, r1_from_user_id, r2_from_user_id
                 WHERE r_rel_1 IS NULL
                 AND r_rel_2 IS NULL
+                WITH n, r, r1_dir, r2_dir, r1_hierarchy, r2_hierarchy, related_rel_status, r1_from_user_id, r2_from_user_id
                 // ------------------------------
                 // create IS_RELATED relationships with directions maintained from source
                 // ------------------------------
-                CALL (n, r, r1_dir, r1_hierarchy, related_rel_status) {
-                    WITH n, r, r1_dir, r1_hierarchy, related_rel_status
+                CALL (n, r, r1_dir, r1_hierarchy, related_rel_status, r1_from_user_id) {
+                    WITH n, r, r1_dir, r1_hierarchy, related_rel_status, r1_from_user_id
                     WHERE r1_dir = "r"
                     CREATE (n)
-                        -[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r1_hierarchy}]
+                        -[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r1_hierarchy, from_user_id: r1_from_user_id}]
                         ->(r)
                 }
-                CALL (n, r, r1_dir, r1_hierarchy, related_rel_status) {
-                    WITH n, r, r1_dir, r1_hierarchy, related_rel_status
+                CALL (n, r, r1_dir, r1_hierarchy, related_rel_status, r1_from_user_id) {
+                    WITH n, r, r1_dir, r1_hierarchy, related_rel_status, r1_from_user_id
                     WHERE r1_dir = "l"
                     CREATE (n)
-                        <-[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r1_hierarchy}]
+                        <-[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r1_hierarchy, from_user_id: r1_from_user_id}]
                         -(r)
                 }
-                CALL (r, rel_peer, r2_dir, r2_hierarchy, related_rel_status) {
-                    WITH r, rel_peer, r2_dir, r2_hierarchy, related_rel_status
+                CALL (r, rel_peer, r2_dir, r2_hierarchy, related_rel_status, r2_from_user_id) {
+                    WITH r, rel_peer, r2_dir, r2_hierarchy, related_rel_status, r2_from_user_id
                     WHERE r2_dir = "r"
                     CREATE (r)
-                        -[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r2_hierarchy}]
+                        -[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r2_hierarchy, from_user_id: r2_from_user_id}]
                         ->(rel_peer)
                 }
-                CALL (r, rel_peer, r2_dir, r2_hierarchy, related_rel_status) {
-                    WITH r, rel_peer, r2_dir, r2_hierarchy, related_rel_status
+                CALL (r, rel_peer, r2_dir, r2_hierarchy, related_rel_status, r2_from_user_id) {
+                    WITH r, rel_peer, r2_dir, r2_hierarchy, related_rel_status, r2_from_user_id
                     WHERE r2_dir = "l"
                     CREATE (r)
-                        <-[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r2_hierarchy}]
+                        <-[:IS_RELATED {branch: $target_branch, branch_level: $branch_level, from: $at, status: related_rel_status, hierarchy: r2_hierarchy, from_user_id: r2_from_user_id}]
                         -(rel_peer)
                 }
+                // set Relationship vertex metadata when adding
+                WITH r
+                WHERE r.created_at IS NULL
+                SET r.created_at = $at, r.created_by = r1_from_user_id
             }
         }
     }
 }
-RETURN 1 AS done
-        """ % {"id_func": db.get_id_function_name()}
+        """
         self.add_to_query(query=query)
 
 
@@ -391,7 +434,7 @@ CALL (attr_rel_prop_diff, node_db_id, peer_db_id) {
             -[has_attr:HAS_ATTRIBUTE]
             ->(attr:Attribute {name: attr_rel_prop_diff.attribute_name})
         WHERE attr_rel_prop_diff.attribute_name IS NOT NULL
-        AND (node_db_id IS NULL OR %(id_func)s(n) = node_db_id)
+        AND (node_db_id IS NULL OR elementId(n) = node_db_id)
         AND has_attr.branch IN [$source_branch, $target_branch]
         RETURN attr
         ORDER BY has_attr.from DESC
@@ -404,8 +447,8 @@ CALL (attr_rel_prop_diff, node_db_id, peer_db_id) {
             -[r2:IS_RELATED]
             -(rel_peer:Node {uuid: attr_rel_prop_diff.peer_uuid})
         WHERE attr_rel_prop_diff.relationship_id IS NOT NULL
-        AND (node_db_id IS NULL OR %(id_func)s(n) = node_db_id)
-        AND (peer_db_id IS NULL OR %(id_func)s(rel_peer) = peer_db_id)
+        AND (node_db_id IS NULL OR elementId(n) = node_db_id)
+        AND (peer_db_id IS NULL OR elementId(rel_peer) = peer_db_id)
         AND r1.branch IN [$source_branch, $target_branch]
         AND r2.branch IN [$source_branch, $target_branch]
         RETURN rel
@@ -425,14 +468,14 @@ CALL (attr_rel_prop_diff, node_db_id, peer_db_id) {
         CALL (attr_rel, property_diff, peer_db_id) {
             OPTIONAL MATCH (peer:Node {uuid: property_diff.value})
             WHERE property_diff.property_type IN ["HAS_SOURCE", "HAS_OWNER"]
-            AND (peer_db_id IS NULL OR %(id_func)s(peer) = peer_db_id)
+            AND (peer_db_id IS NULL OR elementId(peer) = peer_db_id)
             // ------------------------------
-            // the serialized diff might not include the values for IS_VISIBLE and IS_PROTECTED in
+            // the serialized diff might not include the values for IS_PROTECTED in
             // some cases, so we need to figure them out here
             // ------------------------------
             CALL (attr_rel, property_diff) {
                 OPTIONAL MATCH (attr_rel)-[r_vis_pro]->(bool:Boolean)
-                WHERE property_diff.property_type IN ["IS_VISIBLE", "IS_PROTECTED"]
+                WHERE property_diff.property_type = "IS_PROTECTED"
                 AND r_vis_pro.branch IN [$source_branch, $target_branch]
                 AND type(r_vis_pro) = property_diff.property_type
                 AND (property_diff.value IS NULL OR bool.value = property_diff.value)
@@ -464,15 +507,25 @@ CALL (attr_rel_prop_diff, node_db_id, peer_db_id) {
             ELSE NULL
         END as prop_rel_status
         // ------------------------------
+        // get from_user_id from source branch property edge
+        // ------------------------------
+        CALL (attr_rel, prop_type) {
+            OPTIONAL MATCH (attr_rel)-[source_prop_edge {branch: $source_branch}]->()
+            WHERE type(source_prop_edge) = prop_type
+            AND source_prop_edge.from <= $at AND source_prop_edge.to IS NULL
+            RETURN source_prop_edge.from_user_id AS prop_source_from_user_id
+            ORDER BY source_prop_edge.from DESC
+            LIMIT 1
+        }
+        // ------------------------------
         // set property edge.to, optionally, on target branch
         // ------------------------------
-        CALL (attr_rel, prop_rel_status, prop_type) {
-            OPTIONAL MATCH (attr_rel)
-                -[target_r_prop {branch: $target_branch}]
-                ->()
+        CALL (attr_rel, prop_type, prop_node, prop_source_from_user_id) {
+            MATCH (attr_rel)-[target_r_prop {branch: $target_branch}]->(target_prop)
             WHERE type(target_r_prop) = prop_type
+            AND target_prop <> prop_node
             AND target_r_prop.from < $at AND target_r_prop.to IS NULL
-            SET target_r_prop.to = $at
+            SET target_r_prop.to = $at, target_r_prop.to_user_id = prop_source_from_user_id
         }
         // ------------------------------
         // check for existing edge on target_branch
@@ -485,40 +538,36 @@ CALL (attr_rel_prop_diff, node_db_id, peer_db_id) {
             AND (r_prop.to > $at OR r_prop.to IS NULL)
             RETURN r_prop
         }
-        WITH attr_rel,prop_rel_status, prop_type, prop_node, r_prop
+        WITH attr_rel, prop_rel_status, prop_type, prop_node, r_prop, prop_source_from_user_id
         WHERE r_prop IS NULL
+        WITH attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id
         // ------------------------------
         // create new edge to prop_node on target_branch, if necessary
         // one subquery per possible edge type b/c edge type cannot be a variable
         // ------------------------------
-        CALL (attr_rel, prop_rel_status, prop_type, prop_node) {
-            WITH attr_rel, prop_rel_status, prop_type, prop_node
+        CALL (attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id) {
+            WITH attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id
             WHERE prop_type = "HAS_VALUE"
-            CREATE (attr_rel)-[:HAS_VALUE { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status }]->(prop_node)
+            CREATE (attr_rel)-[:HAS_VALUE { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status, from_user_id: prop_source_from_user_id }]->(prop_node)
         }
-        CALL (attr_rel, prop_rel_status, prop_type, prop_node) {
-            WITH attr_rel, prop_rel_status, prop_type, prop_node
+        CALL (attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id) {
+            WITH attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id
             WHERE prop_type = "HAS_SOURCE"
-            CREATE (attr_rel)-[:HAS_SOURCE { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status }]->(prop_node)
+            CREATE (attr_rel)-[:HAS_SOURCE { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status, from_user_id: prop_source_from_user_id }]->(prop_node)
         }
-        CALL (attr_rel, prop_rel_status, prop_type, prop_node) {
-            WITH attr_rel, prop_rel_status, prop_type, prop_node
+        CALL (attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id) {
+            WITH attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id
             WHERE prop_type = "HAS_OWNER"
-            CREATE (attr_rel)-[:HAS_OWNER { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status }]->(prop_node)
-        }
-        CALL (attr_rel, prop_rel_status, prop_type, prop_node) {
-            WITH attr_rel, prop_rel_status, prop_type, prop_node
-            WHERE prop_type = "IS_VISIBLE"
-            CREATE (attr_rel)-[:IS_VISIBLE { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status }]->(prop_node)
+            CREATE (attr_rel)-[:HAS_OWNER { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status, from_user_id: prop_source_from_user_id }]->(prop_node)
         }
-        CALL (attr_rel, prop_rel_status, prop_type, prop_node) {
-            WITH attr_rel, prop_rel_status, prop_type, prop_node
+        CALL (attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id) {
+            WITH attr_rel, prop_rel_status, prop_type, prop_node, prop_source_from_user_id
             WHERE prop_type = "IS_PROTECTED"
-            CREATE (attr_rel)-[:IS_PROTECTED { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status }]->(prop_node)
+            CREATE (attr_rel)-[:IS_PROTECTED { branch: $target_branch, branch_level: $branch_level, from: $at, status: prop_rel_status, from_user_id: prop_source_from_user_id }]->(prop_node)
         }
     }
 }
-        """ % {"id_func": db.get_id_function_name()}
+        """
         self.add_to_query(query=query)
 
 
@@ -582,47 +631,62 @@ CALL (n) {
     // --------------
     // ignore edges of this type that already have the correct status on the target branch
     // --------------
-    WITH n, peer, edge_type, latest_source_edge, latest_target_edge
+    WITH n, peer, edge_type, latest_source_edge, latest_target_edge, latest_source_edge.from_user_id AS user_id
     WHERE (latest_target_edge IS NULL AND latest_source_edge.status = "active")
     OR latest_source_edge.status <> latest_target_edge.status
-    CALL (latest_source_edge, latest_target_edge) {
+    CALL (n, latest_source_edge, latest_target_edge, user_id) {
         // --------------
         // set the to time on active target branch edges that we are setting to deleted
+        // to_user_id comes from the source edge's from_user_id (user who deleted it on source branch)
         // --------------
-        WITH latest_target_edge WHERE latest_target_edge IS NOT NULL
+        WITH n, latest_target_edge, user_id WHERE latest_target_edge IS NOT NULL
         AND latest_source_edge.status = "deleted"
         AND latest_target_edge.status = "active"
         AND latest_target_edge.to IS NULL
-        SET latest_target_edge.to = $at
+        SET latest_target_edge.to = $at, latest_target_edge.to_user_id = user_id
     }
     // --------------
+    // get the earliest created time to handle migrated kind/inheritance Nodes
+    // --------------
+    CALL (n) {
+        MATCH (earliest_n:Node {uuid: n.uuid})
+        RETURN earliest_n.created_at AS node_created_at, earliest_n.created_by AS node_created_by
+        ORDER BY earliest_n.created_at ASC
+        LIMIT 1
+    }
+    WITH *, COALESCE(node_created_at, $at) AS node_created_at, COALESCE(node_created_by, user_id) AS node_created_by
+    // --------------
     // create the outbound edges on the target branch, one subquery per possible type
+    // from_user_id is copied from source edge via properties(latest_source_edge)
     // --------------
-    CALL (n, latest_source_edge, peer, edge_type) {
+    CALL (n, latest_source_edge, peer, edge_type, node_created_at, node_created_by) {
         WITH edge_type WHERE edge_type = "IS_PART_OF"
         CREATE (n)-[new_edge:IS_PART_OF]->(peer)
         SET new_edge = properties(latest_source_edge)
-        SET new_edge.from = $at
-        SET new_edge.branch_level = $branch_level
-        SET new_edge.branch = $target_branch
+        SET new_edge.from = $at, new_edge.branch_level = $branch_level, new_edge.branch = $target_branch
+        WITH n
+        WHERE n.created_at IS NULL
+        SET n.created_at = node_created_at, n.created_by = node_created_by
     }
-    CALL (n, latest_source_edge, peer, edge_type) {
-        WITH edge_type
+    CALL (n, latest_source_edge, peer, edge_type, user_id) {
+        WITH peer, user_id, edge_type
         WHERE edge_type = "IS_RELATED"
         CREATE (n)-[new_edge:IS_RELATED]->(peer)
         SET new_edge = properties(latest_source_edge)
-        SET new_edge.from = $at
-        SET new_edge.branch_level = $branch_level
-        SET new_edge.branch = $target_branch
+        SET new_edge.from = $at, new_edge.branch_level = $branch_level, new_edge.branch = $target_branch
+        WITH peer
+        WHERE peer.created_at IS NULL
+        SET peer.created_at = $at, peer.created_by = user_id
     }
-    CALL (n, latest_source_edge, peer, edge_type) {
-        WITH edge_type
+    CALL (n, latest_source_edge, peer, edge_type, user_id) {
+        WITH peer, user_id, edge_type
         WHERE edge_type = "HAS_ATTRIBUTE"
         CREATE (n)-[new_edge:HAS_ATTRIBUTE]->(peer)
         SET new_edge = properties(latest_source_edge)
-        SET new_edge.from = $at
-        SET new_edge.branch_level = $branch_level
-        SET new_edge.branch = $target_branch
+        SET new_edge.from = $at, new_edge.branch_level = $branch_level, new_edge.branch = $target_branch
+        WITH peer
+        WHERE peer.created_at IS NULL
+        SET peer.created_at = $at, peer.created_by = user_id
     }
     // --------------
     // do all of this again for inbound edges
@@ -652,54 +716,202 @@ CALL (n) {
     // --------------
     // ignore edges of this type that already have the correct status on the target branch
     // --------------
-    WITH n, peer, edge_type, latest_source_edge, latest_target_edge
+    WITH n, peer, edge_type, latest_source_edge, latest_target_edge, latest_source_edge.from_user_id AS user_id
     WHERE latest_target_edge IS NULL OR latest_source_edge.status <> latest_target_edge.status
-    CALL (latest_source_edge, latest_target_edge) {
+    CALL (latest_source_edge, latest_target_edge, user_id, peer) {
         // --------------
         // set the to time on active target branch edges that we are setting to deleted
+        // to_user_id comes from the source edge's from_user_id (user who deleted it on source branch)
         // --------------
-        WITH latest_target_edge
+        WITH latest_target_edge, user_id, peer
         WHERE latest_target_edge IS NOT NULL
         AND latest_source_edge.status = "deleted"
         AND latest_target_edge.status = "active"
         AND latest_target_edge.to IS NULL
-        SET latest_target_edge.to = $at
+        SET latest_target_edge.to = $at, latest_target_edge.to_user_id = user_id
     }
     // --------------
-    // create the outbound edges on the target branch, one subquery per possible type
+    // create the inbound edges on the target branch, one subquery per possible type
+    // from_user_id is copied from source edge via properties(latest_source_edge)
     // --------------
-    CALL (n, latest_source_edge, peer, edge_type) {
-        WITH edge_type
+    CALL (n, latest_source_edge, peer, edge_type, user_id) {
+        WITH peer, user_id, edge_type
         WHERE edge_type = "IS_RELATED"
         CREATE (n)<-[new_edge:IS_RELATED]-(peer)
         SET new_edge = properties(latest_source_edge)
-        SET new_edge.from = $at
-        SET new_edge.branch_level = $branch_level
-        SET new_edge.branch = $target_branch
+        SET new_edge.from = $at, new_edge.branch_level = $branch_level, new_edge.branch = $target_branch
+        WITH peer
+        WHERE peer.created_at IS NULL
+        SET peer.created_at = $at, peer.created_by = user_id
     }
-    CALL (n, latest_source_edge, peer, edge_type) {
-        WITH edge_type
+    CALL (n, latest_source_edge, peer, edge_type, user_id) {
+        WITH peer, user_id, edge_type
         WHERE edge_type = "HAS_OWNER"
         CREATE (n)<-[new_edge:HAS_OWNER]-(peer)
         SET new_edge = properties(latest_source_edge)
-        SET new_edge.from = $at
-        SET new_edge.branch_level = $branch_level
-        SET new_edge.branch = $target_branch
+        SET new_edge.from = $at, new_edge.branch_level = $branch_level, new_edge.branch = $target_branch
     }
-    CALL (n, latest_source_edge, peer, edge_type) {
-        WITH edge_type
+    CALL (n, latest_source_edge, peer, edge_type, user_id) {
+        WITH peer, user_id, edge_type
         WHERE edge_type = "HAS_SOURCE"
         CREATE (n)<-[new_edge:HAS_SOURCE]-(peer)
         SET new_edge = properties(latest_source_edge)
-        SET new_edge.from = $at
-        SET new_edge.branch_level = $branch_level
-        SET new_edge.branch = $target_branch
+        SET new_edge.from = $at, new_edge.branch_level = $branch_level, new_edge.branch = $target_branch
     }
 }
         """
         self.add_to_query(query)
 
 
+class DiffMergeMetadataQuery(Query):
+    """Set metadata properties on Nodes, Attributes, and Relationships included in this merge
+
+    Each Node, Attribute, and Relationship should have its current updated_at/by (if it exists) saved in the
+    previous_updated_at/by properties to support a rollback.
+    For Attributes and Relationships (let's call them fields), set updated_by to the user_id of the latest change on
+        the field on the branch being merged
+    For Nodes, set the updated_by to the user_id of the latest change on any associated fields on this branch
+    For Nodes, Attributes, and Relationships, set updated_at to the merge time.
+
+    The logic in pseudocode
+        For each Node we care about:
+        a. For each Attribute/Relationship (let's call them "fields") linked to the Node
+            i. filter to only fields updated on the source branch
+            ii. previous_updated_at/by = updated_at/by
+            iii. identify the latest update and set updated_by = the associated user_id
+            iv. set updated_at = $at
+        b. set Node.updated_by to the user_id associated with the latest change of ALL the Node's fields
+        c. set Node.updated_at = $at
+    """
+
+    name = "merge_metadata"
+    type = QueryType.WRITE
+    insert_return = False
+
+    def __init__(
+        self,
+        node_uuids: list[str],
+        at: Timestamp,
+        target_branch: Branch,
+        **kwargs: Any,
+    ) -> None:
+        super().__init__(**kwargs)
+        self.node_uuids = node_uuids
+        self.at = at
+        self.target_branch = target_branch
+
+    async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
+        self.params = {
+            "node_uuids": self.node_uuids,
+            "at": self.at.to_string(),
+            "target_branch": self.target_branch.name,
+            "source_branch": self.branch.name,
+            "global_branch": GLOBAL_BRANCH_NAME,
+            "branched_from": self.branch.get_branched_from(),
+        }
+        # ruff: noqa: E501
+        query = """
+// --------------------
+// Match all affected nodes, accounting for nodes with migrated kind
+// for each UUID, get the latest Node that was active on this branch
+// --------------------
+UNWIND $node_uuids AS node_uuid
+CALL (node_uuid) {
+    MATCH (n:Node {uuid: node_uuid})-[e:IS_PART_OF]->(:Root)
+    WHERE e.branch IN [$target_branch, $global_branch]
+    AND (
+        (e.branch = $target_branch AND (e.from <= $branched_from OR e.from = $at))
+        OR (e.branch = $global_branch AND e.from <= $at)
+    )
+    RETURN n, e AS is_part_of_e
+    ORDER BY e.from DESC, e.status ASC
+    LIMIT 1
+}
+// --------------------
+// Special handling for the new version of a migrated kind/inheritance Node
+// set updated_at/by to the time/user that created the new version of the Node
+// --------------------
+CALL (n, is_part_of_e) {
+    WITH n, is_part_of_e
+    WHERE n.updated_at IS NULL
+    SET n.updated_at = is_part_of_e.from, n.updated_by = is_part_of_e.from_user_id
+}
+// --------------------
+// Get all the Attributes and Relationships for this Node that were active on this branch at some point
+// --------------------
+MATCH (n)-[e:HAS_ATTRIBUTE|IS_RELATED]-(field:Attribute|Relationship)
+WHERE e.branch IN [$source_branch, $target_branch, $global_branch]
+AND (
+    (e.branch = $target_branch AND e.from <= $branched_from)
+    OR (e.branch IN [$source_branch, $global_branch] AND e.from <= $at)
+)
+
+// --------------------
+// For each field, only include it if it has an update at $at on the target branch
+// to prevent updating metadata for conflicts in which the base branch version was accepted
+// --------------------
+WITH DISTINCT n, field
+WHERE exists((field)-[{branch: $target_branch, from: $at}]-())
+OR exists((field)-[{branch: $target_branch, to: $at}]-())
+
+// --------------------
+// For each changed field, find the latest time and user_id that updated it on the source branch
+// Check both from (creation) and to (deletion) timestamps
+// Prefer non-system users (those not starting with "__")
+// --------------------
+CALL (field) {
+    // ignore HAS_ATTRIBUTE and IS_RELATED b/c these show when an Attribute/Relationship was created/deleted
+    // not when it was updated
+    MATCH ()-[edge:!HAS_ATTRIBUTE&!IS_RELATED {branch: $source_branch}]-(field)
+    WHERE edge.from <= $at
+    // Collect both from and to timestamps as potential "change times"
+    WITH edge,
+         edge.from AS from_time,
+         edge.from_user_id AS from_user,
+         edge.to AS to_time,
+         edge.to_user_id AS to_user
+    // Create rows for each type of change
+    UNWIND [
+        CASE WHEN from_time <= $at THEN {time: from_time, user_id: from_user} ELSE NULL END,
+        CASE WHEN to_time IS NOT NULL AND to_time <= $at THEN {time: to_time, user_id: to_user} ELSE NULL END
+    ] AS change
+    WITH change WHERE change IS NOT NULL AND change.user_id IS NOT NULL
+    // Sort by time DESC, then prefer non-system users (is_system ASC puts false before true)
+    WITH change.user_id AS change_user_id, change.time AS change_time, change.user_id STARTS WITH "__" AS is_system
+    RETURN change_user_id, change_time
+    ORDER BY change_time DESC, is_system ASC
+    LIMIT 1
+}
+
+// Save current field values for rollback, then update field metadata
+WITH n, field, change_user_id, change_time
+WHERE change_user_id IS NOT NULL
+// --------------------
+// make sure not to set the previous_updated_at multiple times
+// --------------------
+CALL (field, change_user_id) {
+    WITH field
+    WHERE field.updated_at <> $at OR field.updated_at IS NULL
+    SET field.previous_updated_at = field.updated_at, field.previous_updated_by = field.updated_by
+    SET field.updated_at = $at, field.updated_by = change_user_id
+}
+
+// Aggregate to find the latest change across all fields for Node-level metadata
+WITH n, change_user_id, change_time, change_user_id STARTS WITH "__" AS is_system
+ORDER BY change_time DESC, is_system ASC
+WITH n, collect(change_user_id)[0] AS node_updated_by
+
+// ------------------------------------
+// Update Node metadata with latest change across all its fields
+// ------------------------------------
+WITH n, node_updated_by
+WHERE node_updated_by IS NOT NULL
+SET n.previous_updated_at = n.updated_at, n.previous_updated_by = n.updated_by
+SET n.updated_at = $at, n.updated_by = node_updated_by
+        """
+        self.add_to_query(query=query)
+
+
 class DiffMergeRollbackQuery(Query):
     name = "diff_merge_rollback"
     type = QueryType.WRITE
@@ -709,33 +921,62 @@ class DiffMergeRollbackQuery(Query):
         self,
         at: Timestamp,
         target_branch: Branch,
+        node_uuids: list[str],
         **kwargs: Any,
     ) -> None:
         super().__init__(**kwargs)
         self.at = at
         self.target_branch = target_branch
         self.source_branch_name = self.branch.name
+        self.node_uuids = node_uuids
 
     async def query_init(self, db: InfrahubDatabase, **kwargs: Any) -> None:  # noqa: ARG002
         self.params = {
             "at": self.at.to_string(),
             "target_branch": self.target_branch.name,
             "source_branch": self.source_branch_name,
+            "node_uuids": self.node_uuids,
         }
         query = """
-        // ---------------------------
-        // reset to times on target branch
-        // ---------------------------
-        CALL () {
-            OPTIONAL MATCH ()-[r_to {to: $at, branch: $target_branch}]-()
-            SET r_to.to = NULL
-        }
-        // ---------------------------
-        // reset from times on target branch
-        // ---------------------------
-        CALL () {
-            OPTIONAL MATCH ()-[r_from {from: $at, branch: $target_branch}]-()
-            DELETE r_from
-        }
+// ---------------------------
+// Restore updated_at/by from previous_* on affected Node vertices
+// ---------------------------
+MATCH (n:Node)
+WHERE n.uuid IN $node_uuids
+CALL (n) {
+    WITH n
+    WHERE n.previous_updated_at IS NOT NULL
+    SET n.updated_at = n.previous_updated_at, n.updated_by = n.previous_updated_by
+    SET n.previous_updated_at = NULL, n.previous_updated_by = NULL
+}
+// ---------------------------
+// Restore updated_at/by from previous_* on affected Attribute/Relationship vertices
+// ---------------------------
+CALL (n) {
+    MATCH (n)-[:HAS_ATTRIBUTE|IS_RELATED {branch: $target_branch}]-(attr_rel:Attribute|Relationship)
+    WHERE attr_rel.previous_updated_at IS NOT NULL
+    WITH DISTINCT attr_rel
+    SET attr_rel.updated_at = attr_rel.previous_updated_at, attr_rel.updated_by = attr_rel.previous_updated_by
+    SET attr_rel.previous_updated_at = NULL, attr_rel.previous_updated_by = NULL
+}
+// ---------------------------
+// Limit results to 1 row
+// ---------------------------
+WITH 1 AS one
+LIMIT 1
+// ---------------------------
+// reset to times on target branch
+// ---------------------------
+CALL () {
+    OPTIONAL MATCH (v)-[r_to {to: $at, branch: $target_branch}]-()
+    SET r_to.to = NULL, r_to.to_user_id = NULL
+}
+// ---------------------------
+// reset from times on target branch
+// ---------------------------
+CALL () {
+    OPTIONAL MATCH (v)-[r_from {from: $at, branch: $target_branch}]-()
+    DELETE r_from
+}
         """
         self.add_to_query(query=query)