internal/handlers/server/accountservice.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -13,17 +12,16 @@ import (
 	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 )
 
-var (
+type ApiResponse struct {
-	okResponse     api.OKResponse
+	Ok          bool   `json:"ok"`
-	errResponse    api.ErrResponse
+	Description string `json:"description"`
-	EMPTY_RESPONSE = 0
+}
-)
 
 type AccountServiceInterface interface {
 	CheckBalance(publicKey string) (*models.BalanceResponse, error)
-	CreateAccount() (*api.OKResponse, error)
+	CreateAccount() (*api.OKResponse, *api.ErrResponse)
 	CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error)
-	TrackAccountStatus(publicKey string) (*api.OKResponse, error)
+	TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse)
 }
 
 type AccountService struct {
@@ -62,42 +60,58 @@ func (as *AccountService) CheckAccountStatus(trackingId string) (*models.TrackSt
 
 }
 
-func (as *AccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, error) {
+func (as *AccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse) {
+	var errResponse api.ErrResponse
+	var okResponse api.OKResponse
 	var err error
 	// Construct the URL with the path parameter
 	url := fmt.Sprintf("%s/%s", config.TrackURL, publicKey)
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		return nil, err
+		errResponse.Description = err.Error()
+		return nil, &errResponse
 	}
-
+	// Set headers
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-GE-KEY", "xd")
 
+	// Send the request
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
-		return nil, err
+		errResponse.Description = err.Error()
+		return nil, &errResponse
 	}
 	defer resp.Body.Close()
 
+	// Read the response body
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		errResponse.Description = err.Error()
-		return nil, err
+		return nil, &errResponse
 	}
-	err = json.Unmarshal([]byte(body), &okResponse)
+
+	// Step 2: Unmarshal into the generic struct
+	var apiResponse ApiResponse
+	err = json.Unmarshal([]byte(body), &apiResponse)
 	if err != nil {
+		errResponse.Description = err.Error()
+		return nil, &errResponse
+	}
+	if apiResponse.Ok {
+		err = json.Unmarshal([]byte(body), &okResponse)
+		if err != nil {
+			errResponse.Description = err.Error()
+			return nil, &errResponse
+		}
+		return &okResponse, nil
+	} else {
 		err := json.Unmarshal([]byte(body), &errResponse)
 		if err != nil {
-			return nil, err
+			errResponse.Description = err.Error()
+			return nil, &errResponse
 		}
-		return nil, errors.New(errResponse.Description)
+		return nil, &errResponse
 	}
-	if len(okResponse.Result) == EMPTY_RESPONSE {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
-
 }
 
 // CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
@@ -127,13 +141,17 @@ func (as *AccountService) CheckBalance(publicKey string) (*models.BalanceRespons
 //     If there is an error during the request or processing, this will be nil.
 //   - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
 //     If no error occurs, this will be nil.
-func (as *AccountService) CreateAccount() (*api.OKResponse, error) {
+func (as *AccountService) CreateAccount() (*api.OKResponse, *api.ErrResponse) {
+
+	var errResponse api.ErrResponse
+	var okResponse api.OKResponse
 	var err error
 
 	// Create a new request
 	req, err := http.NewRequest("POST", config.CreateAccountURL, nil)
 	if err != nil {
-		return nil, err
+		errResponse.Description = err.Error()
+		return nil, &errResponse
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-GE-KEY", "xd")
@@ -141,29 +159,38 @@ func (as *AccountService) CreateAccount() (*api.OKResponse, error) {
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		errResponse.Description = err.Error()
-		return nil, err
+		return nil, &errResponse
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return nil, err
+		errResponse.Description = err.Error()
+		return nil, &errResponse
 	}
-	err = json.Unmarshal([]byte(body), &okResponse)
+	var apiResponse ApiResponse
+	err = json.Unmarshal([]byte(body), &apiResponse)
 	if err != nil {
+		return nil, &errResponse
+	}
+	if apiResponse.Ok {
+		err = json.Unmarshal([]byte(body), &okResponse)
+		if err != nil {
+			errResponse.Description = err.Error()
+			return nil, &errResponse
+		}
+		return &okResponse, nil
+	} else {
 		err := json.Unmarshal([]byte(body), &errResponse)
 		if err != nil {
-			return nil, err
+			errResponse.Description = err.Error()
+			return nil, &errResponse
 		}
-		return nil, errors.New(errResponse.Description)
+		return nil, &errResponse
 	}
-	if len(okResponse.Result) == EMPTY_RESPONSE {
-		return nil, errors.New("Empty api result")
-	}
-	return &okResponse, nil
 }
 
-func (tas *TestAccountService) CreateAccount() (*api.OKResponse, error) {
+func (tas *TestAccountService) CreateAccount() (*api.OKResponse, *api.ErrResponse) {
 	return &api.OKResponse{
 		Ok:          true,
 		Description: "Account creation request received successfully",
@@ -173,6 +200,7 @@ func (tas *TestAccountService) CreateAccount() (*api.OKResponse, error) {
 }
 
 func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
+
 	balanceResponse := &models.BalanceResponse{
 		Ok: true,
 		Result: struct {
@@ -183,10 +211,11 @@ func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceRe
 			Nonce:   json.Number("0"),
 		},
 	}
+
 	return balanceResponse, nil
 }
 
-func (tas *TestAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, error) {
+func (tas *TestAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse) {
 	return &api.OKResponse{
 		Ok:          true,
 		Description: "Account creation succeeded",

internal/handlers/ussd/menuhandler.go

@@ -3,6 +3,7 @@ package ussd
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"path"
 	"regexp"
@@ -140,17 +141,24 @@ func (h *Handlers) SetLanguage(ctx context.Context, sym string, input []byte) (r
 
 func (h *Handlers) createAccountNoExist(ctx context.Context, sessionId string, res *resource.Result) error {
 	flag_account_created, _ := h.flagManager.GetFlag("flag_account_created")
-	okResponse, err := h.accountService.CreateAccount()
+	flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
-	if err != nil {
+	okResponse, errResponse := h.accountService.CreateAccount()
-		return err
+	if errResponse != nil {
+		if !errResponse.Ok {
+			res.FlagSet = append(res.FlagSet, flag_api_call_error)
+			return nil
+		}
+		return errors.New(errResponse.Description)
 	}
 	trackingId := okResponse.Result["trackingId"].(string)
 	publicKey := okResponse.Result["publicKey"].(string)
+	res.FlagReset = append(res.FlagReset, flag_api_call_error)
 
 	data := map[utils.DataTyp]string{
 		utils.DATA_TRACKING_ID: trackingId,
 		utils.DATA_PUBLIC_KEY:  publicKey,
 	}
+
 	for key, value := range data {
 		store := h.userdataStore
 		err := store.WriteEntry(ctx, sessionId, key, []byte(value))
@@ -544,9 +552,11 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 	if err != nil {
 		return res, err
 	}
-	okResponse, err = h.accountService.TrackAccountStatus(string(publicKey))
+	okResponse, errResponse = h.accountService.TrackAccountStatus(string(publicKey))
-	if err != nil {
+	if errResponse != nil {
-		res.FlagSet = append(res.FlagSet, flag_api_error)
+		if !errResponse.Ok {
+			res.FlagSet = append(res.FlagSet, flag_api_error)
+		}
 		return res, err
 	}
 	res.FlagReset = append(res.FlagReset, flag_api_error)

internal/handlers/ussd/menuhandler_test.go

@@ -75,9 +75,11 @@ func TestCreateAccount(t *testing.T) {
 	}
 	// Create required mocks
 	flag_account_created, err := fm.GetFlag("flag_account_created")
+	flag_api_call_error, _ := fm.GetFlag("flag_api_call_error")
 	if err != nil {
 		t.Logf(err.Error())
 	}
+
 	// Define session ID and mock data
 	sessionId := "session123"
 	notFoundErr := db.ErrNotFound{}
@@ -99,7 +101,8 @@ func TestCreateAccount(t *testing.T) {
 				},
 			},
 			expectedResult: resource.Result{
-				FlagSet: []uint32{flag_account_created},
+				FlagSet:   []uint32{flag_account_created},
+				FlagReset: []uint32{flag_api_call_error},
 			},
 		},
 	}

internal/mocks/servicemock.go

@@ -11,9 +11,19 @@ type MockAccountService struct {
 	mock.Mock
 }
 
-func (m *MockAccountService) CreateAccount() (*api.OKResponse, error) {
+func (m *MockAccountService) CreateAccount() (*api.OKResponse, *api.ErrResponse) {
 	args := m.Called()
-	return args.Get(0).(*api.OKResponse), args.Error(1)
+	okResponse, ok := args.Get(0).(*api.OKResponse)
+	errResponse, err := args.Get(1).(*api.ErrResponse)
+
+	if ok {
+		return okResponse, nil
+	}
+
+	if err {
+		return nil, errResponse
+	}
+	return nil, nil
 }
 
 func (m *MockAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
@@ -26,7 +36,15 @@ func (m *MockAccountService) CheckAccountStatus(trackingId string) (*models.Trac
 	return args.Get(0).(*models.TrackStatusResponse), args.Error(1)
 }
 
-func (m *MockAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, error) {
+func (m *MockAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse) {
 	args := m.Called(publicKey)
-	return args.Get(0).(*api.OKResponse), args.Error(1)
+	okResponse, ok := args.Get(0).(*api.OKResponse)
+	errResponse, err := args.Get(1).(*api.ErrResponse)
+	if ok {
+		return okResponse, nil
+	}
+	if err {
+		return nil, errResponse
+	}
+	return nil, nil
 }

services/registration/create_pin.vis

@@ -1,4 +1,6 @@
 LOAD create_account 0
+RELOAD create_account 
+CATCH api_failure  flag_api_call_error  1
 CATCH account_creation_failed flag_account_creation_failed 1
 MOUT exit 0
 HALT