Merge branch 'master' into change-language

Reviewed-on: #62

cmd/africastalking/main.go

@@ -84,7 +84,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	if err != nil {
 		return nil, err
 	}
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -116,6 +116,10 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
 
 	return ussdHandlers, nil
 }

cmd/async/main.go

@@ -54,7 +54,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	if err != nil {
 		return nil, err
 	}
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -86,6 +86,10 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
 
 	return ussdHandlers, nil
 }

cmd/http/main.go

@@ -44,7 +44,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	if err != nil {
 		return nil, err
 	}
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -76,6 +76,10 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, userdataStore
 	rs.AddLocalFunc("reset_incorrect_date_format", ussdHandlers.ResetIncorrectYob)
 	rs.AddLocalFunc("set_reset_single_edit", ussdHandlers.SetResetSingleEdit)
 	rs.AddLocalFunc("initiate_transaction", ussdHandlers.InitiateTransaction)
+	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
+	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
+	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
 
 	return ussdHandlers, nil
 }

cmd/main.go

@@ -39,7 +39,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.P
 		return nil, err
 	}
 	ussdHandlers = ussdHandlers.WithPersister(pe)
-	rs.AddLocalFunc("select_language", ussdHandlers.SetLanguage)
+	rs.AddLocalFunc("set_language", ussdHandlers.SetLanguage)
 	rs.AddLocalFunc("create_account", ussdHandlers.CreateAccount)
 	rs.AddLocalFunc("save_pin", ussdHandlers.SavePin)
 	rs.AddLocalFunc("verify_pin", ussdHandlers.VerifyPin)
@@ -74,6 +74,7 @@ func getHandler(appFlags *asm.FlagParser, rs *resource.DbResource, pe *persist.P
 	rs.AddLocalFunc("save_temporary_pin", ussdHandlers.SaveTemporaryPin)
 	rs.AddLocalFunc("verify_new_pin", ussdHandlers.VerifyNewPin)
 	rs.AddLocalFunc("confirm_pin_change", ussdHandlers.ConfirmPinChange)
+	rs.AddLocalFunc("quit_with_help",ussdHandlers.QuitWithHelp)
 
 	return ussdHandlers, nil
 }

internal/handlers/ussd/menuhandler.go

@@ -121,15 +121,15 @@ func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource
 // SetLanguage sets the language across the menu
 func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
-	var err error
 
-	inputStr := string(input)
-	switch inputStr {
-	case "0":
-		res.FlagSet = []uint32{state.FLAG_LANG}
+	sym, _ = h.st.Where()
+
+	switch sym {
+	case "set_default":
+		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
 		res.Content = "eng"
-	case "1":
-		res.FlagSet = []uint32{state.FLAG_LANG}
+	case "set_swa":
+		res.FlagSet = append(res.FlagSet, state.FLAG_LANG)
 		res.Content = "swa"
 	default:
 	}
@@ -630,6 +630,22 @@ func (h *Handlers) Quit(ctx context.Context, sym string, input []byte) (resource
 	return res, nil
 }
 
+// QuitWithHelp displays helpline information then exits the menu
+func (h *Handlers) QuitWithHelp(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	var res resource.Result
+
+	flag_account_authorized, _ := h.flagManager.GetFlag("flag_account_authorized")
+
+	code := codeFromCtx(ctx)
+	l := gotext.NewLocale(translationDir, code)
+	l.AddDomain("default")
+
+	res.Content = l.Get("For more help,please call: 0757628885")
+	res.FlagReset = append(res.FlagReset, flag_account_authorized)
+	return res, nil
+}
+
+
 // VerifyYob verifies the length of the given input
 func (h *Handlers) VerifyYob(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result

internal/handlers/ussd/menuhandler_test.go

@@ -539,63 +539,55 @@ func TestSetLanguage(t *testing.T) {
 	// Define test cases
 	tests := []struct {
 		name                string
-		input               []byte
-		expectedFlags       []uint32
+		execPath            []string
 		expectedResult      resource.Result
-		flagManagerResponse uint32
-		flagManagerError    error
 	}{
 		{
-			name:          "English language",
-			input:         []byte("0"),
-			expectedFlags: []uint32{state.FLAG_LANG, 123},
+			name:     "Set Default Language (English)",
+			execPath: []string{"set_default"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "eng",
 			},
-			flagManagerResponse: 123,
-			flagManagerError:    nil,
 		},
 		{
-			name:          "Swahili language",
-			input:         []byte("1"),
-			expectedFlags: []uint32{state.FLAG_LANG, 123},
+			name:     "Set Swahili Language",
+			execPath: []string{"set_swa"},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{state.FLAG_LANG, 8},
 				Content: "swa",
 			},
-			flagManagerResponse: 123,
-			flagManagerError:    nil,
 		},
 		{
-			name:          "Unhandled Input",
-			input:         []byte("3"),
-			expectedFlags: []uint32{123},
+			name:     "Unhandled path",
+			execPath: []string{""},
 			expectedResult: resource.Result{
 				FlagSet: []uint32{8},
 			},
-			flagManagerResponse: 123,
-			flagManagerError:    nil,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
+			mockState := state.NewState(16)
+			// Set the ExecPath
+			mockState.ExecPath = tt.execPath
 
 			// Create the Handlers instance with the mock flag manager
 			h := &Handlers{
 				flagManager: fm.parser,
+				st:          mockState,
 			}
 
 			// Call the method
-			res, err := h.SetLanguage(context.Background(), "set_language", tt.input)
+			res, err := h.SetLanguage(context.Background(), "set_language", nil)
 
 			if err != nil {
 				t.Error(err)
 			}
 
 			// Assert that the Result FlagSet has the required flags after language switch
-			assert.Equal(t, res, tt.expectedResult, "Flags should be equal to account created")
+			assert.Equal(t, res, tt.expectedResult, "Result should match expected result")
 
 		})
 	}
@@ -1696,3 +1688,148 @@ func TestGetProfile(t *testing.T) {
 		})
 	}
 }
+
+func TestVerifyNewPin(t *testing.T) {
+	sessionId := "session123"
+
+	fm, _ := NewFlagManager(flagsPath)
+
+	flag_valid_pin, _ := fm.parser.GetFlag("flag_valid_pin")
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		flagManager:    fm.parser,
+		accountService: mockCreateAccountService,
+	}
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
+	tests := []struct {
+		name           string
+		input          []byte
+		expectedResult resource.Result
+	}{
+		{
+			name:  "Test with valid pin",
+			input: []byte("1234"),
+			expectedResult: resource.Result{
+				FlagSet: []uint32{flag_valid_pin},
+			},
+		},
+		{
+			name:  "Test with invalid pin",
+			input: []byte("123"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_valid_pin},
+			},
+		},
+		{
+			name:  "Test with invalid pin",
+			input: []byte("12345"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_valid_pin},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+
+			//Call the function under test
+			res, _ := h.VerifyNewPin(ctx, "verify_new_pin", tt.input)
+
+			// Assert that expectations were met
+			mockDataStore.AssertExpectations(t)
+
+			//Assert that the result set to content is what was expected
+			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
+
+		})
+	}
+
+}
+
+func TestSaveTemporaryPIn(t *testing.T) {
+
+	fm, err := NewFlagManager(flagsPath)
+
+	if err != nil {
+		t.Logf(err.Error())
+	}
+
+	// Create a new instance of UserDataStore
+	mockStore := new(mocks.MockUserDataStore)
+
+	// Define test data
+	sessionId := "session123"
+	PIN := "1234"
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
+	// Set up the expected behavior of the mock
+	mockStore.On("WriteEntry", ctx, sessionId, utils.DATA_TEMPORARY_PIN, []byte(PIN)).Return(nil)
+
+	// Create the Handlers instance with the mock store
+	h := &Handlers{
+		userdataStore: mockStore,
+		flagManager:   fm.parser,
+	}
+
+	// Call the method
+	res, err := h.SaveTemporaryPin(ctx, "save_temporary_pin", []byte(PIN))
+
+	// Assert results
+	assert.NoError(t, err)
+	assert.Equal(t, resource.Result{}, res)
+
+	// Assert all expectations were met
+	mockStore.AssertExpectations(t)
+}
+
+func TestConfirmPin(t *testing.T) {
+	sessionId := "session123"
+
+	fm, _ := NewFlagManager(flagsPath)
+	flag_pin_mismatch, _ := fm.parser.GetFlag("flag_pin_mismatch")
+	mockDataStore := new(mocks.MockUserDataStore)
+	mockCreateAccountService := new(mocks.MockAccountService)
+	h := &Handlers{
+		userdataStore:  mockDataStore,
+		flagManager:    fm.parser,
+		accountService: mockCreateAccountService,
+	}
+	ctx := context.WithValue(context.Background(), "SessionId", sessionId)
+
+	tests := []struct {
+		name           string
+		input          []byte
+		temporarypin   []byte
+		expectedResult resource.Result
+	}{
+		{
+			name:         "Test with correct pin confirmation",
+			input:        []byte("1234"),
+			temporarypin: []byte("1234"),
+			expectedResult: resource.Result{
+				FlagReset: []uint32{flag_pin_mismatch},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Set up the expected behavior of the mock
+			mockDataStore.On("WriteEntry", ctx, sessionId, utils.DATA_ACCOUNT_PIN, []byte(tt.temporarypin)).Return(nil)
+
+			mockDataStore.On("ReadEntry", ctx, sessionId, utils.DATA_TEMPORARY_PIN).Return(tt.temporarypin, nil)
+
+			//Call the function under test
+			res, _ := h.ConfirmPinChange(ctx, "confirm_pin_change", tt.temporarypin)
+
+			// Assert that expectations were met
+			mockDataStore.AssertExpectations(t)
+
+			//Assert that the result set to content is what was expected
+			assert.Equal(t, res, tt.expectedResult, "Result should contain flags set according to user input")
+
+		})
+	}
+
+}

services/registration/Makefile

@@ -1,10 +1,11 @@
 # Variables to match files in the current directory
 INPUTS = $(wildcard ./*.vis)
 TXTS = $(wildcard ./*.txt.orig)
+VISE_PATH := ../../go-vise
 
 # Rule to build .bin files from .vis files
 %.vis:
-	go run  ../../go-vise/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
+	go run  $(VISE_PATH)/dev/asm/main.go -f pp.csv $(basename $@).vis > $(basename $@).bin
 	@echo "Built $(basename $@).bin from $(basename $@).vis"
 
 # Rule to copy .orig files to .txt

services/registration/back_menu_swa

@@ -1 +1 @@
-Rudi
+Rudi

services/registration/balances

@@ -1 +1 @@
-Balances:
+Balances:

services/registration/balances_swa

@@ -1 +1 @@
-Salio
+Salio:

services/registration/change_language

@@ -0,0 +1 @@
+Select language:

services/registration/change_language.vis

@@ -0,0 +1,10 @@
+LOAD reset_account_authorized 0
+LOAD reset_incorrect 0
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH pin_entry flag_account_authorized 0
+MOUT english 0
+MOUT kiswahili 1
+HALT
+INCMP set_default 0
+INCMP set_swa 1
+INCMP . *

services/registration/change_language_menu_swa

@@ -1 +1 @@
-Badili lugha
+Badili lugha

services/registration/change_language_swa

@@ -0,0 +1 @@
+Chagua lugha:

services/registration/change_pin_menu

@@ -1 +1 @@
-Change PIN
+Change PIN

services/registration/change_pin_menu_swa

@@ -1 +1 @@
-Badili PIN
+Badili PIN

services/registration/check_statement_menu

@@ -1 +1 @@
-Check statement
+Check statement

services/registration/community_balance

@@ -1,2 +1 @@
-Your community balance is: 0.00SRF
-
+Your community balance is: 0.00SRF

services/registration/community_balance_menu

@@ -1 +1 @@
-Community  balance
+Community balance

services/registration/edit_name_menu

@@ -1 +1 @@
-Edit name
+Edit name

services/registration/edit_name_menu_swa

@@ -1 +1 @@
-Weka jina
+Weka jina

services/registration/edit_offerings_menu

@@ -1 +1 @@
-Edit offerings
+Edit offerings

services/registration/enter_familyname

@@ -1 +1 @@
-Enter family name:
+Enter family name:

services/registration/enter_location

@@ -1 +1 @@
-Enter your location:
+Enter your location:

services/registration/enter_name_swa

@@ -1 +1 @@
-Weka majina yako ya kwanza:
+Weka majina yako ya kwanza:

services/registration/female_menu

@@ -1 +1 @@
-Female
+Female

services/registration/guard_pin_menu

@@ -1 +1 @@
-Guard my PIN
+Guard my PIN

services/registration/guard_pin_menu_swa

@@ -1 +1 @@
-Linda PIN yangu
+Linda PIN yangu

services/registration/help.vis

@@ -0,0 +1,2 @@
+LOAD quit_with_help 0
+HALT

services/registration/incorrect_date_format

@@ -1,2 +1,2 @@
 The year of birth you entered is invalid.
-Please try again.
+Please try again.

services/registration/incorrect_pin

@@ -1 +1 @@
-Incorrect  pin
+Incorrect pin

services/registration/language_changed

@@ -0,0 +1 @@
+Your language change request was successful.

services/registration/language_changed.vis

@@ -0,0 +1,5 @@
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP ^ 0
+INCMP quit 9

services/registration/language_changed_swa

@@ -0,0 +1 @@
+Ombi lako la kubadilisha lugha limefanikiwa.

services/registration/locale/swa/default.po

@@ -6,3 +6,7 @@ msgstr "Ombi lako limetumwa. %s atapokea %s kutoka kwa %s."
 
 msgid "Thank you for using Sarafu. Goodbye!"
 msgstr "Asante kwa kutumia huduma ya Sarafu. Kwaheri!"
+
+
+msgid "For more help,please call: 0757628885"
+msgstr "Kwa usaidizi zaidi,piga: 0757628885"

services/registration/main.vis

@@ -10,6 +10,6 @@ HALT
 INCMP send 1
 INCMP quit 2
 INCMP my_account 3
-INCMP quit 4
+INCMP help 4
 INCMP quit 9
 INCMP . *

services/registration/my_account.vis

@@ -9,6 +9,7 @@ MOUT back 0
 HALT
 INCMP _ 0
 INCMP edit_profile 1
+INCMP change_language 2
 INCMP balances 3
 INCMP pin_management 5
 INCMP address 6

services/registration/my_address_menu_swa

@@ -1 +1 @@
-Anwani yangu
+Anwani yangu

services/registration/my_balance_swa

@@ -1 +1 @@
-Salio lako ni: 0.00 SRF
+Salio lako ni: 0.00 SRF

services/registration/no_menu

@@ -1 +1 @@
-no
+no

services/registration/no_menu_swa

@@ -1 +1 @@
-la
+la

services/registration/pin_entry_swa

@@ -1 +1 @@
-Tafadhali weka PIN yako
+Tafadhali weka PIN yako

services/registration/pin_management

@@ -1 +1 @@
-PIN Management
+PIN Management

services/registration/profile_menu

@@ -1 +1 @@
-Profile
+Profile

services/registration/profile_menu_swa

@@ -1 +1 @@
-Wasifu  wangu
+Wasifu wangu

services/registration/quit_menu

@@ -0,0 +1 @@
+Quit

services/registration/quit_menu_swa

@@ -0,0 +1 @@
+Ondoka

services/registration/reset_pin_menu_swa

@@ -1 +1 @@
-Badili PIN ya mwenzio
+Badili PIN ya mwenzio

services/registration/select_language.vis

@@ -1,6 +1,6 @@
 MOUT english 0
 MOUT kiswahili 1
 HALT
-INCMP terms 0
-INCMP terms 1
+INCMP set_default 0
+INCMP set_swa 1
 INCMP . *

services/registration/send

@@ -1 +1 @@
-Enter recipient's phone number:
+Enter recipient's phone number:

services/registration/set_default.vis

@@ -0,0 +1,3 @@
+LOAD set_language 6
+CATCH terms flag_account_created 0
+MOVE language_changed

services/registration/set_swa.vis

@@ -0,0 +1,3 @@
+LOAD set_language 6
+CATCH terms flag_account_created 0
+MOVE language_changed

services/registration/terms.vis

@@ -1,5 +1,3 @@
-LOAD select_language 0
-RELOAD select_language
 MOUT yes 0
 MOUT no 1
 HALT

services/registration/transaction_pin

@@ -1,2 +1,2 @@
 {{.get_recipient}} will receive {{.validate_amount}} from {{.get_sender}}
-Please enter your PIN to confirm:
+Please enter your PIN to confirm:

services/registration/unspecified_menu

@@ -1 +1 @@
-Unspecified
+Unspecified

services/registration/update_success

@@ -1 +1 @@
-Profile updated successfully
+Profile updated successfully

services/registration/update_success_swa

@@ -1 +1 @@
-Akaunti  imeupdatiwa
+Akaunti imeupdatiwa

services/registration/view_profile

@@ -1,2 +1,2 @@
-My profile: 
-{{.get_profile_info}} 
+My profile:
+{{.get_profile_info}}

services/registration/view_profile_swa

@@ -1 +1,2 @@
-Wasifu wangu
+Wasifu wangu:
+{{.get_profile_info}}

services/registration/view_swa

@@ -1 +1 @@
-Angalia Wasifu
+Angalia Wasifu

services/registration/yes_menu

@@ -1 +1 @@
-yes
+yes

services/registration/yes_menu_swa

@@ -1 +1 @@
-ndio
+ndio