rework route to just process payload

This commit is contained in:
Joel Wetzell
2025-12-28 08:24:12 -06:00
parent fcb1378784
commit ed4c14e82b
3 changed files with 32 additions and 19 deletions

View File

@@ -2,7 +2,6 @@ package route
import (
"context"
"errors"
"fmt"
"github.com/jwetzell/showbridge-go/internal/config"
@@ -33,7 +32,7 @@ type RouteIO interface {
type Route interface {
Input() string
Output() string
HandleInput(ctx context.Context, payload any) error
ProcessPayload(ctx context.Context, payload any) (any, error)
}
type ProcessorRoute struct {
@@ -71,24 +70,18 @@ func (r *ProcessorRoute) Output() string {
return r.output
}
func (r *ProcessorRoute) HandleInput(ctx context.Context, payload any) error {
router, ok := ctx.Value(RouterContextKey).(RouteIO)
if !ok {
return errors.New("unable to get router from context")
}
func (r *ProcessorRoute) ProcessPayload(ctx context.Context, payload any) (any, error) {
for _, processor := range r.processors {
processedPayload, err := processor.Process(ctx, payload)
if err != nil {
return err
return nil, err
}
//NOTE(jwetzell) nil payload will result in the route being "terminated"
if processedPayload == nil {
return nil
return nil, nil
}
payload = processedPayload
}
return router.HandleOutput(ctx, r.output, payload)
return payload, nil
}

View File

@@ -2,6 +2,7 @@ package route_test
import (
"context"
"slices"
"testing"
"github.com/jwetzell/showbridge-go/internal/config"
@@ -52,9 +53,18 @@ func TestGoodRouteHandleInput(t *testing.T) {
}
inputData := "test input data"
err = testRoute.HandleInput(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), inputData)
payload, err := testRoute.ProcessPayload(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), inputData)
if err != nil {
t.Fatalf("route HandleOutput returned error: %v", err)
t.Fatalf("route ProcessPayload returned error: %v", err)
}
payloadBytes, ok := payload.([]byte)
if !ok {
t.Fatalf("payload should be []byte got %T", payload)
}
if !slices.Equal([]byte(inputData), payloadBytes) {
t.Fatalf("route returned the wrong payload. expected: %+v got %+v", inputData, payloadBytes)
}
}
@@ -73,7 +83,7 @@ func TestRouteHandleInputWithProcessorError(t *testing.T) {
}
inputData := "test input data"
err = testRoute.HandleInput(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), inputData)
_, err = testRoute.ProcessPayload(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), inputData)
if err == nil {
t.Fatalf("route HandleOutput did not return error for bad processor")
}
@@ -92,9 +102,12 @@ func TestRouteHandleNilPayload(t *testing.T) {
return
}
err = testRoute.HandleInput(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), nil)
payload, err := testRoute.ProcessPayload(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), nil)
if err != nil {
t.Fatalf("route HandleOutput returned error for nil payload: %v", err)
t.Fatalf("route ProcessPayload returned error: %v", err)
}
if payload != nil {
t.Fatalf("route returned the wrong payload")
}
}
@@ -112,10 +125,14 @@ func TestRouteHandleNilPayloadFromProcessor(t *testing.T) {
t.Fatalf("route failed to create: %v", err)
}
err = testRoute.HandleInput(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), nil)
payload, err := testRoute.ProcessPayload(context.WithValue(t.Context(), route.RouterContextKey, &MockRouter{}), "test")
if err != nil {
t.Fatalf("route HandleOutput returned error for nil payload: %v", err)
}
if payload != nil {
t.Fatalf("route returned the wrong payload")
}
}
func TestRouteUnknownProcessor(t *testing.T) {