part way through writing master test - tests failing

3 files changed, 122 insertions, 11 deletions

diff --git a/pkg/datamaps/testdata/datamap_matches_test_template.csv b/pkg/datamaps/testdata/datamap_matches_test_template.csv
index 9ff8c8c..cb6178a 100644
--- a/pkg/datamaps/testdata/datamap_matches_test_template.csv
+++ b/pkg/datamaps/testdata/datamap_matches_test_template.csv
@@ -1,10 +1,19 @@
 cell_key,template_sheet,cellreference
-A Ten,Introduction,A1
-A Test,Introduction,C9
-A Vunt,Introduction,C22
-Floaty,Another Sheet,D5
-A Parrot,Introduction,J9
+A Date,Summary,B2
 A String,Summary,B3
+A String2,Summary,C3
+A String3,Summary,D3
 A Float,Summary,B4
-A Number,Another Sheet,N34
-A Rabbit,Another Sheet,DI15
+An Integer,Summary,B5
+A Date 1,Another Sheet,B3
+A String 1,Another Sheet,B4
+A Float 1,Another Sheet,B5
+An Integer 1,Another Sheet,B6
+A Date 2,Another Sheet,D3
+A String 2,Another Sheet,D4
+A Float 3,Another Sheet,D5
+An Integer 3,Another Sheet,D6
+A Ten Integer,Introduction,A1
+A Test String,Introduction,C9
+A Vunt String,Introduction,C22
+A Parrot String,Introduction,J9
diff --git a/pkg/datamaps/testdata/test_template.xlsm b/pkg/datamaps/testdata/test_template.xlsm
index 737eeb4..a13559c 100644
--- a/pkg/datamaps/testdata/test_template.xlsm
+++ b/pkg/datamaps/testdata/test_template.xlsm
diff --git a/pkg/datamaps/writer_test.go b/pkg/datamaps/writer_test.go
index 92af664..d4c5fcf 100644
--- a/pkg/datamaps/writer_test.go
+++ b/pkg/datamaps/writer_test.go
@@ -1,9 +1,18 @@
 package datamaps
 
 import (
+	"fmt"
 	"os"
-	"path/filepath"
+	"os/exec"
+	"strings"
 	"testing"
+
+	"github.com/tealeg/xlsx/v3"
+)
+
+var (
+	fileToColIdx  = make(map[string]int)
+	filesInMaster []string
 )
 
 func TestWriteMaster(t *testing.T) {
@@ -28,9 +37,9 @@ func TestWriteMaster(t *testing.T) {
 		XLSXPath:         "./testdata/",
 	}
 
-	defer func() {
-		os.Remove(filepath.Join(opts.MasterOutPutPath, "master.xlsx"))
-	}()
+	// defer func() {
+	// 	os.Remove(filepath.Join(opts.MasterOutPutPath, "master.xlsx"))
+	// }()
 
 	if err := DatamapToDB(&opts); err != nil {
 		t.Fatalf("Unable to write datamap to database file because %v.", err)
@@ -43,4 +52,97 @@ func TestWriteMaster(t *testing.T) {
 	if err := CreateMaster(&opts); err != nil {
 		t.Error(err)
 	}
+
+	var tests = []struct {
+		key      string
+		filename string
+		sheet    string
+		cellref  string
+		value    string
+	}{
+		{"A Date", "test_template.xlsx", "Summary", "B2", "20/10/19"},
+		{"A String", "test_template.xlsx", "Summary", "B3", "This is a string"},
+		{"A String2", "test_template.xlsx", "Summary", "C3", "This is a string"},
+		{"A String3", "test_template.xlsx", "Summary", "D3", "This is a string"},
+		{"A Float", "test_template.xlsx", "Summary", "B4", "2.2"},
+		{"An Integer", "test_template.xlsx", "Summary", "B5", "10"},
+		{"A Date 1", "test_template.xlsx", "Another Sheet", "B3", "20/10/19"},
+		{"A String 1", "test_template.xlsx", "Another Sheet", "B4", "This is a string"},
+		{"A Float 1", "test_template.xlsx", "Another Sheet", "B5", "2.2"},
+		{"An Integer 1", "test_template.xlsx", "Another Sheet", "B6", "10"},
+		{"A Date 2", "test_template.xlsx", "Another Sheet", "D3", "20/10/19"},
+		{"A String 2", "test_template.xlsx", "Another Sheet", "D4", "This is a string"},
+		{"A Float 3", "test_template.xlsx", "Another Sheet", "D5", "3.2"},
+		{"An Integer 3", "test_template.xlsx", "Another Sheet", "D6", "11"},
+		{"A Ten Integer", "test_template.xlsx", "Introduction", "A1", "10"},
+		{"A Test String", "test_template.xlsx", "Introduction", "C9", "Test Department"},
+		{"A Vunt String", "test_template.xlsx", "Introduction", "C22", "VUNT"},
+		{"A Parrot String", "test_template.xlsx", "Introduction", "J9", "Greedy Parrots"},
+	}
+
+	// Regular testing of import
+	// TODO fix date formatting
+	for _, test := range tests {
+		sql := fmt.Sprintf(`SELECT return_data.value FROM return_data, datamap_line 
+		WHERE 
+			(return_data.filename=%q 
+				AND datamap_line.cellref=%q 
+				AND datamap_line.sheet=%q
+				AND return_data.dml_id=datamap_line.id);`, test.filename, test.cellref, test.sheet)
+
+		got, err := exec.Command("sqlite3", opts.DBPath, sql).Output()
+		if err != nil {
+			t.Fatalf("something wrong %v", err)
+		}
+		got_s := strings.TrimSuffix(string(got), "\n")
+		if strings.Compare(got_s, test.value) != 0 {
+			t.Errorf("we wanted %s but got %s", test.value, got_s)
+		}
+	}
+
+	// TODO: Testing master
+
+	// The algorthim for this is as follows:
+	// - get all the file names in a set from the header row
+	// - go through each row and map the key/value coordinates for each file
+	// - when going through each test struct, look up the map created in step
+	// above to get the value.
+
+	// Open the master and the target sheet
+	master, err := xlsx.OpenFile("./testdata/master.xlsx")
+	if err != nil {
+		t.Fatal(err)
+	}
+	sheetName := "Master Data"
+	sh, ok := master.Sheet[sheetName]
+	if !ok {
+		t.Errorf("Sheet named %s does not exist", sheetName)
+	}
+	defer sh.Close()
+
+	err = sh.ForEachRow(rowVisitorTest)
+
+}
+
+func cellVisitorTest(c *xlsx.Cell) error {
+	filesInMaster = append(filesInMaster, c.Value)
+	fileToColIdx[c.Value] = c.Row.GetCoordinate() // NOT RIGHT - GETTING INDEX FOR ROW
+	return nil
+}
+
+func rowVisitorTest(r *xlsx.Row) error {
+	// TODO here we want to first find the file names from the header row,
+	// then test that all key (from col 0) matches the value.
+
+	if r.GetCoordinate() == 0 {
+		r.ForEachCell(cellVisitorTest)
+		return nil
+	}
+	// var key string
+	// key = r.GetCell(0).Value
+	// for idx, fn := range filesInMaster {
+	// 	// TODO
+	// }
+	fmt.Println(r)
+	return nil
 }