fix: transaction ws notifications (#1525)

* include trigger and assertion information on notification

* fix result notification

server/executor/transaction_runner.go

@@ -190,6 +190,7 @@ func createStepRun(testRun model.Run) model.TransactionStepRun {
 	return model.TransactionStepRun{
 		ID:          testRun.ID,
 		TestID:      testRun.TestID,
+		Result:      *testRun.Results,
 		State:       testRun.State,
 		Environment: testRun.Environment,
 		Outputs:     testRun.Outputs,

server/http/mappings/tests.go

@@ -49,11 +49,11 @@ func (m OpenAPI) TransactionRun(in model.TransactionRun) openapi.TransactionRun
 	runs := make([]openapi.TestRun, 0, len(in.StepRuns))
 
 	for _, step := range in.Steps {
-		steps = append(steps, m.Test(model.Test{ID: step.ID, Name: step.Name}))
+		steps = append(steps, m.Test(model.Test{ID: step.ID, Name: step.Name, ServiceUnderTest: step.Trigger}))
 	}
 
 	for _, run := range in.StepRuns {
-		runs = append(runs, m.Run(&model.Run{ID: run.ID, TestID: run.TestID, State: run.State}))
+		runs = append(runs, m.Run(&model.Run{ID: run.ID, TestID: run.TestID, State: run.State, Results: &run.Result}))
 	}
 
 	return openapi.TransactionRun{

server/http/websocket/subscribe.go

@@ -65,8 +65,7 @@ func (e subscribeCommandExecutor) ResourceUpdatedEvent(resource interface{}) Eve
 	case model.TransactionRun:
 		mapped = e.mappers.Out.TransactionRun(v)
 	case *model.TransactionRun:
-		var value model.TransactionRun = *v
-		mapped = e.mappers.Out.TransactionRun(value)
+		mapped = e.mappers.Out.TransactionRun(*v)
 	default:
 		fmt.Printf("type %T mapping not supported\n", v)
 		mapped = v

server/model/transactions.go

@@ -21,14 +21,16 @@ type (
 	TransactionRunState string
 
 	TransactionStep struct {
-		ID   id.ID
-		Name string
+		ID      id.ID
+		Name    string
+		Trigger Trigger
 	}
 
 	TransactionStepRun struct {
 		ID          int
 		TestID      id.ID
 		State       RunState
+		Result      RunResults
 		Environment Environment
 		Outputs     OrderedMap[string, string]
 	}
@@ -74,18 +76,18 @@ func (t Transaction) HasID() bool {
 }
 
 func NewTransactionRun(transaction Transaction) TransactionRun {
-	testIds := make([]TransactionStep, 0, len(transaction.Steps))
+	tests := make([]TransactionStep, 0, len(transaction.Steps))
 
 	for _, test := range transaction.Steps {
-		testIds = append(testIds, TransactionStep{ID: test.ID, Name: test.Name})
+		tests = append(tests, TransactionStep{ID: test.ID, Name: test.Name, Trigger: test.ServiceUnderTest})
 	}
 
 	return TransactionRun{
 		TransactionID:      transaction.ID,
 		TransactionVersion: transaction.Version,
 		CreatedAt:          time.Now(),
 		State:              TransactionRunStateCreated,
-		Steps:              testIds,
+		Steps:              tests,
 		StepRuns:           make([]TransactionStepRun, 0, len(transaction.Steps)),
 		CurrentTest:        0,
 	}