code refactor

pkg/converters/datatable/data_table.go

@@ -1,6 +1,11 @@
 package datatable
 
-import "time"
+import (
+	"time"
+
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
 
 // ImportedDataTable defines the structure of imported data table
 type ImportedDataTable interface {
@@ -16,6 +21,9 @@ type ImportedDataTable interface {
 
 // ImportedDataRow defines the structure of imported data row
 type ImportedDataRow interface {
+	// IsValid returns whether this row contains valid data for importing
+	IsValid() bool
+
 	// ColumnCount returns the total count of column in this data row
 	ColumnCount() int
 
@@ -35,7 +43,7 @@ type ImportedDataRowIterator interface {
 	HasNext() bool
 
 	// Next returns the next imported data row
-	Next() ImportedDataRow
+	Next(ctx core.Context, user *models.User) ImportedDataRow
 }
 
 // DataTableBuilder defines the structure of data table builder

pkg/converters/datatable/data_table_transaction_data_converter.go

@@ -75,6 +75,14 @@ func CreateNewImporter(dataColumnMapping map[DataTableColumn]string, transaction
 	}
 }
 
+// CreateNewSimpleImporter returns a new data table transaction data importer according to the specified arguments
+func CreateNewSimpleImporter(dataColumnMapping map[DataTableColumn]string, transactionTypeMapping map[models.TransactionType]string) *DataTableTransactionDataImporter {
+	return &DataTableTransactionDataImporter{
+		dataColumnMapping:      dataColumnMapping,
+		transactionTypeMapping: transactionTypeMapping,
+	}
+}
+
 // CreateNewSimpleImporterWithPostProcessFunc returns a new data table transaction data importer according to the specified arguments
 func CreateNewSimpleImporterWithPostProcessFunc(dataColumnMapping map[DataTableColumn]string, transactionTypeMapping map[models.TransactionType]string, postProcessFunc DataTableTransactionDataImporterPostProcessFunc) *DataTableTransactionDataImporter {
 	return &DataTableTransactionDataImporter{
@@ -311,7 +319,12 @@ func (c *DataTableTransactionDataImporter) ParseImportedData(ctx core.Context, u
 
 	for dataRowIterator.HasNext() {
 		dataRowIndex++
-		dataRow := dataRowIterator.Next()
+		dataRow := dataRowIterator.Next(ctx, user)
+
+		if !dataRow.IsValid() {
+			continue
+		}
+
 		columnCount := dataRow.ColumnCount()
 
 		if columnCount < 1 || (columnCount == 1 && dataRow.GetData(0) == "") {
@@ -577,6 +590,11 @@ func (c *DataTableTransactionDataImporter) ParseImportedData(ctx core.Context, u
 		allNewTransactions = append(allNewTransactions, transaction)
 	}
 
+	if len(allNewTransactions) < 1 {
+		log.Errorf(ctx, "[data_table_transaction_data_converter.parseImportedData] no transaction data parsed for \"uid:%d\"", user.Uid)
+		return nil, nil, nil, nil, nil, nil, errs.ErrNotFoundTransactionDataInFile
+	}
+
 	sort.Sort(allNewTransactions)
 
 	return allNewTransactions, allNewAccounts, allNewSubExpenseCategories, allNewSubIncomeCategories, allNewSubTransferCategories, allNewTags, nil

pkg/converters/datatable/writable_data_table.go

@@ -3,6 +3,8 @@ package datatable
 import (
 	"time"
 
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
 	"github.com/mayswind/ezbookkeeping/pkg/utils"
 )
 
@@ -89,6 +91,11 @@ func (t *WritableDataTable) DataRowIterator() ImportedDataRowIterator {
 	}
 }
 
+// IsValid returns whether this row contains valid data for importing
+func (r *WritableDataRow) IsValid() bool {
+	return true
+}
+
 // ColumnCount returns the total count of column in this data row
 func (r *WritableDataRow) ColumnCount() int {
 	return len(r.rowData)
@@ -121,7 +128,7 @@ func (t *WritableDataRowIterator) HasNext() bool {
 }
 
 // Next returns the next imported data row
-func (t *WritableDataRowIterator) Next() ImportedDataRow {
+func (t *WritableDataRowIterator) Next(ctx core.Context, user *models.User) ImportedDataRow {
 	if t.nextIndex >= len(t.dataTable.allData) {
 		return nil
 	}

pkg/converters/datatable/writable_data_table_test.go

@@ -6,6 +6,8 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
 	"github.com/mayswind/ezbookkeeping/pkg/utils"
 )
 
@@ -176,7 +178,7 @@ func TestWritableDataTableDataRowIterator(t *testing.T) {
 	iterator := writableDataTable.DataRowIterator()
 
 	for iterator.HasNext() {
-		dataRow := iterator.Next()
+		dataRow := iterator.Next(core.NewNullContext(), &models.User{})
 
 		actualTransactionTime, err := dataRow.GetTime(0, utils.GetTimezoneOffsetMinutes(time.Local))
 		assert.Nil(t, err)