refactor

internal/handlers/server/accountservice.go

@@ -18,6 +18,21 @@ type AccountServiceInterface interface {
 type AccountService struct {
 }
 
+
+
+// CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
+//
+// Parameters:
+//   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
+//     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
+//     AccountResponse struct can be used here to check the account status during a transaction.
+//
+//
+// Returns:
+//   - 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.
+//     If no error occurs, this will be nil.
+//
 func (as *AccountService) CheckAccountStatus(trackingId string) (string, error) {
 	resp, err := http.Get(config.TrackStatusURL + trackingId)
 	if err != nil {
@@ -41,6 +56,10 @@ func (as *AccountService) CheckAccountStatus(trackingId string) (string, error)
 	return status, nil
 }
 
+
+// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
+// Parameters:
+//   - publicKey: The public key associated with the account whose balance needs to be checked.
 func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 
 	resp, err := http.Get(config.BalanceURL + publicKey)
@@ -64,6 +83,13 @@ func (as *AccountService) CheckBalance(publicKey string) (string, error) {
 	return balance, nil
 }
 
+
+//CreateAccount creates a new account in the custodial system.
+// Returns:
+//   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
+//     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() (*models.AccountResponse, error) {
 	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
 	if err != nil {

internal/handlers/server/accountstatus.go

@@ -1,46 +0,0 @@
-package server
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
-)
-
-// CheckAccountStatus retrieves the status of an account transaction based on the provided tracking ID.
-//
-// Parameters:
-//   - trackingId: A unique identifier for the account.This should be obtained from a previous call to
-//     CreateAccount or a similar function that returns an AccountResponse. The `trackingId` field in the
-//     AccountResponse struct can be used here to check the account status during a transaction.
-//
-//
-// Returns:
-//   - 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.
-//     If no error occurs, this will be nil.
-//
-func CheckAccountStatus(trackingId string) (string, error) {
-	resp, err := http.Get(config.TrackStatusURL + trackingId)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-
-	var trackResp models.TrackStatusResponse
-	err = json.Unmarshal(body, &trackResp)
-	if err != nil {
-		return "", err
-	}
-
-	status := trackResp.Result.Transaction.Status
-
-	return status, nil
-}

internal/handlers/server/balancecheck.go

@@ -1,36 +0,0 @@
-package server
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
-)
-
-// CheckBalance retrieves the balance for a given public key from the custodial balance API endpoint.
-// Parameters:
-//   - publicKey: The public key associated with the account whose balance needs to be checked.
-func CheckBalance(publicKey string) (string, error) {
-
-	resp, err := http.Get(config.BalanceURL + publicKey)
-	if err != nil {
-		return "0.0", err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return "0.0", err
-	}
-
-	var balanceResp models.BalanceResponse
-	err = json.Unmarshal(body, &balanceResp)
-	if err != nil {
-		return "0.0", err
-	}
-
-	balance := balanceResp.Result.Balance
-	return balance, nil
-}

internal/handlers/server/createaccount.go

@@ -1,37 +0,0 @@
-package server
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-
-	"git.grassecon.net/urdt/ussd/config"
-	"git.grassecon.net/urdt/ussd/internal/models"
-)
-
-//CreateAccount creates a new account in the custodial system.
-// Returns:
-//   - *models.AccountResponse: A pointer to an AccountResponse struct containing the details of the created account.
-//     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 CreateAccount() (*models.AccountResponse, error) {
-	resp, err := http.Post(config.CreateAccountURL, "application/json", nil)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, err
-	}
-
-	var accountResp models.AccountResponse
-	err = json.Unmarshal(body, &accountResp)
-	if err != nil {
-		return nil, err
-	}
-
-	return &accountResp, nil
-}

internal/handlers/ussd/menuhandler.go

@@ -29,20 +29,9 @@ type FSData struct {
 	St   *state.State
 }
 
-type AccountCreator interface {
-	CreateAccount() (*models.AccountResponse, error)
-}
-
-// ServerAccountCreator implements AccountCreator using the server package
-type ServerAccountCreator struct{}
-
-func (s *ServerAccountCreator) CreateAccount() (*models.AccountResponse, error) {
-	return server.CreateAccount()
-}
 
 type Handlers struct {
 	fs                 *FSData
-	accountCreator     AccountCreator
 	accountFileHandler utils.AccountFileHandlerInterface
 	accountService     server.AccountServiceInterface
 }
@@ -54,7 +43,6 @@ func NewHandlers(path string, st *state.State) *Handlers {
 			St:   st,
 		},
 		accountFileHandler: utils.NewAccountFileHandler(path + "_data"),
-		accountCreator:     &ServerAccountCreator{},
 		accountService:     &server.AccountService{},
 	}
 }
@@ -426,7 +414,7 @@ func (h *Handlers) CheckAccountStatus(ctx context.Context, sym string, input []b
 		return res, err
 	}
 
-	status, err := server.CheckAccountStatus(accountData["TrackingId"])
+	status, err := h.accountService.CheckAccountStatus(accountData["TrackingId"])
 
 	if err != nil {
 		fmt.Println("Error checking account status:", err)
@@ -501,7 +489,7 @@ func (h *Handlers) CheckBalance(ctx context.Context, sym string, input []byte) (
 		return res, err
 	}
 
-	balance, err := server.CheckBalance(accountData["PublicKey"])
+	balance, err := h.accountService.CheckBalance(accountData["PublicKey"])
 	if err != nil {
 		return res, nil
 	}
@@ -594,7 +582,7 @@ func (h *Handlers) MaxAmount(ctx context.Context, sym string, input []byte) (res
 		return res, err
 	}
 
-	balance, err := server.CheckBalance(accountData["PublicKey"])
+	balance, err := h.accountService.CheckBalance(accountData["PublicKey"])
 	if err != nil {
 		return res, nil
 	}
@@ -615,7 +603,7 @@ func (h *Handlers) ValidateAmount(ctx context.Context, sym string, input []byte)
 		return res, err
 	}
 
-	balanceStr, err := server.CheckBalance(accountData["PublicKey"])
+	balanceStr, err := h.accountService.CheckBalance(accountData["PublicKey"])
 	if err != nil {
 		return res, err
 	}
@@ -750,7 +738,7 @@ func (h *Handlers) QuitWithBalance(ctx context.Context, sym string, input []byte
 	if err != nil {
 		return res, err
 	}
-	balance, err := server.CheckBalance(accountData["PublicKey"])
+	balance, err := h.accountService.CheckBalance(accountData["PublicKey"])
 	if err != nil {
 		return res, nil
 	}

internal/utils/filehandler.go

@@ -1,9 +1,6 @@
 package utils
 
-import (
-	"encoding/json"
-	"os"
-)
+
 
 
 type AccountFileHandlerInterface interface {
@@ -14,37 +11,3 @@ type AccountFileHandlerInterface interface {
 
 
 
-type AccountFileHandler2 struct {
-    FilePath string
-}
-
-// Implement the methods required by AccountFileHandlerInterface.
-func (afh *AccountFileHandler2) EnsureFileExists() error {
-	f, err := os.OpenFile(afh.FilePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return err
-	}
-	return f.Close()
-}
-func (afh *AccountFileHandler2) ReadAccountData() (map[string]string, error) { 
-	jsonData, err := os.ReadFile(afh.FilePath)
-	if err != nil {
-		return nil, err
-	}
-
-	var accountData map[string]string
-	err = json.Unmarshal(jsonData, &accountData)
-	if err != nil {
-		return nil, err
-	}
-
-	return accountData, nil
-}
-func (afh *AccountFileHandler2) WriteAccountData(data map[string]string) error { 
-	jsonData, err := json.Marshal(data)
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(afh.FilePath, jsonData, 0644)
-}