IFC-1891: Update branch query filter path time condition

Fixes #7338

Author: solababs

backend/infrahub/core/branch/models.py

@@ -335,7 +335,7 @@ def get_query_filter_path(
         at = Timestamp(at)
         at_str = at.to_string()
         if branch_agnostic:
-            filter_str = f"{variable_name}.from <= ${pp}time1 AND ({variable_name}.to IS NULL or {variable_name}.to >= ${pp}time1)"
+            filter_str = f"{variable_name}.from < ${pp}time1 AND ({variable_name}.to IS NULL or {variable_name}.to >= ${pp}time1)"
             params[f"{pp}time1"] = at_str
             return filter_str, params
 
@@ -348,10 +348,10 @@ def get_query_filter_path(
         filters = []
         for idx in range(len(branches_times)):
             filters.append(
-                f"({variable_name}.branch IN ${pp}branch{idx} AND {variable_name}.from <= ${pp}time{idx} AND {variable_name}.to IS NULL)"
+                f"({variable_name}.branch IN ${pp}branch{idx} AND {variable_name}.from < ${pp}time{idx} AND {variable_name}.to IS NULL)"
             )
             filters.append(
-                f"({variable_name}.branch IN ${pp}branch{idx} AND {variable_name}.from <= ${pp}time{idx} AND {variable_name}.to >= ${pp}time{idx})"
+                f"({variable_name}.branch IN ${pp}branch{idx} AND {variable_name}.from < ${pp}time{idx} AND {variable_name}.to >= ${pp}time{idx})"
             )
 
         filter_str = "(" + "\n OR ".join(filters) + ")"

backend/tests/unit/core/test_branch_merge.py

@@ -139,6 +139,60 @@ async def test_merge_relationship_many(
     assert len(await org1_main.tags.get(db=db)) == 3
 
 
+async def test_merge_relationship_one(
+    db: InfrahubDatabase,
+    person_tag_schema: None,
+    default_branch: Branch,
+    tag_blue_main: Node,
+    tag_red_main: Node,
+    tag_black_main: Node,
+    person_jack_main: Node,
+):
+    await person_jack_main.primary_tag.update(db=db, data=[tag_blue_main])
+    await person_jack_main.save(db=db)
+
+    branch1 = await create_branch(db=db, branch_name="branch1")
+    component_registry = get_component_registry()
+    diff_coordinator = await component_registry.get_component(DiffCoordinator, db=db, branch=branch1)
+
+    person_jack_branch = await NodeManager.get_one(id=person_jack_main.id, branch=branch1, db=db)
+    await person_jack_branch.primary_tag.update(db=db, data=[tag_red_main])
+    await person_jack_branch.save(db=db)
+
+    await diff_coordinator.update_branch_diff(base_branch=default_branch, diff_branch=branch1)
+    diff_merger = await component_registry.get_component(DiffMerger, db=db, branch=branch1)
+    await diff_merger.merge_graph(at=Timestamp())
+
+    # check person on main
+    fresh_jack_on_main = await NodeManager.get_one(db=db, id=person_jack_main.id)
+    tag_rels = await fresh_jack_on_main.primary_tag.get_relationships(db=db)
+    assert len(tag_rels) == 1
+    assert tag_rels[0].peer_id == tag_red_main.id
+
+    # update person on main
+    await fresh_jack_on_main.primary_tag.update(db=db, data=[tag_black_main])
+    await fresh_jack_on_main.save(db=db)
+    refreshed_jack_on_main = await NodeManager.get_one(db=db, id=person_jack_main.id)
+    tag_rels = await refreshed_jack_on_main.primary_tag.get_relationships(db=db)
+    assert len(tag_rels) == 1
+    assert tag_rels[0].peer_id == tag_black_main.id
+
+    # check person on branch
+    fresh_jack_on_branch = await NodeManager.get_one(db=db, branch=branch1, id=person_jack_main.id)
+    tag_rels = await fresh_jack_on_branch.primary_tag.get_relationships(db=db)
+    assert len(tag_rels) == 1
+    assert tag_rels[0].peer_id == tag_red_main.id
+
+    # update person on branch
+    await fresh_jack_on_branch.primary_tag.update(db=db, data=[tag_black_main])
+    await fresh_jack_on_branch.save(db=db)
+    refreshed_jack_on_branch = await NodeManager.get_one(db=db, branch=branch1, id=person_jack_main.id)
+
+    tag_rels = await refreshed_jack_on_branch.primary_tag.get_relationships(db=db)
+    assert len(tag_rels) == 1
+    assert tag_rels[0].peer_id == tag_black_main.id
+
+
 async def test_merge_update_schema(
     db: InfrahubDatabase,
     default_branch: Branch,

changelog/7338.fixed.md

@@ -0,0 +1 @@
+Fixed filter based on path relationship condition