urdt/ussd
5
0
Fork 0
Code Issues 50 Pull Requests 7 Actions Packages Projects Releases Wiki Activity

wip-account-creation #4

Merged
lash merged 143 commits from wip-account-creation into master 2024-08-30 14:37:58 +02:00
Conversation 0 Commits 143 Files Changed 182 +20 -34
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b440881441 - Show all commits

38
cmd/main.go
View File

@ -34,7 +34,6 @@ const (
USERFLAG_QUERYPIN USERFLAG_QUERYPIN
USERFLAG_VALIDPIN USERFLAG_VALIDPIN
USERFLAG_INVALIDPIN USERFLAG_INVALIDPIN
USERFLAG_UNLOCKFORUPDATE
) )
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-08-26 03:47:44 +02:00
Outdated
Review
Copy Link

please rename this flag to USERFLAG_PINMISMATCH to avoid ambiguity.

please rename this flag to USERFLAG_PINMISMATCH to avoid ambiguity.
lash commented 2024-08-26 04:58:19 +02:00
Outdated
Review
Copy Link

priority

**priority**
const ( const (
@ -136,7 +135,6 @@ func (fsd *fsData) saveFamilyName(cxt context.Context, sym string, input []byte)
if len(input) > 0 { if len(input) > 0 {
//Save name //Save name
secondname := string(input) secondname := string(input)
fmt.Println("FamilyName:", secondname)
accountData["FamilyName"] = secondname accountData["FamilyName"] = secondname
updatedJsonData, err := json.Marshal(accountData) updatedJsonData, err := json.Marshal(accountData)
if err != nil { if err != nil {
@ -165,7 +163,6 @@ func (fsd *fsData) saveYOB(cxt context.Context, sym string, input []byte) (resou
} }
if len(input) > 0 { if len(input) > 0 {
yob := string(input) yob := string(input)
fmt.Println("YOB", yob)
accountData["YOB"] = yob accountData["YOB"] = yob
updatedJsonData, err := json.Marshal(accountData) updatedJsonData, err := json.Marshal(accountData)
if err != nil { if err != nil {
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-08-26 03:53:38 +02:00
Outdated
Review
Copy Link

perhaps check this input, 2 or 4 digits, numeric

perhaps check this input, 2 or 4 digits, numeric
lash commented 2024-08-26 04:58:33 +02:00
Outdated
Review
Copy Link

priority

**priority**
@ -195,7 +192,6 @@ func (fsd *fsData) saveLocation(cxt context.Context, sym string, input []byte) (
} }
if len(input) > 0 { if len(input) > 0 {
location := string(input) location := string(input)
fmt.Println("Location:", location)
accountData["Location"] = location accountData["Location"] = location
updatedJsonData, err := json.Marshal(accountData) updatedJsonData, err := json.Marshal(accountData)
if err != nil { if err != nil {
@ -228,9 +224,12 @@ func (fsd *fsData) saveGender(ctx context.Context, sym string, input []byte) (re
gender := string(input) gender := string(input)
switch gender { switch gender {
case "1" : gender = "Male" case "1":
case "2" : gender = "Female" gender = "Male"
case "3" : gender = "Other" case "2":
gender = "Female"
case "3":
gender = "Other"
} }
fmt.Println("gender", gender) fmt.Println("gender", gender)
Alfred-mk marked this conversation as resolved Outdated
lash commented 2024-08-26 03:54:11 +02:00
Outdated
Review
Copy Link

is this a choice in the current ussd?

is this a choice in the current ussd?
Alfred-mk commented 2024-08-26 15:33:10 +02:00
Outdated
Review
Copy Link

Yes, the current USSD has the option of updating the gender, and the options are Male, Female and Other

Yes, the current USSD has the option of updating the gender, and the options are Male, Female and Other
accountData["Gender"] = gender accountData["Gender"] = gender
@ -261,7 +260,6 @@ func (fsd *fsData) saveOfferings(ctx context.Context, sym string, input []byte)
} }
if len(input) > 0 { if len(input) > 0 {
offerings := string(input) offerings := string(input)
fmt.Println("Offerings:", offerings)
accountData["Offerings"] = offerings accountData["Offerings"] = offerings
updatedJsonData, err := json.Marshal(accountData) updatedJsonData, err := json.Marshal(accountData)
if err != nil { if err != nil {
@ -346,13 +344,10 @@ func (fsd *fsData) resetUnlockForUpdate(ctx context.Context, sym string, input [
return res, nil return res, nil
} }
func (fsd *fsData) resetAccountUnlocked(ctx context.Context,sym string,input []byte) (resource.Result,error){ func (fsd *fsData) resetAccountUnlocked(ctx context.Context, sym string, input []byte) (resource.Result, error) {
res := resource.Result{} res := resource.Result{}
st := fsd.st
isSet := st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED,true)
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED) res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
fmt.Println("ISSET:",isSet) return res, nil
return res,nil
} }
func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (fsd *fsData) checkIdentifier(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@ -385,11 +380,9 @@ func (fsd *fsData) unLock(ctx context.Context, sym string, input []byte) (resour
return res, nil return res, nil
} }
if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) { if fsd.st.MatchFlag(USERFLAG_ACCOUNT_UNLOCKED, false) {
//res.FlagSet = append(res.FlagSet, USERFLAG_UNLOCKFORUPDATE)
res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED) res.FlagSet = append(res.FlagSet, USERFLAG_ACCOUNT_UNLOCKED)
} else { } else {
res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED) res.FlagReset = append(res.FlagReset, USERFLAG_ACCOUNT_UNLOCKED)
//res.FlagReset = append(res.FlagReset, USERFLAG_UNLOCKFORUPDATE)
} }
} }
return res, nil return res, nil
@ -735,8 +728,7 @@ func (fsd *fsData) get_recipient(ctx context.Context, sym string, input []byte)
return res, nil return res, nil
} }
func (fsd *fsData) getProfileInfo(ctx context.Context, sym string, input []byte) (resource.Result, error) {
func (fsd *fsData) getProfileInfo(ctx context.Context,sym string,input []byte) (resource.Result,error){
res := resource.Result{} res := resource.Result{}
fp := fsd.path + "_data" fp := fsd.path + "_data"
@ -755,13 +747,10 @@ func (fsd *fsData) getProfileInfo(ctx context.Context,sym string,input []byte) (
age := accountData["YOB"] age := accountData["YOB"]
location := accountData["Location"] location := accountData["Location"]
// Format the data into a string
formattedData := fmt.Sprintf("Name: %s\nGender: %s\nAge: %s\nLocation: %s\n", name, gender, age, location) formattedData := fmt.Sprintf("Name: %s\nGender: %s\nAge: %s\nLocation: %s\n", name, gender, age, location)
res.Content = formattedData res.Content = formattedData
return res,nil return res, nil
} }
func (fsd *fsData) get_sender(ctx context.Context, sym string, input []byte) (resource.Result, error) { func (fsd *fsData) get_sender(ctx context.Context, sym string, input []byte) (resource.Result, error) {
@ -960,12 +949,9 @@ func main() {
rfs.AddLocalFunc("save_offerings", fs.saveOfferings) rfs.AddLocalFunc("save_offerings", fs.saveOfferings)
rfs.AddLocalFunc("quit_with_balance", fs.quitWithBalance) rfs.AddLocalFunc("quit_with_balance", fs.quitWithBalance)
rfs.AddLocalFunc("show_update_success", fs.ShowUpdateSuccess) rfs.AddLocalFunc("show_update_success", fs.ShowUpdateSuccess)
rfs.AddLocalFunc("reset_unlocked",fs.resetAccountUnlocked) rfs.AddLocalFunc("reset_unlocked", fs.resetAccountUnlocked)
rfs.AddLocalFunc("reset_unlock_for_update", fs.resetUnlockForUpdate) rfs.AddLocalFunc("reset_unlock_for_update", fs.resetUnlockForUpdate)
rfs.AddLocalFunc("get_profile_info",fs.getProfileInfo) rfs.AddLocalFunc("get_profile_info", fs.getProfileInfo)
cont, err := en.Init(ctx) cont, err := en.Init(ctx)
en.SetDebugger(engine.NewSimpleDebug(nil)) en.SetDebugger(engine.NewSimpleDebug(nil))