update tests

internal/handlers/server/accountservice.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -12,16 +13,17 @@ import (
 	"github.com/grassrootseconomics/eth-custodial/pkg/api"
 )
 
-type ApiResponse struct {
+var (
-	Ok          bool   `json:"ok"`
+	okResponse     api.OKResponse
-	Description string `json:"description"`
+	errResponse    api.ErrResponse
-}
+	EMPTY_RESPONSE = 0
+)
 
 type AccountServiceInterface interface {
 	CheckBalance(publicKey string) (*models.BalanceResponse, error)
-	CreateAccount() (*api.OKResponse, *api.ErrResponse)
+	CreateAccount() (*api.OKResponse, error)
 	CheckAccountStatus(trackingId string) (*models.TrackStatusResponse, error)
-	TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse)
+	TrackAccountStatus(publicKey string) (*api.OKResponse, error)
 }
 
 type AccountService struct {
@@ -60,58 +62,42 @@ func (as *AccountService) CheckAccountStatus(trackingId string) (*models.TrackSt
 
 }
 
-func (as *AccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse) {
+func (as *AccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, error) {
-	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 {
-		errResponse.Description = err.Error()
+		return nil, err
-		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 {
-		errResponse.Description = err.Error()
+		return nil, err
-		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, &errResponse
+		return nil, err
 	}
-
+	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 {
-			errResponse.Description = err.Error()
+			return nil, err
-			return nil, &errResponse
 		}
-		return nil, &errResponse
+		return nil, errors.New(errResponse.Description)
 	}
+	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.
@@ -141,17 +127,13 @@ 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, *api.ErrResponse) {
+func (as *AccountService) CreateAccount() (*api.OKResponse, error) {
-
-	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 {
-		errResponse.Description = err.Error()
+		return nil, err
-		return nil, &errResponse
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("X-GE-KEY", "xd")
@@ -159,38 +141,29 @@ func (as *AccountService) CreateAccount() (*api.OKResponse, *api.ErrResponse) {
 	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		errResponse.Description = err.Error()
-		return nil, &errResponse
+		return nil, err
 	}
 	defer resp.Body.Close()
 
 	body, err := io.ReadAll(resp.Body)
 	if err != nil {
-		errResponse.Description = err.Error()
+		return nil, err
-		return nil, &errResponse
 	}
-	var apiResponse ApiResponse
+	err = json.Unmarshal([]byte(body), &okResponse)
-	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 {
-			errResponse.Description = err.Error()
+			return nil, err
-			return nil, &errResponse
 		}
-		return nil, &errResponse
+		return nil, errors.New(errResponse.Description)
 	}
+	if len(okResponse.Result) == EMPTY_RESPONSE {
+		return nil, errors.New("Empty api result")
+	}
+	return &okResponse, nil
 }
 
-func (tas *TestAccountService) CreateAccount() (*api.OKResponse, *api.ErrResponse) {
+func (tas *TestAccountService) CreateAccount() (*api.OKResponse, error) {
 	return &api.OKResponse{
 		Ok:          true,
 		Description: "Account creation request received successfully",
@@ -200,7 +173,6 @@ func (tas *TestAccountService) CreateAccount() (*api.OKResponse, *api.ErrRespons
 }
 
 func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceResponse, error) {
-
 	balanceResponse := &models.BalanceResponse{
 		Ok: true,
 		Result: struct {
@@ -211,11 +183,10 @@ func (tas *TestAccountService) CheckBalance(publicKey string) (*models.BalanceRe
 			Nonce:   json.Number("0"),
 		},
 	}
-
 	return balanceResponse, nil
 }
 
-func (tas *TestAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, *api.ErrResponse) {
+func (tas *TestAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, error) {
 	return &api.OKResponse{
 		Ok:          true,
 		Description: "Account creation succeeded",

internal/handlers/ussd/menuhandler.go

@@ -3,7 +3,6 @@ package ussd
 import (
 	"bytes"
 	"context"
-	"errors"
 	"fmt"
 	"path"
 	"regexp"
@@ -141,24 +140,17 @@ 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")
-	flag_api_call_error, _ := h.flagManager.GetFlag("flag_api_call_error")
+	okResponse, err := h.accountService.CreateAccount()
-	okResponse, errResponse := h.accountService.CreateAccount()
+	if err != nil {
-	if errResponse != nil {
+		return err
-		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))
@@ -552,11 +544,9 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 	if err != nil {
 		return res, err
 	}
-	okResponse, errResponse = h.accountService.TrackAccountStatus(string(publicKey))
+	okResponse, err = h.accountService.TrackAccountStatus(string(publicKey))
-	if errResponse != nil {
+	if err != nil {
-		if !errResponse.Ok {
+		res.FlagSet = append(res.FlagSet, flag_api_error)
-			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,11 +75,9 @@ 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{}
@@ -101,8 +99,7 @@ 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,19 +11,9 @@ type MockAccountService struct {
 	mock.Mock
 }
 
-func (m *MockAccountService) CreateAccount() (*api.OKResponse, *api.ErrResponse) {
+func (m *MockAccountService) CreateAccount() (*api.OKResponse, error) {
 	args := m.Called()
-	okResponse, ok := args.Get(0).(*api.OKResponse)
+	return args.Get(0).(*api.OKResponse), args.Error(1)
-	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) {
@@ -36,15 +26,7 @@ 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, *api.ErrResponse) {
+func (m *MockAccountService) TrackAccountStatus(publicKey string) (*api.OKResponse, error) {
 	args := m.Called(publicKey)
-	okResponse, ok := args.Get(0).(*api.OKResponse)
+	return args.Get(0).(*api.OKResponse), args.Error(1)
-	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,6 +1,4 @@
 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