forked from urdt/ussd
WIP Trying to clean up account status check
This commit is contained in:
parent
b9c56b04ce
commit
b2d180e8eb
@ -557,17 +557,16 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
okResponse, err = h.accountService.TrackAccountStatus(ctx, string(publicKey))
|
r, err := h.accountService.TrackAccountStatus(ctx, string(publicKey))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
res.FlagSet = append(res.FlagSet, flag_api_error)
|
res.FlagSet = append(res.FlagSet, flag_api_error)
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
res.FlagReset = append(res.FlagReset, flag_api_error)
|
res.FlagReset = append(res.FlagReset, flag_api_error)
|
||||||
isActive := okResponse.Result["active"].(bool)
|
|
||||||
if !ok {
|
if !ok {
|
||||||
return res, err
|
return res, err
|
||||||
}
|
}
|
||||||
if isActive {
|
if r.Active {
|
||||||
res.FlagSet = append(res.FlagSet, flag_account_success)
|
res.FlagSet = append(res.FlagSet, flag_account_success)
|
||||||
res.FlagReset = append(res.FlagReset, flag_account_pending)
|
res.FlagReset = append(res.FlagReset, flag_account_pending)
|
||||||
} else {
|
} else {
|
||||||
|
@ -1052,37 +1052,19 @@ func TestCheckAccountStatus(t *testing.T) {
|
|||||||
response *models.TrackStatusResult
|
response *models.TrackStatusResult
|
||||||
expectedResult resource.Result
|
expectedResult resource.Result
|
||||||
}{
|
}{
|
||||||
{
|
|
||||||
name: "Test when account is on the Sarafu network",
|
|
||||||
input: []byte("TrackingId1234"),
|
|
||||||
serverResponse: &api.OKResponse{
|
|
||||||
Ok: true,
|
|
||||||
Description: "Account creation succeeded",
|
|
||||||
Result: map[string]any{
|
|
||||||
"active": true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
response: &models.TrackStatusResult {
|
|
||||||
Active: true,
|
|
||||||
},
|
|
||||||
expectedResult: resource.Result{
|
|
||||||
FlagSet: []uint32{flag_account_success},
|
|
||||||
FlagReset: []uint32{flag_api_error, flag_account_pending},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
name: "Test when the account is not yet on the sarafu network",
|
name: "Test when the account is not yet on the sarafu network",
|
||||||
input: []byte("TrackingId1234"),
|
input: []byte("TrackingId1234"),
|
||||||
response: &models.TrackStatusResult{
|
response: &models.TrackStatusResult{
|
||||||
Active: false,
|
Active: false,
|
||||||
},
|
},
|
||||||
serverResponse: &api.OKResponse{
|
// serverResponse: &api.OKResponse{
|
||||||
Ok: true,
|
// Ok: true,
|
||||||
Description: "Account creation succeeded",
|
// Description: "Account creation succeeded",
|
||||||
Result: map[string]any{
|
// Result: map[string]any{
|
||||||
"active": false,
|
// "active": false,
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
expectedResult: resource.Result{
|
expectedResult: resource.Result{
|
||||||
FlagSet: []uint32{flag_account_pending},
|
FlagSet: []uint32{flag_account_pending},
|
||||||
FlagReset: []uint32{flag_api_error, flag_account_success},
|
FlagReset: []uint32{flag_api_error, flag_account_success},
|
||||||
@ -1104,7 +1086,6 @@ func TestCheckAccountStatus(t *testing.T) {
|
|||||||
// Define expected interactions with the mock
|
// Define expected interactions with the mock
|
||||||
mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_PUBLIC_KEY).Return(tt.input, nil)
|
mockDataStore.On("ReadEntry", ctx, sessionId, common.DATA_PUBLIC_KEY).Return(tt.input, nil)
|
||||||
|
|
||||||
mockCreateAccountService.On("CheckAccountStatus", string(tt.input)).Return(tt.response, nil)
|
|
||||||
mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.serverResponse, nil)
|
mockCreateAccountService.On("TrackAccountStatus", string(tt.input)).Return(tt.serverResponse, nil)
|
||||||
mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, status).Return(nil).Maybe()
|
mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, status).Return(nil).Maybe()
|
||||||
|
|
||||||
|
@ -4,7 +4,6 @@ import (
|
|||||||
"context"
|
"context"
|
||||||
|
|
||||||
"git.grassecon.net/urdt/ussd/internal/models"
|
"git.grassecon.net/urdt/ussd/internal/models"
|
||||||
"github.com/grassrootseconomics/eth-custodial/pkg/api"
|
|
||||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||||
"github.com/stretchr/testify/mock"
|
"github.com/stretchr/testify/mock"
|
||||||
)
|
)
|
||||||
@ -24,13 +23,8 @@ func (m *MockAccountService) CheckBalance(ctx context.Context, publicKey string)
|
|||||||
return args.Get(0).(*models.BalanceResult), args.Error(1)
|
return args.Get(0).(*models.BalanceResult), args.Error(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *MockAccountService) TrackAccountStatus(ctx context.Context, trackingId string) (*api.OKResponse, error) {
|
func (m *MockAccountService) TrackAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
|
||||||
args := m.Called(trackingId)
|
args := m.Called(trackingId)
|
||||||
return args.Get(0).(*api.OKResponse), args.Error(1)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (m *MockAccountService) CheckAccountStatus(ctx context.Context,publicKey string) (*models.TrackStatusResult, error) {
|
|
||||||
args := m.Called(publicKey)
|
|
||||||
return args.Get(0).(*models.TrackStatusResult), args.Error(1)
|
return args.Get(0).(*models.TrackStatusResult), args.Error(1)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -5,7 +5,6 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
|
|
||||||
"git.grassecon.net/urdt/ussd/internal/models"
|
"git.grassecon.net/urdt/ussd/internal/models"
|
||||||
"github.com/grassrootseconomics/eth-custodial/pkg/api"
|
|
||||||
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
dataserviceapi "github.com/grassrootseconomics/ussd-data-service/pkg/api"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -27,22 +26,12 @@ func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey strin
|
|||||||
return balanceResponse, nil
|
return balanceResponse, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
|
func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error) {
|
||||||
return &models.TrackStatusResult {
|
return &models.TrackStatusResult {
|
||||||
Active: true,
|
Active: true,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (tas *TestAccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
|
|
||||||
return &api.OKResponse{
|
|
||||||
Ok: true,
|
|
||||||
Description: "Account creation succeeded",
|
|
||||||
Result: map[string]any{
|
|
||||||
"active": true,
|
|
||||||
},
|
|
||||||
}, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
func (tas *TestAccountService) FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error) {
|
||||||
return []dataserviceapi.TokenHoldings {
|
return []dataserviceapi.TokenHoldings {
|
||||||
dataserviceapi.TokenHoldings {
|
dataserviceapi.TokenHoldings {
|
||||||
|
@ -20,9 +20,7 @@ var (
|
|||||||
type AccountServiceInterface interface {
|
type AccountServiceInterface interface {
|
||||||
CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error)
|
CheckBalance(ctx context.Context, publicKey string) (*models.BalanceResult, error)
|
||||||
CreateAccount(ctx context.Context) (*models.AccountResult, error)
|
CreateAccount(ctx context.Context) (*models.AccountResult, error)
|
||||||
// TODO: poorly named method seems to be checking transaction
|
TrackAccountStatus(ctx context.Context, publicKey string) (*models.TrackStatusResult, error)
|
||||||
CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error)
|
|
||||||
TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error)
|
|
||||||
FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
|
FetchVouchers(ctx context.Context, publicKey string) ([]dataserviceapi.TokenHoldings, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -38,7 +36,7 @@ type AccountService struct {
|
|||||||
// - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
|
// - string: The status of the transaction as a string. If there is an error during the request or processing, this will be an empty string.
|
||||||
// - error: An error if any occurred during the HTTP request, reading the response, or unmarshalling the JSON data.
|
// - 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
|
// If no error occurs, this will be nil
|
||||||
func (as *AccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
|
func (as *AccountService) TrackAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
|
||||||
var r models.TrackStatusResult
|
var r models.TrackStatusResult
|
||||||
|
|
||||||
ep, err := url.JoinPath(config.TrackURL, trackingId)
|
ep, err := url.JoinPath(config.TrackURL, trackingId)
|
||||||
@ -59,53 +57,6 @@ func (as *AccountService) CheckAccountStatus(ctx context.Context, trackingId str
|
|||||||
return &r, nil
|
return &r, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (as *AccountService) TrackAccountStatus(ctx context.Context, publicKey string) (*api.OKResponse, error) {
|
|
||||||
var okResponse api.OKResponse
|
|
||||||
var errResponse api.ErrResponse
|
|
||||||
var err error
|
|
||||||
|
|
||||||
ep, err := url.JoinPath(config.TrackURL, publicKey)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
req, err := http.NewRequest("GET", ep, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
req.Header.Set("Content-Type", "application/json")
|
|
||||||
req.Header.Set("X-GE-KEY", "xd")
|
|
||||||
|
|
||||||
resp, err := http.DefaultClient.Do(req)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
defer resp.Body.Close()
|
|
||||||
|
|
||||||
body, err := io.ReadAll(resp.Body)
|
|
||||||
if err != nil {
|
|
||||||
errResponse.Description = err.Error()
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if resp.StatusCode >= http.StatusBadRequest {
|
|
||||||
err := json.Unmarshal([]byte(body), &errResponse)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return nil, errors.New(errResponse.Description)
|
|
||||||
}
|
|
||||||
err = json.Unmarshal([]byte(body), &okResponse)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if len(okResponse.Result) == 0 {
|
|
||||||
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.
|
// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
|
||||||
// Parameters:
|
// Parameters:
|
||||||
// - publicKey: The public key associated with the account whose balance needs to be checked.
|
// - publicKey: The public key associated with the account whose balance needs to be checked.
|
||||||
|
Loading…
Reference in New Issue
Block a user