From 9c33a6157012ccac0a8c85483dfadda553d49752 Mon Sep 17 00:00:00 2001
From: Donovan <donovan.a.kelly@pm.me>
Date: Mon, 14 Oct 2024 16:54:24 -0500
Subject: [PATCH] refactor customer_test.go

---
 {test => core}/customer_test.go | 33 ++++++++++++++++-----------------
 core/sqlite-init/sqlite_init.go |  5 ++++-
 2 files changed, 20 insertions(+), 18 deletions(-)
 rename {test => core}/customer_test.go (51%)

diff --git a/test/customer_test.go b/core/customer_test.go
similarity index 51%
rename from test/customer_test.go
rename to core/customer_test.go
index 16205fc..610bb0d 100644
--- a/test/customer_test.go
+++ b/core/customer_test.go
@@ -1,8 +1,7 @@
-package test
+package core
 
 import (
 	"github.com/stretchr/testify/assert"
-	"go-nkode/core"
 	"testing"
 )
 
@@ -13,27 +12,27 @@ func TestCustomer(t *testing.T) {
 }
 
 func testNewCustomerAttributes(t *testing.T) {
-	_, nil := core.NewCustomerAttributes()
+	_, nil := NewCustomerAttributes()
 	assert.NoError(t, nil)
 }
 
 func testCustomerValidKeyEntry(t *testing.T) {
-	kp := core.KeypadDimension{AttrsPerKey: 10, NumbOfKeys: 9}
-	nkodePolicy := core.NewDefaultNKodePolicy()
-	customer, err := core.NewCustomer(nkodePolicy)
+	kp := KeypadDimension{AttrsPerKey: 10, NumbOfKeys: 9}
+	nkodePolicy := NewDefaultNKodePolicy()
+	customer, err := NewCustomer(nkodePolicy)
 	assert.NoError(t, err)
-	mockSvgInterface := make(core.SvgIdInterface, kp.TotalAttrs())
-	userInterface, err := core.NewUserInterface(&kp, mockSvgInterface)
+	mockSvgInterface := make(SvgIdInterface, kp.TotalAttrs())
+	userInterface, err := NewUserInterface(&kp, mockSvgInterface)
 	assert.NoError(t, err)
 	userEmail := "testing@example.com"
 	passcodeIdx := []int{0, 1, 2, 3}
-	user, err := core.NewUser(*customer, userEmail, passcodeIdx, *userInterface, kp)
+	user, err := NewUser(*customer, userEmail, passcodeIdx, *userInterface, kp)
 	assert.NoError(t, err)
 	userLoginInterface, err := user.GetLoginInterface()
 	assert.NoError(t, err)
-	selectedKeys, err := core.SelectKeyByAttrIdx(userLoginInterface, passcodeIdx, kp)
+	selectedKeys, err := SelectKeyByAttrIdx(userLoginInterface, passcodeIdx, kp)
 	assert.NoError(t, err)
-	validatedPasscode, err := core.ValidKeyEntry(*user, *customer, selectedKeys)
+	validatedPasscode, err := ValidKeyEntry(*user, *customer, selectedKeys)
 	assert.NoError(t, err)
 	assert.Equal(t, len(validatedPasscode), len(passcodeIdx))
 	for idx := range validatedPasscode {
@@ -42,16 +41,16 @@ func testCustomerValidKeyEntry(t *testing.T) {
 }
 
 func testCustomerIsValidNKode(t *testing.T) {
-	kp := core.KeypadDimension{AttrsPerKey: 10, NumbOfKeys: 7}
-	nkodePolicy := core.NewDefaultNKodePolicy()
-	customer, err := core.NewCustomer(nkodePolicy)
+	kp := KeypadDimension{AttrsPerKey: 10, NumbOfKeys: 7}
+	nkodePolicy := NewDefaultNKodePolicy()
+	customer, err := NewCustomer(nkodePolicy)
 	assert.NoError(t, err)
-	mockSvgInterface := make(core.SvgIdInterface, kp.TotalAttrs())
-	userInterface, err := core.NewUserInterface(&kp, mockSvgInterface)
+	mockSvgInterface := make(SvgIdInterface, kp.TotalAttrs())
+	userInterface, err := NewUserInterface(&kp, mockSvgInterface)
 	assert.NoError(t, err)
 	userEmail := "testing123@example.com"
 	passcodeIdx := []int{0, 1, 2, 3}
-	user, err := core.NewUser(*customer, userEmail, passcodeIdx, *userInterface, kp)
+	user, err := NewUser(*customer, userEmail, passcodeIdx, *userInterface, kp)
 	assert.NoError(t, err)
 	err = customer.IsValidNKode(user.Kp, passcodeIdx)
 	assert.NoError(t, err)
diff --git a/core/sqlite-init/sqlite_init.go b/core/sqlite-init/sqlite_init.go
index 9850478..a410697 100644
--- a/core/sqlite-init/sqlite_init.go
+++ b/core/sqlite-init/sqlite_init.go
@@ -7,6 +7,7 @@ import (
 	_ "github.com/mattn/go-sqlite3" // Import the SQLite3 driver
 	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 	"strings"
 )
@@ -24,7 +25,9 @@ type Root struct {
 }
 
 func main() {
-	dbPaths := []string{"/Users/donov/databases/test.db", "/Users/donov/databases/nkode.db"}
+	testDbPath := os.Getenv("TEST_DB_PATH")
+	dbPath := os.Getenv("DB_PATH")
+	dbPaths := []string{testDbPath, dbPath}
 	outputStr := MakeSvgFiles()
 	for _, path := range dbPaths {
 		MakeTables(path)