import member, project and merchant fields as tags when importing feidee mymoney export file

pkg/converters/feidee/feidee_mymoney_app_transaction_data_csv_file_importer.go

@@ -27,6 +27,9 @@ const feideeMymoneyAppTransactionAccountCurrencyColumnName = "账户币种"
 const feideeMymoneyAppTransactionAmountColumnName = "金额"
 const feideeMymoneyAppTransactionDescriptionColumnName = "备注"
 const feideeMymoneyAppTransactionRelatedIdColumnName = "关联Id"
+const feideeMymoneyAppTransactionMemberColumnName = "成员"
+const feideeMymoneyAppTransactionProjectColumnName = "项目"
+const feideeMymoneyAppTransactionMerchantColumnName = "商家"
 
 const feideeMymoneyAppTransactionTypeModifyBalanceText = "余额变更"
 const feideeMymoneyAppTransactionTypeModifyOutstandingBalanceText = "负债变更"
@@ -44,6 +47,9 @@ var feideeMymoneyAppDataColumnNameMapping = map[datatable.TransactionDataTableCo
 	datatable.TRANSACTION_DATA_TABLE_ACCOUNT_CURRENCY: feideeMymoneyAppTransactionAccountCurrencyColumnName,
 	datatable.TRANSACTION_DATA_TABLE_AMOUNT:           feideeMymoneyAppTransactionAmountColumnName,
 	datatable.TRANSACTION_DATA_TABLE_DESCRIPTION:      feideeMymoneyAppTransactionDescriptionColumnName,
+	datatable.TRANSACTION_DATA_TABLE_MEMBER:           feideeMymoneyAppTransactionMemberColumnName,
+	datatable.TRANSACTION_DATA_TABLE_PROJECT:          feideeMymoneyAppTransactionProjectColumnName,
+	datatable.TRANSACTION_DATA_TABLE_MERCHANT:         feideeMymoneyAppTransactionMerchantColumnName,
 }
 
 // feideeMymoneyAppTransactionDataCsvFileImporter defines the structure of feidee mymoney app csv importer for transaction data
@@ -123,6 +129,18 @@ func (c *feideeMymoneyAppTransactionDataCsvFileImporter) createNewFeideeMymoneyA
 		newColumns = append(newColumns, datatable.TRANSACTION_DATA_TABLE_DESCRIPTION)
 	}
 
+	if commonDataTable.HasColumn(feideeMymoneyAppTransactionMemberColumnName) {
+		newColumns = append(newColumns, datatable.TRANSACTION_DATA_TABLE_MEMBER)
+	}
+
+	if commonDataTable.HasColumn(feideeMymoneyAppTransactionProjectColumnName) {
+		newColumns = append(newColumns, datatable.TRANSACTION_DATA_TABLE_PROJECT)
+	}
+
+	if commonDataTable.HasColumn(feideeMymoneyAppTransactionMerchantColumnName) {
+		newColumns = append(newColumns, datatable.TRANSACTION_DATA_TABLE_MERCHANT)
+	}
+
 	transactionRowParser := createFeideeMymoneyTransactionDataRowParser()
 	transactionDataTable := datatable.CreateNewWritableTransactionDataTableWithRowParser(newColumns, transactionRowParser)
 	transferTransactionsMap := make(map[string]map[datatable.TransactionDataTableColumn]string, 0)

pkg/converters/feidee/feidee_mymoney_app_transaction_data_csv_file_importer_test.go

@@ -326,6 +326,35 @@ func TestFeideeMymoneyCsvFileImporterParseImportedData_ParseDescription(t *testi
 	assert.Equal(t, "Test\nA new line break", allNewTransactions[0].Comment)
 }
 
+func TestFeideeMymoneyCsvFileImporterParseImportedData_WithAdditionalOptions(t *testing.T) {
+	importer := FeideeMymoneyAppTransactionDataCsvFileImporter
+	context := core.NewNullContext()
+
+	user := &models.User{
+		Uid:             1234567890,
+		DefaultCurrency: "CNY",
+	}
+
+	allNewTransactions, _, _, _, _, _, err := importer.ParseImportedData(context, user, []byte("随手记导出文件(headers:v5;xxxxx)\n"+
+		"\"交易类型\",\"日期\",\"子类别\",\"账户\",\"金额\",\"备注\",\"关联Id\",\"成员\",\"项目\",\"商家\"\n"+
+		"\"支出\",\"2024-09-01 12:34:56\",\"Test Category\",\"Test Account\",\"123.45\",\"\",\"\",\"test1\",\"test2\",\"test3\""), 0, converter.DefaultImporterOptions, nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, 0, len(allNewTransactions[0].OriginalTagNames))
+
+	allNewTransactions, _, _, _, _, _, err = importer.ParseImportedData(context, user, []byte("随手记导出文件(headers:v5;xxxxx)\n"+
+		"\"交易类型\",\"日期\",\"子类别\",\"账户\",\"金额\",\"备注\",\"关联Id\",\"成员\",\"项目\",\"商家\"\n"+
+		"\"支出\",\"2024-09-01 12:34:56\",\"Test Category\",\"Test Account\",\"123.45\",\"\",\"\",\"test1\",\"test2\",\"test3\""), 0, converter.DefaultImporterOptions.WithMemberAsTag().WithProjectAsTag().WithMerchantAsTag(), nil, nil, nil, nil, nil)
+
+	assert.Nil(t, err)
+	assert.Equal(t, 1, len(allNewTransactions))
+	assert.Equal(t, 3, len(allNewTransactions[0].OriginalTagNames))
+	assert.Contains(t, allNewTransactions[0].OriginalTagNames, "test1")
+	assert.Contains(t, allNewTransactions[0].OriginalTagNames, "test2")
+	assert.Contains(t, allNewTransactions[0].OriginalTagNames, "test3")
+}
+
 func TestFeideeMymoneyCsvFileImporterParseImportedData_InvalidRelatedId(t *testing.T) {
 	importer := FeideeMymoneyAppTransactionDataCsvFileImporter
 	context := core.NewNullContext()

pkg/converters/feidee/feidee_mymoney_elecloud_transaction_data_xlsx_file_importer.go

@@ -18,6 +18,9 @@ var feideeMymoneyElecloudDataColumnNameMapping = map[datatable.TransactionDataTa
 	datatable.TRANSACTION_DATA_TABLE_AMOUNT:               "金额",
 	datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME: "账户2",
 	datatable.TRANSACTION_DATA_TABLE_DESCRIPTION:          "备注",
+	datatable.TRANSACTION_DATA_TABLE_MEMBER:               "成员",
+	datatable.TRANSACTION_DATA_TABLE_PROJECT:              "项目",
+	datatable.TRANSACTION_DATA_TABLE_MERCHANT:             "商家",
 }
 
 // feideeMymoneyElecloudTransactionDataXlsxFileImporter defines the structure of feidee mymoney (elecloud) xlsx importer for transaction data

pkg/converters/feidee/feidee_mymoney_web_transaction_data_xls_file_importer.go

@@ -17,6 +17,9 @@ var feideeMymoneyWebDataColumnNameMapping = map[datatable.TransactionDataTableCo
 	datatable.TRANSACTION_DATA_TABLE_AMOUNT:               "金额",
 	datatable.TRANSACTION_DATA_TABLE_RELATED_ACCOUNT_NAME: "账户2",
 	datatable.TRANSACTION_DATA_TABLE_DESCRIPTION:          "备注",
+	datatable.TRANSACTION_DATA_TABLE_MEMBER:               "成员",
+	datatable.TRANSACTION_DATA_TABLE_PROJECT:              "项目",
+	datatable.TRANSACTION_DATA_TABLE_MERCHANT:             "商家",
 }
 
 // feideeMymoneyWebTransactionDataXlsFileImporter defines the structure of feidee mymoney (web) xls importer for transaction data