entry/handlers.go

@@ -1,10 +0,0 @@
-package entry
-
-import (
-	"git.defalsify.org/vise.git/persist"
-)
-
-type EntryHandler interface {
-	Init(context.Context, string, []byte) (*resource.Result, error) // HandlerFunc
-	Exit()
-}

handlers/base.go

@@ -1,30 +1,95 @@
-package session
+package handlers
 
 import (
+	"context"
+	"fmt"
+
+	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
+	"git.defalsify.org/vise.git/state"
+	"git.defalsify.org/vise.git/cache"
 	"git.defalsify.org/vise.git/engine"
 	"git.defalsify.org/vise.git/persist"
 	"git.defalsify.org/vise.git/resource"
 	"git.defalsify.org/vise.git/logging"
-	"git.grassecon.net/grassrootseconomics/visedriver/handlers"
+
 	"git.grassecon.net/grassrootseconomics/visedriver/request"
-	"git.grassecon.net/grassrootseconomics/visedriver/storage"
 	"git.grassecon.net/grassrootseconomics/visedriver/errors"
+	dbstorage "git.grassecon.net/grassrootseconomics/visedriver/storage/db"
+	"git.grassecon.net/grassrootseconomics/visedriver/common"
+	"git.grassecon.net/grassrootseconomics/visedriver/storage"
+	"git.grassecon.net/grassrootseconomics/visedriver/remote"
+	"git.grassecon.net/grassrootseconomics/visedriver/models"
+	"git.grassecon.net/grassrootseconomics/visedriver/utils"
 )
 
 var (
-	logg = logging.NewVanilla().WithDomain("visedriver.session")
+	logg = logging.NewVanilla().WithDomain("handlers")
 )
 
+type Handlers struct {
+	pe                   *persist.Persister
+	st                   *state.State
+	ca                   cache.Memory
+	userdataStore        common.DataStore
+	adminstore           *utils.AdminStore
+	flagManager          *asm.FlagParser
+	accountService       remote.AccountServiceInterface
+	prefixDb             dbstorage.PrefixDb
+	profile              *models.Profile
+	ReplaceSeparatorFunc func(string) string
+}
+
+// NewHandlers creates a new instance of the Handlers struct with the provided dependencies.
+func NewHandlers(appFlags *asm.FlagParser, userdataStore db.Db, adminstore *utils.AdminStore, accountService remote.AccountServiceInterface, replaceSeparatorFunc func(string) string) (*Handlers, error) {
+	if userdataStore == nil {
+		return nil, fmt.Errorf("cannot create handler with nil userdata store")
+	}
+	userDb := &common.UserDataStore{
+		Db: userdataStore,
+	}
+
+	// Instantiate the SubPrefixDb with "DATATYPE_USERDATA" prefix
+	prefix := common.ToBytes(db.DATATYPE_USERDATA)
+	prefixDb := dbstorage.NewSubPrefixDb(userdataStore, prefix)
+
+	h := &Handlers{
+		userdataStore:        userDb,
+		flagManager:          appFlags,
+		adminstore:           adminstore,
+		accountService:       accountService,
+		prefixDb:             prefixDb,
+		profile:              &models.Profile{Max: 6},
+		ReplaceSeparatorFunc: replaceSeparatorFunc,
+	}
+	return h, nil
+}
+
+func (h *Handlers) Exit() {
+	h.pe = nil
+}
+
+func (h *Handlers) Init(ctx context.Context, sym string, input []byte) (resource.Result, error) {
+	return resource.Result{}, nil
+}
+
+// WithPersister sets persister instance to the handlers.
+func (h *Handlers) WithPersister(pe *persist.Persister) *Handlers {
+	if h.pe != nil {
+		panic("persister already set")
+	}
+	h.pe = pe
+	return h
+}
 type BaseSessionHandler struct {
 	cfgTemplate engine.Config
 	rp request.RequestParser
 	rs resource.Resource
-	hn *handlers.Handlers
+	hn *Handlers
 	provider storage.StorageProvider
 }
 
-func NewBaseSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *handlers.Handlers) *BaseSessionHandler {
+func NewBaseSessionHandler(cfg engine.Config, rs resource.Resource, stateDb db.Db, userdataDb db.Db, rp request.RequestParser, hn *Handlers) *BaseSessionHandler {
 	return &BaseSessionHandler{
 		cfgTemplate: cfg,
 		rs:          rs,

request/request.go

@@ -43,7 +43,6 @@ type RequestHandler interface {
 	Reset(rs RequestSession) (RequestSession, error)
 	Shutdown()
 }
-
 type SessionHandler struct {
 	RequestHandler
 }

services/registration/Makefile

@@ -0,0 +1,18 @@
+# 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  $(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
+%.txt.orig:
+	cp -v $(basename $@).orig $(basename $@)
+	@echo "Copied $(basename $@).orig to $(basename $@)"
+
+# 'all' target depends on all .vis and .txt.orig files
+all: $(INPUTS) $(TXTS)
+	@echo "Running all: $(INPUTS) $(TXTS)"

services/registration/_catch

@@ -0,0 +1 @@
+Something went wrong.Please try again

services/registration/_catch.vis

@@ -0,0 +1 @@
+HALT

services/registration/_catch_swa

@@ -0,0 +1 @@
+Tatizo la kimtambo limetokea,tafadhali jaribu tena baadaye.

services/registration/account_creation

@@ -0,0 +1 @@
+Your account is being created...

services/registration/account_creation.vis

@@ -0,0 +1,4 @@
+RELOAD verify_create_pin
+CATCH create_pin_mismatch flag_pin_mismatch 1
+LOAD quit 0
+HALT

services/registration/account_creation_failed

@@ -0,0 +1 @@
+Your account creation request failed. Please try again later.

services/registration/account_creation_failed.vis

@@ -0,0 +1,3 @@
+MOUT quit 9
+HALT
+INCMP quit 9

services/registration/account_creation_failed_swa

@@ -0,0 +1 @@
+Ombi lako la kusajiliwa haliwezi kukamilishwa. Tafadhali jaribu tena baadaye.

services/registration/account_creation_swa

@@ -0,0 +1 @@
+Akaunti yako inatengenezwa...

services/registration/account_menu

@@ -0,0 +1 @@
+My Account

services/registration/account_menu_swa

@@ -0,0 +1 @@
+Akaunti yangu

services/registration/account_pending

@@ -0,0 +1 @@
+Your account is still being created.

services/registration/account_pending.vis

@@ -0,0 +1,3 @@
+RELOAD check_account_status
+CATCH main flag_account_success 1
+HALT

services/registration/account_pending_swa

@@ -0,0 +1 @@
+Akaunti yako bado inatengenezwa

services/registration/address

@@ -0,0 +1 @@
+Address: {{.check_identifier}}

services/registration/address.vis

@@ -0,0 +1,8 @@
+LOAD check_identifier 0
+RELOAD check_identifier
+MAP check_identifier
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP _ 0
+INCMP quit 9

services/registration/address_swa

@@ -0,0 +1 @@
+Anwani:{{.check_identifier}}

services/registration/amount

@@ -0,0 +1,2 @@
+Maximum amount: {{.max_amount}}
+Enter amount:

services/registration/amount.vis

@@ -0,0 +1,15 @@
+LOAD reset_transaction_amount 0
+LOAD max_amount 10
+RELOAD max_amount
+MAP max_amount
+MOUT back 0
+HALT
+LOAD validate_amount 64
+RELOAD validate_amount
+CATCH api_failure flag_api_call_error  1
+CATCH invalid_amount flag_invalid_amount 1
+INCMP _ 0
+LOAD get_recipient 0
+LOAD get_sender 64
+LOAD get_amount 32
+INCMP transaction_pin *

services/registration/amount_swa

@@ -0,0 +1,2 @@
+Kiwango cha juu: {{.max_amount}}
+Weka kiwango:

services/registration/api_failure

@@ -0,0 +1 @@
+Failed to connect to the custodial service.Please try again.

services/registration/api_failure.vis

@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP _ 1
+INCMP quit 9

services/registration/back_menu

@@ -0,0 +1 @@
+Back

services/registration/back_menu_swa

@@ -0,0 +1 @@
+Rudi

services/registration/balances

@@ -0,0 +1 @@
+Balances:

services/registration/balances.vis

@@ -0,0 +1,10 @@
+LOAD reset_account_authorized 0
+RELOAD reset_account_authorized
+MOUT my_balance 1
+MOUT community_balance 2
+MOUT back 0
+HALT
+INCMP _ 0
+INCMP my_balance 1
+INCMP community_balance 2
+INCMP . * 

services/registration/balances_swa

@@ -0,0 +1 @@
+Salio:

services/registration/blocked_account.vis

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

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 1
+MOUT kiswahili 2
+HALT
+INCMP set_eng 1
+INCMP set_swa 2
+INCMP . *

services/registration/change_language_menu

@@ -0,0 +1 @@
+Change language

services/registration/change_language_menu_swa

@@ -0,0 +1 @@
+Badili lugha

services/registration/change_language_swa

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

services/registration/change_pin_menu

@@ -0,0 +1 @@
+Change PIN

services/registration/change_pin_menu_swa

@@ -0,0 +1 @@
+Badili PIN

services/registration/check_balance_menu

@@ -0,0 +1 @@
+Check balances

services/registration/check_balance_menu_swa

@@ -0,0 +1 @@
+Angalia salio

services/registration/check_statement

@@ -0,0 +1 @@
+Please enter your PIN to view statement:

services/registration/check_statement.vis

@@ -0,0 +1,12 @@
+LOAD check_transactions 0
+RELOAD check_transactions
+CATCH no_transfers flag_no_transfers 1
+LOAD authorize_account 6
+MOUT back 0
+MOUT quit 9
+HALT
+RELOAD authorize_account
+CATCH incorrect_pin flag_incorrect_pin 1
+INCMP _ 0
+INCMP quit 9
+INCMP transactions *

services/registration/check_statement_menu

@@ -0,0 +1 @@
+Check statement

services/registration/check_statement_menu_swa

@@ -0,0 +1 @@
+Taarifa ya matumizi

services/registration/check_statement_swa

@@ -0,0 +1 @@
+Tafadhali weka PIN yako kuona taarifa ya matumizi:

services/registration/comminity_balance_swa

@@ -0,0 +1 @@
+{{.fetch_community_balance}}

services/registration/community_balance

@@ -0,0 +1 @@
+{{.fetch_community_balance}}

services/registration/community_balance.vis

@@ -0,0 +1,12 @@
+LOAD reset_incorrect 6
+LOAD fetch_community_balance 0
+CATCH api_failure  flag_api_call_error  1
+MAP fetch_community_balance
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH pin_entry flag_account_authorized 0
+MOUT back 0
+MOUT quit 9
+HALT
+INCMP _ 0
+INCMP quit 9
+INCMP . * 

services/registration/community_balance_menu

@@ -0,0 +1 @@
+Community balance

services/registration/community_balance_menu_swa

@@ -0,0 +1 @@
+Salio la kikundi

services/registration/confirm_create_pin

@@ -0,0 +1 @@
+Enter your four number PIN again:

services/registration/confirm_create_pin.vis

@@ -0,0 +1,4 @@
+LOAD save_temporary_pin 6
+HALT
+LOAD verify_create_pin 8
+INCMP account_creation *

services/registration/confirm_create_pin_swa

@@ -0,0 +1 @@
+Weka PIN yako tena:

services/registration/confirm_others_new_pin

@@ -0,0 +1 @@
+Please confirm new PIN  for:{{.retrieve_blocked_number}}

services/registration/confirm_others_new_pin.vis

@@ -0,0 +1,14 @@
+CATCH pin_entry flag_incorrect_pin 1
+RELOAD retrieve_blocked_number
+MAP retrieve_blocked_number
+CATCH invalid_others_pin flag_valid_pin 0
+CATCH pin_reset_result flag_account_authorized 1
+LOAD save_others_temporary_pin 6
+RELOAD save_others_temporary_pin
+MOUT back 0
+HALT 
+INCMP _ 0
+LOAD check_pin_mismatch 0
+RELOAD check_pin_mismatch
+CATCH others_pin_mismatch flag_pin_mismatch 1
+INCMP pin_entry *

services/registration/confirm_others_new_pin_swa

@@ -0,0 +1 @@
+Tafadhali thibitisha PIN mpya ya: {{.retrieve_blocked_number}}

services/registration/confirm_pin_change

@@ -0,0 +1 @@
+Confirm your new PIN:

services/registration/confirm_pin_change.vis

@@ -0,0 +1,5 @@
+CATCH invalid_pin flag_valid_pin 0
+MOUT back 0
+HALT
+INCMP _ 0
+INCMP * pin_reset_success

services/registration/confirm_pin_change_swa

@@ -0,0 +1 @@
+Thibitisha PIN yako mpya:

services/registration/create_pin

@@ -0,0 +1 @@
+Please enter a new four number PIN for your account:

services/registration/create_pin.vis

@@ -0,0 +1,9 @@
+LOAD create_account 0
+CATCH account_creation_failed flag_account_creation_failed 1
+MOUT exit 0
+HALT
+LOAD save_temporary_pin 6
+RELOAD save_temporary_pin
+CATCH . flag_incorrect_pin 1
+INCMP quit 0
+INCMP confirm_create_pin *

services/registration/create_pin_mismatch

@@ -0,0 +1 @@
+The PIN is not a match. Try again

services/registration/create_pin_mismatch.vis

@@ -0,0 +1,5 @@
+MOUT retry 1
+MOUT quit 9
+HALT
+INCMP confirm_create_pin 1
+INCMP quit 9

services/registration/create_pin_mismatch_swa

@@ -0,0 +1 @@
+PIN uliyoweka haifanani. Jaribu tena

services/registration/create_pin_swa

@@ -0,0 +1 @@
+Tafadhali weka PIN mpya yenye nambari nne kwa akaunti yako:

services/registration/display_profile_info

@@ -0,0 +1,5 @@
+Wasifu wangu
+Name: Not provided
+Gender: Not provided
+Age: Not provided
+Location: Not provided

services/registration/display_profile_info.vis

@@ -0,0 +1,3 @@
+MOUT back 0
+HALT
+INCMP _ 0

services/registration/edit_family_name

@@ -0,0 +1,2 @@
+Current family name: {{.get_current_profile_info}}
+Enter family name:

services/registration/edit_family_name.vis

@@ -0,0 +1,18 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_familyname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
+MOUT back 0
+HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD save_familyname 64
+RELOAD save_familyname
+CATCH pin_entry flag_familyname_set 1
+CATCH select_gender flag_gender_set 0
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_familyname_set 0
+INCMP select_gender *

services/registration/edit_family_name_menu

@@ -0,0 +1 @@
+Edit family name

services/registration/edit_family_name_menu_swa

@@ -0,0 +1 @@
+Weka jina la familia

services/registration/edit_family_name_swa

@@ -0,0 +1,2 @@
+Jina la familia la sasa: {{.get_current_profile_info}}
+Weka jina la familia

services/registration/edit_first_name

@@ -0,0 +1,2 @@
+Current name: {{.get_current_profile_info}}
+Enter your first names:

services/registration/edit_first_name.vis

@@ -0,0 +1,18 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_firstname flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
+MOUT back 0
+HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD save_firstname 128
+RELOAD save_firstname
+CATCH pin_entry flag_firstname_set 1
+CATCH edit_family_name flag_familyname_set 0
+CATCH edit_gender flag_gender_set 0
+CATCH edit_yob flag_yob_set 0
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_firstname_set 0

services/registration/edit_first_name_menu

@@ -0,0 +1 @@
+Edit name

services/registration/edit_first_name_menu_swa

@@ -0,0 +1 @@
+Weka jina

services/registration/edit_first_name_swa

@@ -0,0 +1,2 @@
+Jina la kwanza la sasa: {{.get_current_profile_info}}
+Weka majina yako ya kwanza:

services/registration/edit_gender_menu

@@ -0,0 +1 @@
+Edit gender

services/registration/edit_gender_menu_swa

@@ -0,0 +1 @@
+Weka jinsia

services/registration/edit_location

@@ -0,0 +1,2 @@
+Current location: {{.get_current_profile_info}}
+Enter your location:

services/registration/edit_location.vis

@@ -0,0 +1,15 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_location flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+LOAD save_location 16
+MOUT back 0
+HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+RELOAD save_location
+INCMP _ 0
+CATCH pin_entry flag_location_set 1
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_location_set 0
+INCMP edit_offerings *

services/registration/edit_location_menu

@@ -0,0 +1 @@
+Edit location

services/registration/edit_location_menu_swa

@@ -0,0 +1 @@
+Weka eneo

services/registration/edit_location_swa

@@ -0,0 +1,2 @@
+Eneo la sasa: {{.get_current_profile_info}}
+Weka eneo:

services/registration/edit_offerings

@@ -0,0 +1,2 @@
+Current offerings: {{.get_current_profile_info}}
+Enter the services or goods you offer: 

services/registration/edit_offerings.vis

@@ -0,0 +1,13 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_offerings flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+LOAD save_offerings 8
+MOUT back 0
+HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+RELOAD save_offerings
+INCMP _ 0
+CATCH pin_entry flag_offerings_set 1
+INCMP update_profile_items *

services/registration/edit_offerings_menu

@@ -0,0 +1 @@
+Edit offerings

services/registration/edit_offerings_menu_swa

@@ -0,0 +1 @@
+Weka unachouza

services/registration/edit_offerings_swa

@@ -0,0 +1,2 @@
+Unachouza kwa sasa: {{.get_current_profile_info}}
+Weka unachouza

services/registration/edit_profile

@@ -0,0 +1 @@
+My profile

services/registration/edit_profile.vis

@@ -0,0 +1,23 @@
+LOAD reset_account_authorized 16
+RELOAD reset_account_authorized
+LOAD reset_allow_update 0
+RELOAD reset_allow_update
+MOUT edit_first_name 1
+MOUT edit_family_name 2
+MOUT edit_gender 3
+MOUT edit_yob 4
+MOUT edit_location 5
+MOUT edit_offerings 6
+MOUT view 7
+MOUT back 0
+HALT
+LOAD set_back 6
+INCMP ^ 0
+INCMP edit_first_name 1
+INCMP edit_family_name 2
+INCMP select_gender 3
+INCMP edit_yob 4
+INCMP edit_location 5
+INCMP edit_offerings 6
+INCMP view_profile 7
+INCMP . * 

services/registration/edit_profile_swa

@@ -0,0 +1 @@
+Wasifu wangu

services/registration/edit_yob

@@ -0,0 +1,2 @@
+Current year of birth: {{.get_current_profile_info}}
+Enter your year of birth

services/registration/edit_yob.vis

@@ -0,0 +1,19 @@
+CATCH incorrect_pin flag_incorrect_pin 1
+CATCH update_yob flag_allow_update 1
+LOAD get_current_profile_info 0
+RELOAD get_current_profile_info
+MAP get_current_profile_info
+MOUT back 0
+HALT
+RELOAD set_back 
+CATCH _ flag_back_set 1
+LOAD verify_yob 6
+RELOAD verify_yob
+CATCH incorrect_date_format flag_incorrect_date_format 1
+LOAD save_yob 32
+RELOAD save_yob
+CATCH pin_entry flag_yob_set 1
+CATCH edit_location flag_location_set 0
+CATCH edit_offerings flag_offerings_set 0
+CATCH pin_entry flag_yob_set 0
+INCMP edit_location *

services/registration/edit_yob_menu

@@ -0,0 +1 @@
+Edit year of birth

services/registration/edit_yob_menu_swa

@@ -0,0 +1 @@
+Weka mwaka wa kuzaliwa

services/registration/edit_yob_swa

@@ -0,0 +1,2 @@
+Mwaka wa sasa wa kuzaliwa: {{.get_current_profile_info}}
+Weka mwaka wa kuzaliwa

services/registration/english_menu

@@ -0,0 +1 @@
+English