Fix incorrect event value for proposed change state after merging

ogenstad · ogenstad · commit 1a428d24b8eb · 2025-02-18T10:21:04.000+01:00
Fixes #5600
diff --git a/backend/infrahub/graphql/mutations/proposed_change.py b/backend/infrahub/graphql/mutations/proposed_change.py
@@ -135,6 +135,10 @@ async def mutate_update(
                     "proposed_change_name": proposed_change.name.value,
                 },
             )
+            # When the PROPOSED_CHANGE_MERGE succeeds it will have correctly changed the state
+            # from the overridden "merging" value, so here we change it back to reflect the
+            # correct value for the event that will be generated.
+            proposed_change.node_changelog.attributes["state"].value = ProposedChangeState.MERGED.value
 
         return proposed_change, result
 
diff --git a/changelog/5600.fixed.md b/changelog/5600.fixed.md
@@ -0,0 +1 @@
+Set correct state in events after merging a proposed change, they were incorrectly set as "merging" instead of "merged"

Original file line number	Diff line number	Diff line change
`@@ -135,6 +135,10 @@ async def mutate_update(`
`135`	`135`	`"proposed_change_name": proposed_change.name.value,`
`136`	`136`	`},`
`137`	`137`	`)`
	`138`	`+ # When the PROPOSED_CHANGE_MERGE succeeds it will have correctly changed the state`
	`139`	`+ # from the overridden "merging" value, so here we change it back to reflect the`
	`140`	`+ # correct value for the event that will be generated.`
	`141`	`+ proposed_change.node_changelog.attributes["state"].value = ProposedChangeState.MERGED.value`
`138`	`142`
`139`	`143`	`return proposed_change, result`
`140`	`144`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Set correct state in events after merging a proposed change, they were incorrectly set as "merging" instead of "merged"`