Merge branch 'master' into contact_create

Ilhasoft · Jul 2, 2020 · 97bdd00 · 97bdd00
2 parents 5bfa51a + 540379b
commit 97bdd00
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/goflow/modifiers.go b/goflow/modifiers.go
@@ -10,14 +10,23 @@ import (
 	"github.com/pkg/errors"
 )
 
+// MissingAssets is the type for defining missing assets behavior
+type MissingAssets int
+
+// missing assets constants
+const (
+	IgnoreMissing  MissingAssets = 0
+	ErrorOnMissing MissingAssets = 1
+)
+
 // ReadModifiers reads modifiers from the given JSON
-func ReadModifiers(sa flows.SessionAssets, data []json.RawMessage, allowMissing bool) ([]flows.Modifier, error) {
+func ReadModifiers(sa flows.SessionAssets, data []json.RawMessage, missing MissingAssets) ([]flows.Modifier, error) {
 	mods := make([]flows.Modifier, 0, len(data))
 	for _, m := range data {
 		mod, err := modifiers.ReadModifier(sa, m, assets.IgnoreMissing)
 
 		// if this modifier turned into a no-op, ignore
-		if err == modifiers.ErrNoModifier && allowMissing {
+		if err == modifiers.ErrNoModifier && missing == IgnoreMissing {
 			continue
 		}
 		if err != nil {

diff --git a/goflow/modifiers_test.go b/goflow/modifiers_test.go
@@ -19,7 +19,7 @@ func TestReadModifiers(t *testing.T) {
 	assert.NoError(t, err)
 
 	// can read empty list
-	mods, err := goflow.ReadModifiers(oa.SessionAssets(), []json.RawMessage{}, true)
+	mods, err := goflow.ReadModifiers(oa.SessionAssets(), []json.RawMessage{}, goflow.IgnoreMissing)
 	assert.NoError(t, err)
 	assert.Equal(t, 0, len(mods))
 
@@ -28,7 +28,7 @@ func TestReadModifiers(t *testing.T) {
 		[]byte(`{"type": "name", "name": "Bob"}`),
 		[]byte(`{"type": "field", "field": {"key": "gender", "name": "Gender"}, "value": "M"}`),
 		[]byte(`{"type": "language", "language": "spa"}`),
-	}, true)
+	}, goflow.IgnoreMissing)
 	assert.NoError(t, err)
 	assert.Equal(t, 3, len(mods))
 	assert.Equal(t, "name", mods[0].Type())
@@ -40,7 +40,7 @@ func TestReadModifiers(t *testing.T) {
 		[]byte(`{"type": "name", "name": "Bob"}`),
 		[]byte(`{"type": "field", "field": {"key": "blood_type", "name": "Blood Type"}, "value": "O"}`),
 		[]byte(`{"type": "language", "language": "spa"}`),
-	}, true)
+	}, goflow.IgnoreMissing)
 	assert.NoError(t, err)
 	assert.Equal(t, 2, len(mods))
 	assert.Equal(t, "name", mods[0].Type())
@@ -51,13 +51,13 @@ func TestReadModifiers(t *testing.T) {
 		[]byte(`{"type": "name", "name": "Bob"}`),
 		[]byte(`{"type": "field", "field": {"key": "blood_type", "name": "Blood Type"}, "value": "O"}`),
 		[]byte(`{"type": "language", "language": "spa"}`),
-	}, false)
+	}, goflow.ErrorOnMissing)
 	assert.EqualError(t, err, `error reading modifier: {"type": "field", "field": {"key": "blood_type", "name": "Blood Type"}, "value": "O"}: no modifier to return because of missing assets`)
 
 	// error if any modifier structurally invalid
 	mods, err = goflow.ReadModifiers(oa.SessionAssets(), []json.RawMessage{
 		[]byte(`{"type": "field", "value": "O"}`),
 		[]byte(`{"type": "language", "language": "spa"}`),
-	}, false)
+	}, goflow.ErrorOnMissing)
 	assert.EqualError(t, err, `error reading modifier: {"type": "field", "value": "O"}: field 'field' is required`)
 }
diff --git a/web/contact/contact.go b/web/contact/contact.go
@@ -370,7 +370,7 @@ func handleModify(ctx context.Context, s *web.Server, r *http.Request) (interfac
 	}
 
 	// read the modifiers from the request
-	mods, err := goflow.ReadModifiers(org.SessionAssets(), request.Modifiers, false)
+	mods, err := goflow.ReadModifiers(oa.SessionAssets(), request.Modifiers, goflow.ErrorOnMissing)
 	if err != nil {
 		return nil, http.StatusBadRequest, err
 	}

diff --git a/web/surveyor/surveyor.go b/web/surveyor/surveyor.go
@@ -7,12 +7,6 @@ import (
 
 	"github.com/nyaruka/gocommon/urns"
 	"github.com/nyaruka/goflow/assets"
-<<<<<<< HEAD
-
-	"github.com/nyaruka/goflow/flows/actions/modifiers"
-
-=======
->>>>>>> modifier_read_fix
 	"github.com/nyaruka/goflow/flows"
 	"github.com/nyaruka/goflow/flows/engine"
 	"github.com/nyaruka/goflow/flows/events"
@@ -89,7 +83,7 @@ func handleSubmit(ctx context.Context, s *web.Server, r *http.Request) (interfac
 	}
 
 	// and our modifiers
-	mods, err := goflow.ReadModifiers(org.SessionAssets(), request.Modifiers, true)
+	mods, err := goflow.ReadModifiers(org.SessionAssets(), request.Modifiers, goflow.IgnoreMissing)
 	if err != nil {
 		return nil, http.StatusBadRequest, err
 	}