From b9c56b04ce3f1eee05cfcc20a55eb38ee769a4ab Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Thu, 31 Oct 2024 11:43:27 +0000
Subject: [PATCH] Remove obsolete track account status code

---
 internal/handlers/ussd/menuhandler_test.go      | 17 ++++-------------
 internal/models/trackstatusresponse.go          |  6 +++++-
 .../testutil/testservice/TestAccountService.go  |  7 +------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/internal/handlers/ussd/menuhandler_test.go b/internal/handlers/ussd/menuhandler_test.go
index 8708145..8c3867a 100644
--- a/internal/handlers/ussd/menuhandler_test.go
+++ b/internal/handlers/ussd/menuhandler_test.go
@@ -7,7 +7,6 @@ import (
 	"log"
 	"path"
 	"testing"
-	"time"
 
 	"git.defalsify.org/vise.git/asm"
 	"git.defalsify.org/vise.git/db"
@@ -1064,11 +1063,7 @@ func TestCheckAccountStatus(t *testing.T) {
 				},
 			},
 			response: &models.TrackStatusResult {
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
+				Active:	true,
 			},
 			expectedResult: resource.Result{
 				FlagSet:   []uint32{flag_account_success},
@@ -1079,11 +1074,7 @@ func TestCheckAccountStatus(t *testing.T) {
 			name:  "Test when the account is not  yet on the sarafu network",
 			input: []byte("TrackingId1234"),
 			response: &models.TrackStatusResult{
-				CreatedAt:     time.Now(),
-				Status:        "SUCCESS",
-				TransferValue: json.Number("0.5"),
-				TxHash:        "0x123abc456def",
-				TxType:        "transfer",
+				Active: false,
 			},
 			serverResponse: &api.OKResponse{
 				Ok:          true,
@@ -1109,13 +1100,13 @@ func TestCheckAccountStatus(t *testing.T) {
 				flagManager:    fm.parser,
 			}
 
-			status := tt.response.Status
+			status := tt.response.Active
 			// Define expected interactions with the mock
 			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)
-			mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, []byte(status)).Return(nil).Maybe()
+			mockDataStore.On("WriteEntry", ctx, sessionId, common.DATA_ACCOUNT_STATUS, status).Return(nil).Maybe()
 
 			// Call the method under test
 			res, _ := h.CheckAccountStatus(ctx, "check_account_status", tt.input)
diff --git a/internal/models/trackstatusresponse.go b/internal/models/trackstatusresponse.go
index 202b69b..47d757d 100644
--- a/internal/models/trackstatusresponse.go
+++ b/internal/models/trackstatusresponse.go
@@ -5,10 +5,14 @@ import (
 	"time"
 )
 
-type TrackStatusResult struct {
+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"`
 }
+
+type TrackStatusResult struct {
+	Active	bool `json:"active"`
+}
diff --git a/internal/testutil/testservice/TestAccountService.go b/internal/testutil/testservice/TestAccountService.go
index 885e63f..78a2798 100644
--- a/internal/testutil/testservice/TestAccountService.go
+++ b/internal/testutil/testservice/TestAccountService.go
@@ -3,7 +3,6 @@ package testservice
 import (
 	"context"
 	"encoding/json"
-	"time"
 
 	"git.grassecon.net/urdt/ussd/internal/models"
 	"github.com/grassrootseconomics/eth-custodial/pkg/api"
@@ -30,11 +29,7 @@ func (tas *TestAccountService) CheckBalance(ctx context.Context, publicKey strin
 
 func (tas *TestAccountService) CheckAccountStatus(ctx context.Context, trackingId string) (*models.TrackStatusResult, error) {
 	return &models.TrackStatusResult {
-		CreatedAt: time.Now(),
-		Status: "SUCCESS",
-		TransferValue: json.Number("0.5"),
-		TxHash: "0x123abc456def",
-		TxType: "transfer",
+		Active: true,
 	}, nil
 }