Compare commits
No commits in common. "cc36ddcb6de9eeaec9ffb530e972658b533b5818" and "308f3327d065b50d60257046438474078d98fa3b" have entirely different histories.
cc36ddcb6d
...
308f3327d0
21
common/db.go
21
common/db.go
@ -2,7 +2,6 @@ package common
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"errors"
|
||||
|
||||
"git.defalsify.org/vise.git/logging"
|
||||
)
|
||||
@ -49,23 +48,3 @@ func PackKey(typ DataTyp, data []byte) []byte {
|
||||
v := typToBytes(typ)
|
||||
return append(v, data...)
|
||||
}
|
||||
|
||||
func StringToDataTyp(str string) (DataTyp, error) {
|
||||
switch str {
|
||||
case "DATA_FIRST_NAME":
|
||||
return DATA_FIRST_NAME, nil
|
||||
case "DATA_FAMILY_NAME":
|
||||
return DATA_FAMILY_NAME, nil
|
||||
case "DATA_YOB":
|
||||
return DATA_YOB, nil
|
||||
case "DATA_LOCATION":
|
||||
return DATA_LOCATION, nil
|
||||
case "DATA_GENDER":
|
||||
return DATA_GENDER, nil
|
||||
case "DATA_OFFERINGS":
|
||||
return DATA_OFFERINGS, nil
|
||||
|
||||
default:
|
||||
return 0, errors.New("invalid DataTyp string")
|
||||
}
|
||||
}
|
||||
|
@ -115,7 +115,6 @@ func (ls *LocalHandlerService) GetHandler(accountService remote.AccountServiceIn
|
||||
ls.DbRs.AddLocalFunc("reset_unregistered_number", ussdHandlers.ResetUnregisteredNumber)
|
||||
ls.DbRs.AddLocalFunc("reset_others_pin", ussdHandlers.ResetOthersPin)
|
||||
ls.DbRs.AddLocalFunc("save_others_temporary_pin", ussdHandlers.SaveOthersTemporaryPin)
|
||||
ls.DbRs.AddLocalFunc("get_current_profile_info", ussdHandlers.GetCurrentProfileInfo)
|
||||
|
||||
return ussdHandlers, nil
|
||||
}
|
||||
|
@ -1153,95 +1153,6 @@ func (h *Handlers) InitiateTransaction(ctx context.Context, sym string, input []
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (h *Handlers) GetCurrentProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||
var res resource.Result
|
||||
var profileInfo []byte
|
||||
var err error
|
||||
sessionId, ok := ctx.Value("SessionId").(string)
|
||||
if !ok {
|
||||
return res, fmt.Errorf("missing session")
|
||||
}
|
||||
sm, _ := h.st.Where()
|
||||
parts := strings.SplitN(sm, "_", 2)
|
||||
filename := parts[1]
|
||||
dbKeyStr := "DATA_" + strings.ToUpper(filename)
|
||||
dbKey, err := common.StringToDataTyp(dbKeyStr)
|
||||
|
||||
if err != nil {
|
||||
return res, err
|
||||
}
|
||||
store := h.userdataStore
|
||||
|
||||
switch dbKey {
|
||||
case common.DATA_FIRST_NAME:
|
||||
profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_FIRST_NAME)
|
||||
if err != nil {
|
||||
if db.IsNotFound(err) {
|
||||
res.Content = "-"
|
||||
break
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
res.Content = string(profileInfo)
|
||||
case common.DATA_FAMILY_NAME:
|
||||
profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_FAMILY_NAME)
|
||||
if err != nil {
|
||||
if db.IsNotFound(err) {
|
||||
res.Content = "-"
|
||||
break
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
res.Content = string(profileInfo)
|
||||
|
||||
case common.DATA_GENDER:
|
||||
profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_GENDER)
|
||||
if err != nil {
|
||||
if db.IsNotFound(err) {
|
||||
res.Content = "-"
|
||||
break
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
res.Content = string(profileInfo)
|
||||
case common.DATA_YOB:
|
||||
profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_YOB)
|
||||
if err != nil {
|
||||
if db.IsNotFound(err) {
|
||||
res.Content = "-"
|
||||
break
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
res.Content = string(profileInfo)
|
||||
|
||||
case common.DATA_LOCATION:
|
||||
profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_LOCATION)
|
||||
if err != nil {
|
||||
if db.IsNotFound(err) {
|
||||
res.Content = "-"
|
||||
break
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
res.Content = string(profileInfo)
|
||||
case common.DATA_OFFERINGS:
|
||||
profileInfo, err = store.ReadEntry(ctx, sessionId, common.DATA_OFFERINGS)
|
||||
if err != nil {
|
||||
if db.IsNotFound(err) {
|
||||
res.Content = "-"
|
||||
break
|
||||
}
|
||||
return res, err
|
||||
}
|
||||
res.Content = string(profileInfo)
|
||||
default:
|
||||
break
|
||||
}
|
||||
|
||||
return res, nil
|
||||
}
|
||||
|
||||
func (h *Handlers) GetProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
|
||||
var res resource.Result
|
||||
var defaultValue string
|
||||
|
@ -1,2 +0,0 @@
|
||||
Current familyname: {{.get_current_profile_info}}
|
||||
Enter family name:
|
@ -1,10 +0,0 @@
|
||||
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
|
||||
MOUT back 0
|
||||
HALT
|
||||
LOAD save_familyname 0
|
||||
RELOAD save_familyname
|
||||
INCMP _ 0
|
||||
INCMP pin_entry *
|
@ -1 +0,0 @@
|
||||
Edit family name
|
@ -1 +0,0 @@
|
||||
Weka jina la familia
|
@ -1,2 +0,0 @@
|
||||
Jina la familia la sasa: {{.get_current_profile_info}}
|
||||
Weka jina la familia
|
@ -1,2 +0,0 @@
|
||||
Current name: {{.get_current_profile_info}}
|
||||
Enter your first names:
|
@ -1,11 +0,0 @@
|
||||
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
|
||||
LOAD save_firstname 0
|
||||
RELOAD save_firstname
|
||||
INCMP _ 0
|
||||
INCMP pin_entry *
|
@ -1 +0,0 @@
|
||||
Edit name
|
@ -1 +0,0 @@
|
||||
Weka jina
|
@ -1,2 +0,0 @@
|
||||
Jina la kwanza la sasa {{.get_current_profile_info}}
|
||||
Weka majina yako ya kwanza:
|
@ -1,2 +0,0 @@
|
||||
Current location: {{.get_current_profile_info}}
|
||||
Enter your location:
|
@ -1,10 +0,0 @@
|
||||
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
|
||||
MOUT back 0
|
||||
HALT
|
||||
LOAD save_location 0
|
||||
RELOAD save_location
|
||||
INCMP _ 0
|
||||
INCMP pin_entry *
|
@ -1,2 +0,0 @@
|
||||
Eneo la sasa {{.get_current_profile_info}}
|
||||
Weka eneo:
|
@ -1,2 +0,0 @@
|
||||
Current offerings: {{.get_current_profile_info}}
|
||||
Enter the services or goods you offer:
|
@ -1,10 +0,0 @@
|
||||
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 0
|
||||
MOUT back 0
|
||||
HALT
|
||||
RELOAD save_offerings
|
||||
INCMP _ 0
|
||||
INCMP pin_entry *
|
@ -1,2 +0,0 @@
|
||||
Unachouza kwa sasa: {{.get_current_profile_info}}
|
||||
Weka unachouza
|
@ -2,8 +2,8 @@ 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_name 1
|
||||
MOUT edit_familyname 2
|
||||
MOUT edit_gender 3
|
||||
MOUT edit_yob 4
|
||||
MOUT edit_location 5
|
||||
@ -12,10 +12,10 @@ MOUT view 7
|
||||
MOUT back 0
|
||||
HALT
|
||||
INCMP my_account 0
|
||||
INCMP edit_first_name 1
|
||||
INCMP edit_family_name 2
|
||||
INCMP enter_name 1
|
||||
INCMP enter_familyname 2
|
||||
INCMP select_gender 3
|
||||
INCMP edit_yob 4
|
||||
INCMP edit_location 5
|
||||
INCMP edit_offerings 6
|
||||
INCMP enter_yob 4
|
||||
INCMP enter_location 5
|
||||
INCMP enter_offerings 6
|
||||
INCMP view_profile 7
|
||||
|
@ -1,2 +0,0 @@
|
||||
Current year of birth: {{.get_current_profile_info}}
|
||||
Enter your year of birth
|
@ -1,13 +0,0 @@
|
||||
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
|
||||
LOAD verify_yob 0
|
||||
CATCH incorrect_date_format flag_incorrect_date_format 1
|
||||
LOAD save_yob 0
|
||||
RELOAD save_yob
|
||||
INCMP _ 0
|
||||
INCMP pin_entry *
|
@ -1,2 +0,0 @@
|
||||
Mwaka wa sasa wa kuzaliwa {{.get_current_profile_info}}
|
||||
Weka mwaka wa kuzaliwa
|
@ -2,5 +2,5 @@ LOAD reset_incorrect_date_format 8
|
||||
MOUT retry 1
|
||||
MOUT quit 9
|
||||
HALT
|
||||
INCMP _ 1
|
||||
INCMP enter_yob 1
|
||||
INCMP quit 9
|
||||
|
@ -1,2 +1 @@
|
||||
Current gender: {{.get_current_profile_info}}
|
||||
Select gender:
|
@ -1,7 +1,5 @@
|
||||
CATCH incorrect_pin flag_incorrect_pin 1
|
||||
CATCH profile_update_success flag_allow_update 1
|
||||
LOAD get_current_profile_info 0
|
||||
RELOAD get_current_profile_info
|
||||
MOUT male 1
|
||||
MOUT female 2
|
||||
MOUT unspecified 3
|
||||
@ -11,3 +9,7 @@ INCMP _ 0
|
||||
INCMP set_male 1
|
||||
INCMP set_female 2
|
||||
INCMP set_unspecified 3
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -1,2 +1 @@
|
||||
Jinsia ya sasa {{.get_current_profile_info}}
|
||||
Chagua jinsia
|
Loading…
Reference in New Issue
Block a user