refactor configuration handling in tests to use ConfigStore instead o…

…f MockConfig
blnkfinance · Jan 17, 2025 · 95d4967 · 95d4967
1 parent 90db126
commit 95d4967
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 26 deletions.
diff --git a/account_test.go b/account_test.go
@@ -78,6 +78,7 @@ func TestCreateAccount(t *testing.T) {
 }
 
 func TestCreateAccountWithExternalGenerator(t *testing.T) {
+
 	// Initialize the mock HTTP responder
 	httpmock.Activate()
 	defer httpmock.DeactivateAndReset()
@@ -92,8 +93,6 @@ func TestCreateAccountWithExternalGenerator(t *testing.T) {
 	httpmock.RegisterResponder("GET", "http://example.com/generateAccount",
 		httpmock.NewStringResponder(200, `{"account_number": "123456789", "bank_name": "Blnk Bank"}`))
 
-	config.MockConfig(&config.Configuration{Server: config.ServerConfig{SecretKey: "some-secret"}, AccountNumberGeneration: config.AccountNumberGenerationConfig{HttpService: config.AccountGenerationHttpService{Url: "http://example.com/generateAccount"}}})
-
 	account := model.Account{
 		Name:       "Test Account",
 		BankName:   "Blnk Bank",
@@ -129,6 +128,23 @@ func TestCreateAccountWithExternalGenerator(t *testing.T) {
 }
 
 func TestGetAccountByID(t *testing.T) {
+	cnf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
+		Server: config.ServerConfig{SecretKey: "some-secret"},
+		AccountNumberGeneration: config.AccountNumberGenerationConfig{
+			HttpService: config.AccountGenerationHttpService{
+				Url: "http://example.com/generateAccount",
+			},
+		},
+	}
+
+	config.ConfigStore.Store(cnf)
 	datasource, mock, err := newTestDataSource()
 	assert.NoError(t, err)
 
@@ -172,6 +188,23 @@ func TestGetAccountByID(t *testing.T) {
 }
 
 func TestGetAllAccounts(t *testing.T) {
+	cnf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
+		Server: config.ServerConfig{SecretKey: "some-secret"},
+		AccountNumberGeneration: config.AccountNumberGenerationConfig{
+			HttpService: config.AccountGenerationHttpService{
+				Url: "http://example.com/generateAccount",
+			},
+		},
+	}
+
+	config.ConfigStore.Store(cnf)
 	datasource, mock, err := newTestDataSource()
 	assert.NoError(t, err)
 

diff --git a/balance_test.go b/balance_test.go
@@ -221,6 +221,7 @@ func TestGetBalanceByID(t *testing.T) {
 }
 
 func TestGetAllBalances(t *testing.T) {
+
 	datasource, mock, err := newTestDataSource()
 	if err != nil {
 		t.Fatalf("Error creating test data source: %s", err)

diff --git a/cmd/main.go b/cmd/main.go
@@ -92,6 +92,7 @@ func setupBlnk(cfg *config.Configuration) (*blnk.Blnk, error) {
 	// Create a new Blnk instance using the initialized data source.
 	newBlnk, err := blnk.NewBlnk(db)
 	if err != nil {
+		logrus.Error(err) // Log the error using Logrus
 		return &blnk.Blnk{}, fmt.Errorf("error creating blnk: %v", err)
 	}
 	return newBlnk, nil

diff --git a/cmd/server.go b/cmd/server.go
@@ -184,7 +184,7 @@ func serverCommands(b *blnkInstance) *cobra.Command {
 			// Load configuration
 			cfg, err := config.Fetch()
 			if err != nil {
-				log.Fatal(err)
+				log.Println(err)
 			}
 
 			// Initialize observability (tracing and PostHog)

diff --git a/database/db_test.go b/database/db_test.go
@@ -20,7 +20,7 @@ func TestGetDBConnection_Singleton(t *testing.T) {
 		},
 	}
 
-	config.MockConfig(mockConfig)
+	config.ConfigStore.Store(mockConfig)
 
 	// First call to GetDBConnection should initialize the instance
 	ds1, err := GetDBConnection(mockConfig)

diff --git a/internal/cache/cache_test.go b/internal/cache/cache_test.go
@@ -26,7 +26,23 @@ import (
 )
 
 func TestSet(t *testing.T) {
-	config.MockConfig(&config.Configuration{})
+	cnf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
+		Server: config.ServerConfig{SecretKey: "some-secret"},
+		AccountNumberGeneration: config.AccountNumberGenerationConfig{
+			HttpService: config.AccountGenerationHttpService{
+				Url: "http://example.com/generateAccount",
+			},
+		},
+	}
+
+	config.ConfigStore.Store(cnf)
 	ctx := context.Background()
 	mockCache, err := NewCache()
 	assert.NoError(t, err)

diff --git a/ledger_test.go b/ledger_test.go
@@ -36,7 +36,23 @@ import (
 )
 
 func newTestDataSource() (database.IDataSource, sqlmock.Sqlmock, error) {
-	config.MockConfig(&config.Configuration{})
+	cnf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
+		Server: config.ServerConfig{SecretKey: "some-secret"},
+		AccountNumberGeneration: config.AccountNumberGenerationConfig{
+			HttpService: config.AccountGenerationHttpService{
+				Url: "http://example.com/generateAccount",
+			},
+		},
+	}
+
+	config.ConfigStore.Store(cnf)
 	db, mock, err := sqlmock.New()
 	if err != nil {
 		log.Printf("an error '%s' was not expected when opening a stub database Connection", err)

diff --git a/queue_test.go b/queue_test.go
@@ -38,7 +38,7 @@ func TestEnqueueImmediateTransactionSuccess(t *testing.T) {
 			NumberOfQueues: 1,
 		},
 	}
-	config.MockConfig(cnf)
+	config.ConfigStore.Store(cnf)
 
 	redisOption, err := redis_db.ParseRedisURL("localhost:6379")
 	if err != nil {
@@ -68,10 +68,16 @@ func TestEnqueueImmediateTransactionSuccess(t *testing.T) {
 }
 
 func TestEnqueueScheduledTransaction(t *testing.T) {
-	conf, err := config.Fetch()
-	if err != nil {
-		assert.NoError(t, err)
+	conf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
 	}
+	config.ConfigStore.Store(conf)
 
 	client := asynq.NewClient(asynq.RedisClientOpt{Addr: "localhost:6379"})
 	inspector := asynq.NewInspector(asynq.RedisClientOpt{Addr: "localhost:6379"})
@@ -86,7 +92,7 @@ func TestEnqueueScheduledTransaction(t *testing.T) {
 
 	transaction := getTransactionMock(100, false)
 
-	_, err = json.Marshal(transaction)
+	_, err := json.Marshal(transaction)
 	assert.NoError(t, err)
 
 	err = q.Enqueue(context.Background(), &transaction)
@@ -100,9 +106,14 @@ func TestEnqueueScheduledTransaction(t *testing.T) {
 }
 
 func TestEnqueueWithAsynqClientEnqueueError(t *testing.T) {
-	conf, err := config.Fetch()
-	if err != nil {
-		assert.NoError(t, err)
+	conf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
 	}
 
 	client := asynq.NewClient(asynq.RedisClientOpt{Addr: "localhost:6379"})
@@ -118,7 +129,7 @@ func TestEnqueueWithAsynqClientEnqueueError(t *testing.T) {
 
 	transaction := getTransactionMock(100, false)
 
-	_, err = json.Marshal(transaction)
+	_, err := json.Marshal(transaction)
 	assert.NoError(t, err)
 
 	err = q.Enqueue(context.Background(), &transaction)

diff --git a/reconciliation_test.go b/reconciliation_test.go
@@ -35,7 +35,7 @@ func TestOneToOneReconciliation(t *testing.T) {
 			MaxWorkers: 1,
 		},
 	}
-	config.MockConfig(cnf)
+	config.ConfigStore.Store(cnf)
 	mockDS := new(mocks.MockDataSource)
 	blnk := &Blnk{datasource: mockDS}
 
@@ -82,10 +82,11 @@ func TestOneToOneReconciliation(t *testing.T) {
 func TestOneToManyReconciliation(t *testing.T) {
 	cnf := &config.Configuration{
 		Transaction: config.TransactionConfig{
-			BatchSize: 100000,
+			BatchSize:  100000,
+			MaxWorkers: 1,
 		},
 	}
-	config.MockConfig(cnf)
+	config.ConfigStore.Store(cnf)
 	mockDS := new(mocks.MockDataSource)
 	blnk := &Blnk{datasource: mockDS}
 
@@ -140,14 +141,15 @@ func TestOneToManyReconciliationNoMatches(t *testing.T) {
 			Dns: "localhost:6379",
 		},
 		Transaction: config.TransactionConfig{
-			BatchSize: 100000,
+			BatchSize:  100000,
+			MaxWorkers: 1,
 		},
 		Queue: config.QueueConfig{
 			WebhookQueue:   "webhook_queue",
 			NumberOfQueues: 1,
 		},
 	}
-	config.MockConfig(cnf)
+	config.ConfigStore.Store(cnf)
 	mockDS := new(mocks.MockDataSource)
 	blnk := &Blnk{datasource: mockDS}
 
@@ -375,15 +377,18 @@ func TestReconciliationEdgeCases(t *testing.T) {
 			Dns: "localhost:6379",
 		},
 		Transaction: config.TransactionConfig{
-			BatchSize: 100000,
+			BatchSize:  100000,
+			MaxWorkers: 1,
 		},
 		Queue: config.QueueConfig{
 			WebhookQueue:   "webhook_queue",
 			NumberOfQueues: 1,
 		},
+		Reconciliation: config.ReconciliationConfig{
+			ProgressInterval: 100,
+		},
 	}
-	config.MockConfig(cnf)
-
+	config.ConfigStore.Store(cnf)
 	mockDS := new(mocks.MockDataSource)
 
 	blnk := &Blnk{datasource: mockDS}
@@ -411,9 +416,8 @@ func TestReconciliationEdgeCases(t *testing.T) {
 		externalTxns := []*model.Transaction{
 			{TransactionID: "ext1", Amount: 100, CreatedAt: time.Now()},
 		}
-		internalTxns := []*model.Transaction{}
 
-		mockDS.On("GetTransactionsPaginated", mock.Anything, "", 100000, int64(0)).Return(internalTxns, nil)
+		mockDS.On("GetTransactionsPaginated", mock.Anything, "", 100000, int64(0)).Return([]*model.Transaction{}, nil).Once()
 
 		matchingRules := []model.MatchingRule{
 			{

diff --git a/transaction_test.go b/transaction_test.go
@@ -24,6 +24,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/jerry-enebeli/blnk/config"
 	"github.com/jerry-enebeli/blnk/model"
 
 	"github.com/brianvoe/gofakeit/v6"
@@ -34,6 +35,23 @@ import (
 )
 
 func TestRecordTransaction(t *testing.T) {
+	cnf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
+		Server: config.ServerConfig{SecretKey: "some-secret"},
+		AccountNumberGeneration: config.AccountNumberGenerationConfig{
+			HttpService: config.AccountGenerationHttpService{
+				Url: "http://example.com/generateAccount",
+			},
+		},
+	}
+
+	config.ConfigStore.Store(cnf)
 	datasource, mock, err := newTestDataSource()
 	assert.NoError(t, err)
 
@@ -143,6 +161,23 @@ func TestRecordTransaction(t *testing.T) {
 }
 
 func TestRecordTransactionWithRate(t *testing.T) {
+	cnf := &config.Configuration{
+		Redis: config.RedisConfig{
+			Dns: "localhost:6379",
+		},
+		Queue: config.QueueConfig{
+			WebhookQueue:   "webhook_queue",
+			NumberOfQueues: 1,
+		},
+		Server: config.ServerConfig{SecretKey: "some-secret"},
+		AccountNumberGeneration: config.AccountNumberGenerationConfig{
+			HttpService: config.AccountGenerationHttpService{
+				Url: "http://example.com/generateAccount",
+			},
+		},
+	}
+
+	config.ConfigStore.Store(cnf)
 	datasource, mock, err := newTestDataSource()
 	assert.NoError(t, err)
 

diff --git a/webhooks_test.go b/webhooks_test.go
@@ -56,7 +56,7 @@ func TestSendWebhook(t *testing.T) {
 			},
 		},
 	}
-	config.MockConfig(cnf)
+	config.ConfigStore.Store(cnf)
 
 	testData := NewWebhook{
 		Event:   "transaction.queued",