fix(*): continueAs doesn't have invoke & onParentComplete field (#102)

Signed-off-by: lsytj0413 <511121939@qq.com>

Signed-off-by: lsytj0413 <511121939@qq.com>

Author: lsytj0413

model/action_test.go

@@ -15,170 +15,13 @@
 package model
 
 import (
-	"encoding/json"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 
 	val "github.com/serverlessworkflow/sdk-go/v2/validator"
 )
 
-func TestWorkflowRefUnmarshalJSON(t *testing.T) {
-	type testCase struct {
-		desp   string
-		data   string
-		expect WorkflowRef
-		err    string
-	}
-	testCases := []testCase{
-		{
-			desp: "normal object test",
-			data: `{"workflowId": "1", "version": "2", "invoke": "async", "onParentComplete": "continue"}`,
-			expect: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "2",
-				Invoke:           InvokeKindAsync,
-				OnParentComplete: "continue",
-			},
-			err: ``,
-		},
-		{
-			desp: "normal object test & defaults",
-			data: `{"workflowId": "1"}`,
-			expect: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "",
-				Invoke:           InvokeKindSync,
-				OnParentComplete: "terminate",
-			},
-			err: ``,
-		},
-		{
-			desp: "normal string test",
-			data: `"1"`,
-			expect: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "",
-				Invoke:           InvokeKindSync,
-				OnParentComplete: "terminate",
-			},
-			err: ``,
-		},
-		{
-			desp:   "empty data",
-			data:   ` `,
-			expect: WorkflowRef{},
-			err:    `unexpected end of JSON input`,
-		},
-		{
-			desp:   "invalid string format",
-			data:   `"1`,
-			expect: WorkflowRef{},
-			err:    `unexpected end of JSON input`,
-		},
-		{
-			desp:   "invalid json format",
-			data:   `{"workflowId": 1, "version": "2", "invoke": "async", "onParentComplete": "continue"}`,
-			expect: WorkflowRef{},
-			err:    `json: cannot unmarshal number into Go struct field workflowRefForUnmarshal.workflowId of type string`,
-		},
-		{
-			desp:   "invalid string or object",
-			data:   `1`,
-			expect: WorkflowRef{},
-			err:    `subFlowRef value '1' is not supported, it must be an object or string`,
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.desp, func(t *testing.T) {
-			var v WorkflowRef
-			err := json.Unmarshal([]byte(tc.data), &v)
-
-			if tc.err != "" {
-				assert.Error(t, err)
-				assert.Regexp(t, tc.err, err)
-				return
-			}
-
-			assert.NoError(t, err)
-			assert.Equal(t, tc.expect, v)
-		})
-	}
-}
-
-func TestWorkflowRefValidate(t *testing.T) {
-	type testCase struct {
-		desp        string
-		workflowRef WorkflowRef
-		err         string
-	}
-	testCases := []testCase{
-		{
-			desp: "all field & defaults",
-			workflowRef: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "2",
-				Invoke:           InvokeKindSync,
-				OnParentComplete: "terminate",
-			},
-			err: ``,
-		},
-		{
-			desp: "all field",
-			workflowRef: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "2",
-				Invoke:           InvokeKindAsync,
-				OnParentComplete: "continue",
-			},
-			err: ``,
-		},
-		{
-			desp: "missing workflowId",
-			workflowRef: WorkflowRef{
-				WorkflowID:       "",
-				Version:          "2",
-				Invoke:           InvokeKindSync,
-				OnParentComplete: "terminate",
-			},
-			err: `Key: 'WorkflowRef.WorkflowID' Error:Field validation for 'WorkflowID' failed on the 'required' tag`,
-		},
-		{
-			desp: "invalid invoke",
-			workflowRef: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "2",
-				Invoke:           "sync1",
-				OnParentComplete: "terminate",
-			},
-			err: `Key: 'WorkflowRef.Invoke' Error:Field validation for 'Invoke' failed on the 'oneof' tag`,
-		},
-		{
-			desp: "invalid onParentComplete",
-			workflowRef: WorkflowRef{
-				WorkflowID:       "1",
-				Version:          "2",
-				Invoke:           InvokeKindSync,
-				OnParentComplete: "terminate1",
-			},
-			err: `Key: 'WorkflowRef.OnParentComplete' Error:Field validation for 'OnParentComplete' failed on the 'oneof' tag`,
-		},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.desp, func(t *testing.T) {
-			err := val.GetValidator().Struct(tc.workflowRef)
-
-			if tc.err != "" {
-				assert.Error(t, err)
-				assert.Regexp(t, tc.err, err)
-				return
-			}
-
-			assert.NoError(t, err)
-		})
-	}
-}
-
 func TestSleepValidate(t *testing.T) {
 	type testCase struct {
 		desp  string

model/workflow.go

@@ -15,6 +15,7 @@
 package model
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"reflect"
@@ -506,7 +507,11 @@ func (e *End) UnmarshalJSON(data []byte) error {
 
 // ContinueAs can be used to stop the current workflow execution and start another one (of the same or a different type)
 type ContinueAs struct {
-	WorkflowRef
+	// Unique id of the workflow to continue execution as.
+	WorkflowID string `json:"workflowId" validate:"required"`
+	// Version of the workflow to continue execution as.
+	Version string `json:"version,omitempty"`
+
 	// TODO: add object or string data type
 	// If string type, an expression which selects parts of the states data output to become the workflow data input of
 	// continued execution. If object type, a custom object to become the workflow data input of the continued execution
@@ -518,39 +523,28 @@ type ContinueAs struct {
 type continueAsForUnmarshal ContinueAs
 
 func (c *ContinueAs) UnmarshalJSON(data []byte) error {
-	continueAs := make(map[string]json.RawMessage)
-	if err := json.Unmarshal(data, &continueAs); err != nil {
+	data = bytes.TrimSpace(data)
+	if len(data) == 0 {
+		return fmt.Errorf("no bytes to unmarshal")
+	}
+
+	var err error
+	switch data[0] {
+	case '"':
 		c.WorkflowID, err = unmarshalString(data)
+		return err
+	case '{':
+		v := continueAsForUnmarshal{}
+		err = json.Unmarshal(data, &v)
 		if err != nil {
 			return err
 		}
-		return nil
-	}
-
-	if err := unmarshalKey("data", continueAs, &c.Data); err != nil {
-		return err
-	}
-	if err := unmarshalKey("workflowExecTimeout", continueAs, &c.WorkflowExecTimeout); err != nil {
-		return err
-	}
-
-	v := continueAsForUnmarshal{
-		WorkflowRef: WorkflowRef{
-			Invoke:           "sync",
-			OnParentComplete: "terminate",
-		},
-		Data:                c.Data,
-		WorkflowExecTimeout: c.WorkflowExecTimeout,
-	}
 
-	err := json.Unmarshal(data, &v)
-	if err != nil {
-		return fmt.Errorf("continueAs value '%s' is not supported, it must be an object or string", string(data))
+		*c = ContinueAs(v)
+		return nil
 	}
 
-	*c = ContinueAs(v)
-	return nil
-
+	return fmt.Errorf("continueAs value '%s' is not supported, it must be an object or string", string(data))
 }
 
 // ProduceEvent ...