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")
-	}
-}

internal/handlers/handlerservice.go

@@ -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
 }

internal/handlers/ussd/menuhandler.go

@@ -1190,101 +1190,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 = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read first name entry with", "key", "error", common.DATA_FIRST_NAME, err)
-			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 = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read family name entry with", "key", "error", common.DATA_FAMILY_NAME, err)
-			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 = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read gender entry with", "key", "error", common.DATA_GENDER, err)
-			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 = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read year of birth(yob) entry with", "key", "error", common.DATA_YOB, err)
-			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 = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read location entry with", "key", "error", common.DATA_LOCATION, err)
-			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 = "Not provided"
-				break
-			}
-			logg.ErrorCtxf(ctx, "Failed to read offerings entry with", "key", "error", common.DATA_OFFERINGS, err)
-			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

services/registration/api_failure.vis

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

services/registration/edit_family_name

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

services/registration/edit_family_name_swa

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

services/registration/edit_first_name

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

services/registration/edit_first_name_swa

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

services/registration/edit_location

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

services/registration/edit_location_swa

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

services/registration/edit_offerings

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

services/registration/edit_offerings_swa

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

services/registration/edit_profile.vis

@@ -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_name 1
-MOUT edit_family_name 2
+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 enter_name 1
-INCMP edit_family_name 2
+INCMP enter_familyname 2
 INCMP select_gender 3
-INCMP edit_yob 4
+INCMP enter_yob 4
-INCMP edit_location 5
+INCMP enter_location 5
-INCMP edit_offerings 6
+INCMP enter_offerings 6
 INCMP view_profile 7

services/registration/edit_yob

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

services/registration/edit_yob_swa

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

services/registration/enter_familyname

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

services/registration/enter_familyname.vis

@@ -1,7 +1,5 @@
 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

services/registration/enter_familyname_swa

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

services/registration/enter_location

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

services/registration/enter_location.vis

@@ -1,7 +1,5 @@
 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

services/registration/enter_location_swa

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

services/registration/enter_name

@@ -0,0 +1 @@
+Enter your first names:

services/registration/enter_name.vis

@@ -1,8 +1,5 @@
 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

services/registration/enter_name_swa

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

services/registration/enter_offerings

@@ -0,0 +1 @@
+Enter the services or goods you offer: 

services/registration/enter_offerings.vis

@@ -1,7 +1,5 @@
 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

services/registration/enter_offerings_swa

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

services/registration/enter_yob

@@ -0,0 +1 @@
+Enter your year of birth

services/registration/enter_yob.vis

@@ -1,12 +1,8 @@
 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 6
+LOAD verify_yob 0
-RELOAD verify_yob
 CATCH incorrect_date_format flag_incorrect_date_format 1
 LOAD save_yob 0
 RELOAD save_yob

services/registration/enter_yob_swa

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

services/registration/incorrect_date_format.vis

@@ -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

services/registration/select_gender

@@ -1,2 +1 @@
-Current gender: {{.get_current_profile_info}}
 Select gender: 

services/registration/select_gender.vis

@@ -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
+
+
+
+

services/registration/select_gender_swa

@@ -1,2 +1 @@
-Jinsia ya sasa {{.get_current_profile_info}}
 Chagua jinsia