Merge pull request #15 from nndi-oss/fix/africastalking-concat

fix: store session steps and concatenate africastalking input text closes#9

README.md

@@ -40,9 +40,15 @@ phoneNumber: 265888123456
 ```
 
 ```sh
-$ dialoguss -i -f app.yaml
-Sending *123*1234# to <app>
-USSD Response:
+$ dialoguss --interactive --file=app.yaml simulate
+```
+
+`dialoguss` will start hitting your USSD endpoint to enable you to simulate
+interaction, the whole session can be performed from the command-line.
+
+An example output is below:
+
+```
 What is your name?
 > name: Zikani
 
@@ -85,7 +91,7 @@ sessions:
 ```
 
 ```sh
-$ dialoguss -f app.yml
+$ dialoguss --file=app.yml run
 All steps in session 12345678910 run successfully
 ```
 
@@ -104,4 +110,4 @@ it to production.
 
 ---
 
-Copyright (c) 2018 - 2020, NNDI
+Copyright (c) 2018 - 2024, NNDI

cmd/dialoguss.go

@@ -231,6 +231,7 @@ sessionLoop:
 		}
 
 		step = NewStep(i, input, "")
+
 		output, err = ExecuteStep(step, s)
 		if err != nil {
 			return err
@@ -240,6 +241,9 @@ sessionLoop:
 			fmt.Printf("\n\n\tWARN: USSD response contains %d characters\n\twhich is %d more than the recommended limit\n\n", n, n-UssdCharacterLimit)
 		}
 
+		step.Expect = output
+		s.Steps = append(s.Steps, step)
+
 		fmt.Println(output)
 		if step.IsLast {
 			break

pkg/africastalking/africastalking.go

@@ -31,8 +31,14 @@ func (s *AfricasTalkingRouteStep) ExecuteAsAfricasTalking(session *core.Session)
 	if &text == nil {
 		return "", errors.New("Input Text cannot be nil")
 	}
-	data.Set("text", text)  // TODO(zikani): concat the input
-	data.Set("channel", "") // TODO: Get the channel
+
+	if concatedText := ConcatText(session); concatedText != "" {
+		data.Set("text", concatedText)
+	} else {
+		data.Set("text", text)
+	}
+
+	data.Set("channel", "")
 
 	res, err := session.Client.PostForm(session.Url, data)
 	if err != nil {

pkg/africastalking/input.go

@@ -0,0 +1,20 @@
+package africastalking
+
+import (
+	"strings"
+
+	"github.com/nndi-oss/dialoguss/pkg/core"
+)
+
+func ConcatText(session *core.Session) string {
+	if session == nil {
+		return ""
+	}
+
+	inputs := make([]string, 0)
+	for _, step := range session.Steps {
+		inputs = append(inputs, step.Text)
+	}
+
+	return strings.Join(inputs, "*")
+}

pkg/africastalking/input_test.go

@@ -0,0 +1,36 @@
+package africastalking_test
+
+import (
+	"testing"
+
+	"github.com/nndi-oss/dialoguss/pkg/africastalking"
+	"github.com/nndi-oss/dialoguss/pkg/core"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestConcatTextWithNilSession(t *testing.T) {
+	got := africastalking.ConcatText(nil)
+	assert.Equal(t, "", got)
+}
+
+func TestConcatTextWithNilSteps(t *testing.T) {
+	got := africastalking.ConcatText(&core.Session{
+		Steps: nil,
+	})
+
+	assert.Equal(t, "", got)
+}
+
+func TestConcatText(t *testing.T) {
+	got := africastalking.ConcatText(&core.Session{
+		Steps: []*core.Step{
+			&core.Step{Text: "1"},
+			&core.Step{Text: "2"},
+			&core.Step{Text: "3"},
+			&core.Step{Text: "4"},
+			&core.Step{Text: "5"},
+		},
+	})
+
+	assert.Equal(t, "1*2*3*4*5", got)
+}