OnTransitioning event for initial transition

qmuntal · Jan 19, 2021 · 26996e4 · 26996e4
1 parent 639ec7f
commit 26996e4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/statemachine.go b/statemachine.go
@@ -425,7 +425,7 @@ func (sm *StateMachine) handleTransitioningTrigger(ctx context.Context, sr *stat
 			return err
 		}
 	}
-	sm.onTransitionedEvents.Invoke(ctx, transition)
+	sm.onTransitionedEvents.Invoke(ctx, Transition{transition.Source, rep.State, transition.Trigger, false})
 	return nil
 }
 
@@ -451,6 +451,7 @@ func (sm *StateMachine) enterState(ctx context.Context, sr *stateRepresentation,
 		}
 		initialTranslation := Transition{Source: transition.Source, Destination: sr.InitialTransitionTarget, Trigger: transition.Trigger, isInitial: true}
 		sr = sm.stateRepresentation(sr.InitialTransitionTarget)
+		sm.onTransitioningEvents.Invoke(ctx, Transition{transition.Destination, initialTranslation.Destination, transition.Trigger, false})
 		sr, err = sm.enterState(ctx, sr, initialTranslation, args...)
 	}
 	return sr, err

diff --git a/statemachine_test.go b/statemachine_test.go
@@ -3,6 +3,7 @@ package stateless
 import (
 	"context"
 	"errors"
+	"fmt"
 	"reflect"
 	"sync"
 	"testing"
@@ -1195,7 +1196,7 @@ func TestStateMachine_InitialTransition_EntersSubStateofSubstate(t *testing.T) {
 
 func TestStateMachine_InitialTransition_Ordering(t *testing.T) {
 	var actualOrdering []string
-	expectedOrdering := []string{"ExitA", "OnTransitioning", "EnterB", "EnterC", "OnTransitioned"}
+	expectedOrdering := []string{"ExitA", "OnTransitioningAB", "EnterB", "OnTransitioningBC", "EnterC", "OnTransitionedAC"}
 
 	sm := NewStateMachine(stateA)
 
@@ -1220,11 +1221,11 @@ func TestStateMachine_InitialTransition_Ordering(t *testing.T) {
 			return nil
 		})
 
-	sm.OnTransitioning(func(_ context.Context, _ Transition) {
-		actualOrdering = append(actualOrdering, "OnTransitioning")
+	sm.OnTransitioning(func(_ context.Context, tr Transition) {
+		actualOrdering = append(actualOrdering, fmt.Sprintf("OnTransitioning%s%s", tr.Source, tr.Destination))
 	})
-	sm.OnTransitioned(func(_ context.Context, _ Transition) {
-		actualOrdering = append(actualOrdering, "OnTransitioned")
+	sm.OnTransitioned(func(_ context.Context, tr Transition) {
+		actualOrdering = append(actualOrdering, fmt.Sprintf("OnTransitioned%s%s", tr.Source, tr.Destination))
 	})
 
 	sm.Fire(triggerX)