update handler and move transaction struct to models

This commit is contained in:
Carlosokumu 2024-10-17 12:49:28 +03:00
parent bfa6eac4c2
commit d181c34946
Signed by: carlos
GPG Key ID: 7BD6BC8160A5C953

View File

@ -15,6 +15,7 @@ import (
"git.defalsify.org/vise.git/persist" "git.defalsify.org/vise.git/persist"
"git.defalsify.org/vise.git/resource" "git.defalsify.org/vise.git/resource"
"git.defalsify.org/vise.git/state" "git.defalsify.org/vise.git/state"
"git.grassecon.net/urdt/ussd/internal/handlers/server"
"git.grassecon.net/urdt/ussd/internal/mocks" "git.grassecon.net/urdt/ussd/internal/mocks"
"git.grassecon.net/urdt/ussd/internal/models" "git.grassecon.net/urdt/ussd/internal/models"
"git.grassecon.net/urdt/ussd/internal/utils" "git.grassecon.net/urdt/ussd/internal/utils"
@ -28,22 +29,15 @@ var (
flagsPath = path.Join(baseDir, "services", "registration", "pp.csv") flagsPath = path.Join(baseDir, "services", "registration", "pp.csv")
) )
type Transaction struct {
CreatedAt time.Time `json:"createdAt"`
Status string `json:"status"`
TransferValue json.Number `json:"transferValue"`
TxHash string `json:"txHash"`
TxType string `json:"txType"`
}
func TestNewHandlers(t *testing.T) { func TestNewHandlers(t *testing.T) {
fm, err := NewFlagManager(flagsPath) fm, err := NewFlagManager(flagsPath)
accountService := server.TestAccountService{}
if err != nil { if err != nil {
t.Logf(err.Error()) t.Logf(err.Error())
} }
t.Run("Valid UserDataStore", func(t *testing.T) { t.Run("Valid UserDataStore", func(t *testing.T) {
mockStore := &mocks.MockUserDataStore{} mockStore := &mocks.MockUserDataStore{}
handlers, err := NewHandlers(fm.parser, mockStore) handlers, err := NewHandlers(fm.parser, mockStore, &accountService)
if err != nil { if err != nil {
t.Fatalf("expected no error, got %v", err) t.Fatalf("expected no error, got %v", err)
} }
@ -59,7 +53,7 @@ func TestNewHandlers(t *testing.T) {
t.Run("Nil UserDataStore", func(t *testing.T) { t.Run("Nil UserDataStore", func(t *testing.T) {
appFlags := &asm.FlagParser{} appFlags := &asm.FlagParser{}
handlers, err := NewHandlers(appFlags, nil) handlers, err := NewHandlers(appFlags, nil, &accountService)
if err == nil { if err == nil {
t.Fatal("expected an error, got none") t.Fatal("expected an error, got none")
@ -1089,7 +1083,7 @@ func TestCheckAccountStatus(t *testing.T) {
TxType string "json:\"txType\"" TxType string "json:\"txType\""
} }
}{ }{
Transaction: Transaction{ Transaction: models.Transaction{
CreatedAt: time.Now(), CreatedAt: time.Now(),
Status: "SUCCESS", Status: "SUCCESS",
TransferValue: json.Number("0.5"), TransferValue: json.Number("0.5"),
@ -1127,7 +1121,7 @@ func TestCheckAccountStatus(t *testing.T) {
TxType string "json:\"txType\"" TxType string "json:\"txType\""
} }
}{ }{
Transaction: Transaction{ Transaction: models.Transaction{
CreatedAt: time.Now(), CreatedAt: time.Now(),
Status: "IN_NETWORK", Status: "IN_NETWORK",
TransferValue: json.Number("0.5"), TransferValue: json.Number("0.5"),