change the type of balance modification transaction to income or expense for imported feidee mymoney transaction data

pkg/converters/data_table_transaction_data_converter.go

@@ -49,8 +49,12 @@ type DataTableTransactionDataImporter struct {
 	transactionTypeMapping  map[models.TransactionType]string
 	geoLocationSeparator    string
 	transactionTagSeparator string
+	postProcessFunc         DataTableTransactionDataImporterPostProcessFunc
 }
 
+// DataTableTransactionDataImporterPostProcessFunc represents item post process function of DataTableTransactionDataImporter
+type DataTableTransactionDataImporterPostProcessFunc func(core.Context, *models.ImportTransaction) error
+
 func (c *DataTableTransactionDataExporter) buildExportedContent(ctx core.Context, dataTableBuilder DataTableBuilder, uid int64, transactions []*models.Transaction, accountMap map[int64]*models.Account, categoryMap map[int64]*models.TransactionCategory, tagMap map[int64]*models.TransactionTag, allTagIndexes map[int64][]int64) error {
 	for i := 0; i < len(transactions); i++ {
 		transaction := transactions[i]
@@ -492,6 +496,15 @@ func (c *DataTableTransactionDataImporter) parseImportedData(ctx core.Context, u
 			OriginalTagNames:                   tagNames,
 		}
 
+		if c.postProcessFunc != nil {
+			err = c.postProcessFunc(ctx, transaction)
+
+			if err != nil {
+				log.Errorf(ctx, "[data_table_transaction_data_converter.parseImportedData] cannot post process data row \"index:%d\" for user \"uid:%d\", because %s", dataRowIndex, user.Uid, err.Error())
+				return nil, nil, nil, nil, err
+			}
+		}
+
 		allNewTransactions = append(allNewTransactions, transaction)
 	}
 

pkg/converters/feidee_mymoney_transaction_data_csv_file_importer.go

@@ -192,6 +192,7 @@ func (c *feideeMymoneyTransactionDataCsvImporter) ParseImportedData(ctx core.Con
 	dataTableImporter := DataTableTransactionDataImporter{
 		dataColumnMapping:      dataTable.GetDataColumnMapping(),
 		transactionTypeMapping: c.transactionTypeMapping,
+		postProcessFunc:        feideeMymoneyTransactionDataImporterPostProcess,
 	}
 
 	return dataTableImporter.parseImportedData(ctx, user, dataTable, defaultTimezoneOffset, accountMap, categoryMap, tagMap)

pkg/converters/feidee_mymoney_transaction_data_csv_file_importer_test.go

@@ -2,6 +2,7 @@ package converters
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/assert"
 
@@ -22,6 +23,7 @@ func TestFeideeMymoneyCsvFileImporterParseImportedData_MinimumValidData(t *testi
 	allNewTransactions, allNewAccounts, allNewSubCategories, allNewTags, err := converter.ParseImportedData(context, user, []byte("随手记导出文件(headers:v5;xxxxx)\n"+
 		"\"交易类型\",\"日期\",\"子类别\",\"账户\",\"金额\",\"备注\",\"关联Id\"\n"+
 		"\"余额变更\",\"2024-09-01 00:00:00\",\"\",\"Test Account\",\"123.45\",\"\",\"\"\n"+
+		"\"余额变更\",\"2024-09-01 01:00:00\",\"\",\"Test Account2\",\"-0.12\",\"\",\"\"\n"+
 		"\"收入\",\"2024-09-01 01:23:45\",\"Test Category\",\"Test Account\",\"0.12\",\"\",\"\"\n"+
 		"\"支出\",\"2024-09-01 12:34:56\",\"Test Category2\",\"Test Account\",\"1.00\",\"\",\"\"\n"+
 		"\"转出\",\"2024-09-01 23:59:59\",\"Test Category3\",\"Test Account\",\"0.05\",\"\",\"00000000-0000-0000-0000-000000000001\"\n"+
@@ -31,48 +33,55 @@ func TestFeideeMymoneyCsvFileImporterParseImportedData_MinimumValidData(t *testi
 
 	assert.Nil(t, err)
 
-	assert.Equal(t, 5, len(allNewTransactions))
+	assert.Equal(t, 6, len(allNewTransactions))
 	assert.Equal(t, 2, len(allNewAccounts))
 	assert.Equal(t, 3, len(allNewSubCategories))
 	assert.Equal(t, 0, len(allNewTags))
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_MODIFY_BALANCE, allNewTransactions[0].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[0].Type)
-	assert.Equal(t, int64(1725148800), utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime))
+	assert.Equal(t, "2024-09-01 00:00:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime), time.UTC))
 	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
 	assert.Equal(t, "Test Account", allNewTransactions[0].OriginalSourceAccountName)
 	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[1].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[1].Type)
-	assert.Equal(t, int64(1725153825), utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime))
+	assert.Equal(t, "2024-09-01 01:00:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime), time.UTC))
 	assert.Equal(t, int64(12), allNewTransactions[1].Amount)
-	assert.Equal(t, "Test Account", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "Test Account2", allNewTransactions[1].OriginalSourceAccountName)
-	assert.Equal(t, "Test Category", allNewTransactions[1].OriginalCategoryName)
+	assert.Equal(t, "", allNewTransactions[1].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[2].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[2].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[2].Type)
-	assert.Equal(t, int64(1725194096), utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime))
+	assert.Equal(t, "2024-09-01 01:23:45", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime), time.UTC))
-	assert.Equal(t, int64(100), allNewTransactions[2].Amount)
+	assert.Equal(t, int64(12), allNewTransactions[2].Amount)
 	assert.Equal(t, "Test Account", allNewTransactions[2].OriginalSourceAccountName)
-	assert.Equal(t, "Test Category2", allNewTransactions[2].OriginalCategoryName)
+	assert.Equal(t, "Test Category", allNewTransactions[2].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[3].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[3].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[3].Type)
-	assert.Equal(t, int64(1725235199), utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime))
+	assert.Equal(t, "2024-09-01 12:34:56", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime), time.UTC))
-	assert.Equal(t, int64(5), allNewTransactions[3].Amount)
+	assert.Equal(t, int64(100), allNewTransactions[3].Amount)
 	assert.Equal(t, "Test Account", allNewTransactions[3].OriginalSourceAccountName)
-	assert.Equal(t, "Test Account2", allNewTransactions[3].OriginalDestinationAccountName)
+	assert.Equal(t, "Test Category2", allNewTransactions[3].OriginalCategoryName)
-	assert.Equal(t, "Test Category3", allNewTransactions[3].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[4].Uid)
 	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[4].Type)
-	assert.Equal(t, int64(1725321599), utils.GetUnixTimeFromTransactionTime(allNewTransactions[4].TransactionTime))
+	assert.Equal(t, "2024-09-01 23:59:59", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[4].TransactionTime), time.UTC))
-	assert.Equal(t, int64(50), allNewTransactions[4].Amount)
+	assert.Equal(t, int64(5), allNewTransactions[4].Amount)
-	assert.Equal(t, "Test Account2", allNewTransactions[4].OriginalSourceAccountName)
+	assert.Equal(t, "Test Account", allNewTransactions[4].OriginalSourceAccountName)
-	assert.Equal(t, "Test Account", allNewTransactions[4].OriginalDestinationAccountName)
+	assert.Equal(t, "Test Account2", allNewTransactions[4].OriginalDestinationAccountName)
 	assert.Equal(t, "Test Category3", allNewTransactions[4].OriginalCategoryName)
 
+	assert.Equal(t, int64(1234567890), allNewTransactions[5].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[5].Type)
+	assert.Equal(t, "2024-09-02 23:59:59", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[5].TransactionTime), time.UTC))
+	assert.Equal(t, int64(50), allNewTransactions[5].Amount)
+	assert.Equal(t, "Test Account2", allNewTransactions[5].OriginalSourceAccountName)
+	assert.Equal(t, "Test Account", allNewTransactions[5].OriginalDestinationAccountName)
+	assert.Equal(t, "Test Category3", allNewTransactions[5].OriginalCategoryName)
+
 	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
 	assert.Equal(t, "Test Account", allNewAccounts[0].Name)
 	assert.Equal(t, "CNY", allNewAccounts[0].Currency)

pkg/converters/feidee_mymoney_transaction_data_file_importer.go

@@ -0,0 +1,37 @@
+package converters
+
+import (
+	"github.com/mayswind/ezbookkeeping/pkg/core"
+	"github.com/mayswind/ezbookkeeping/pkg/models"
+)
+
+var feideeMymoneyDataColumnNameMapping = map[DataTableColumn]string{
+	DATA_TABLE_TRANSACTION_TIME:     "日期",
+	DATA_TABLE_TRANSACTION_TYPE:     "交易类型",
+	DATA_TABLE_CATEGORY:             "分类",
+	DATA_TABLE_SUB_CATEGORY:         "子分类",
+	DATA_TABLE_ACCOUNT_NAME:         "账户1",
+	DATA_TABLE_AMOUNT:               "金额",
+	DATA_TABLE_RELATED_ACCOUNT_NAME: "账户2",
+	DATA_TABLE_DESCRIPTION:          "备注",
+}
+
+var feideeMymoneyTransactionTypeNameMapping = map[models.TransactionType]string{
+	models.TRANSACTION_TYPE_MODIFY_BALANCE: "余额变更",
+	models.TRANSACTION_TYPE_INCOME:         "收入",
+	models.TRANSACTION_TYPE_EXPENSE:        "支出",
+	models.TRANSACTION_TYPE_TRANSFER:       "转账",
+}
+
+func feideeMymoneyTransactionDataImporterPostProcess(ctx core.Context, transaction *models.ImportTransaction) error {
+	if transaction.Type == models.TRANSACTION_DB_TYPE_MODIFY_BALANCE {
+		if transaction.Amount >= 0 {
+			transaction.Type = models.TRANSACTION_DB_TYPE_INCOME
+		} else if transaction.Amount < 0 {
+			transaction.Amount = -transaction.Amount
+			transaction.Type = models.TRANSACTION_DB_TYPE_EXPENSE
+		}
+	}
+
+	return nil
+}

pkg/converters/feidee_mymoney_transaction_data_xls_file_importer.go

@@ -10,30 +10,13 @@ type feideeMymoneyTransactionDataXlsImporter struct {
 	DataTableTransactionDataImporter
 }
 
-var feideeMymoneyDataColumnNameMapping = map[DataTableColumn]string{
-	DATA_TABLE_TRANSACTION_TIME:     "日期",
-	DATA_TABLE_TRANSACTION_TYPE:     "交易类型",
-	DATA_TABLE_CATEGORY:             "分类",
-	DATA_TABLE_SUB_CATEGORY:         "子分类",
-	DATA_TABLE_ACCOUNT_NAME:         "账户1",
-	DATA_TABLE_AMOUNT:               "金额",
-	DATA_TABLE_RELATED_ACCOUNT_NAME: "账户2",
-	DATA_TABLE_DESCRIPTION:          "备注",
-}
-
-var feideeMymoneyTransactionTypeNameMapping = map[models.TransactionType]string{
-	models.TRANSACTION_TYPE_MODIFY_BALANCE: "余额变更",
-	models.TRANSACTION_TYPE_INCOME:         "收入",
-	models.TRANSACTION_TYPE_EXPENSE:        "支出",
-	models.TRANSACTION_TYPE_TRANSFER:       "转账",
-}
-
 // Initialize a feidee mymoney transaction data xls file importer singleton instance
 var (
 	FeideeMymoneyTransactionDataXlsImporter = &feideeMymoneyTransactionDataXlsImporter{
 		DataTableTransactionDataImporter{
 			dataColumnMapping:      feideeMymoneyDataColumnNameMapping,
 			transactionTypeMapping: feideeMymoneyTransactionTypeNameMapping,
+			postProcessFunc:        feideeMymoneyTransactionDataImporterPostProcess,
 		},
 	}
 )

pkg/converters/feidee_mymoney_transaction_data_xls_file_importer_test.go

@@ -27,55 +27,62 @@ func TestFeideeMymoneyTransactionDataXlsImporterParseImportedData_MinimumValidDa
 	allNewTransactions, allNewAccounts, allNewSubCategories, allNewTags, err := converter.ParseImportedData(context, user, testdata, 0, nil, nil, nil)
 	assert.Nil(t, err)
 
-	assert.Equal(t, 6, len(allNewTransactions))
+	assert.Equal(t, 7, len(allNewTransactions))
 	assert.Equal(t, 2, len(allNewAccounts))
 	assert.Equal(t, 5, len(allNewSubCategories))
 	assert.Equal(t, 0, len(allNewTags))
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[0].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_MODIFY_BALANCE, allNewTransactions[0].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[0].Type)
 	assert.Equal(t, "2024-09-01 00:00:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[0].TransactionTime), time.UTC))
 	assert.Equal(t, int64(12345), allNewTransactions[0].Amount)
 	assert.Equal(t, "Test Account", allNewTransactions[0].OriginalSourceAccountName)
 	assert.Equal(t, "", allNewTransactions[0].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[1].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[1].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[1].Type)
-	assert.Equal(t, "2024-09-01 01:23:45", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime), time.UTC))
+	assert.Equal(t, "2024-09-01 01:00:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[1].TransactionTime), time.UTC))
 	assert.Equal(t, int64(12), allNewTransactions[1].Amount)
-	assert.Equal(t, "Test Account", allNewTransactions[1].OriginalSourceAccountName)
+	assert.Equal(t, "Test Account2", allNewTransactions[1].OriginalSourceAccountName)
-	assert.Equal(t, "Test Category", allNewTransactions[1].OriginalCategoryName)
+	assert.Equal(t, "", allNewTransactions[1].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[2].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[2].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[2].Type)
-	assert.Equal(t, "2024-09-01 12:34:56", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime), time.UTC))
+	assert.Equal(t, "2024-09-01 01:23:45", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[2].TransactionTime), time.UTC))
-	assert.Equal(t, int64(100), allNewTransactions[2].Amount)
+	assert.Equal(t, int64(12), allNewTransactions[2].Amount)
-	assert.Equal(t, "Test Account2", allNewTransactions[2].OriginalSourceAccountName)
+	assert.Equal(t, "Test Account", allNewTransactions[2].OriginalSourceAccountName)
-	assert.Equal(t, "Test Category2", allNewTransactions[2].OriginalCategoryName)
+	assert.Equal(t, "Test Category", allNewTransactions[2].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[3].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[3].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[3].Type)
-	assert.Equal(t, "2024-09-01 23:59:59", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime), time.UTC))
+	assert.Equal(t, "2024-09-01 12:34:56", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[3].TransactionTime), time.UTC))
-	assert.Equal(t, int64(5), allNewTransactions[3].Amount)
+	assert.Equal(t, int64(100), allNewTransactions[3].Amount)
-	assert.Equal(t, "Test Comment5", allNewTransactions[3].Comment)
+	assert.Equal(t, "Test Account2", allNewTransactions[3].OriginalSourceAccountName)
-	assert.Equal(t, "Test Account", allNewTransactions[3].OriginalSourceAccountName)
+	assert.Equal(t, "Test Category2", allNewTransactions[3].OriginalCategoryName)
-	assert.Equal(t, "Test Account2", allNewTransactions[3].OriginalDestinationAccountName)
-	assert.Equal(t, "Test Category3", allNewTransactions[3].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[4].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[4].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_TRANSFER_OUT, allNewTransactions[4].Type)
-	assert.Equal(t, "2024-09-10 00:00:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[4].TransactionTime), time.UTC))
+	assert.Equal(t, "2024-09-01 23:59:59", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[4].TransactionTime), time.UTC))
-	assert.Equal(t, int64(-54300), allNewTransactions[4].Amount)
+	assert.Equal(t, int64(5), allNewTransactions[4].Amount)
-	assert.Equal(t, "Test Account2", allNewTransactions[4].OriginalSourceAccountName)
+	assert.Equal(t, "Test Comment5", allNewTransactions[4].Comment)
-	assert.Equal(t, "Test Category5", allNewTransactions[4].OriginalCategoryName)
+	assert.Equal(t, "Test Account", allNewTransactions[4].OriginalSourceAccountName)
+	assert.Equal(t, "Test Account2", allNewTransactions[4].OriginalDestinationAccountName)
+	assert.Equal(t, "Test Category3", allNewTransactions[4].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewTransactions[5].Uid)
-	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[5].Type)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_INCOME, allNewTransactions[5].Type)
-	assert.Equal(t, "2024-09-11 05:06:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[5].TransactionTime), time.UTC))
+	assert.Equal(t, "2024-09-10 00:00:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[5].TransactionTime), time.UTC))
-	assert.Equal(t, int64(-12340), allNewTransactions[5].Amount)
+	assert.Equal(t, int64(-54300), allNewTransactions[5].Amount)
-	assert.Equal(t, "Line1\nLine2", allNewTransactions[5].Comment)
+	assert.Equal(t, "Test Account2", allNewTransactions[5].OriginalSourceAccountName)
-	assert.Equal(t, "Test Account", allNewTransactions[5].OriginalSourceAccountName)
+	assert.Equal(t, "Test Category5", allNewTransactions[5].OriginalCategoryName)
-	assert.Equal(t, "Test Category4", allNewTransactions[5].OriginalCategoryName)
+
+	assert.Equal(t, int64(1234567890), allNewTransactions[6].Uid)
+	assert.Equal(t, models.TRANSACTION_DB_TYPE_EXPENSE, allNewTransactions[6].Type)
+	assert.Equal(t, "2024-09-11 05:06:00", utils.FormatUnixTimeToLongDateTime(utils.GetUnixTimeFromTransactionTime(allNewTransactions[6].TransactionTime), time.UTC))
+	assert.Equal(t, int64(-12340), allNewTransactions[6].Amount)
+	assert.Equal(t, "Line1\nLine2", allNewTransactions[6].Comment)
+	assert.Equal(t, "Test Account", allNewTransactions[6].OriginalSourceAccountName)
+	assert.Equal(t, "Test Category4", allNewTransactions[6].OriginalCategoryName)
 
 	assert.Equal(t, int64(1234567890), allNewAccounts[0].Uid)
 	assert.Equal(t, "Test Account", allNewAccounts[0].Name)