zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add more conditions for sorting of ImportTransaction

Browse Source
This commit is contained in:
MaysWind
2024-09-17 19:40:08 +08:00
parent 18ebf7baaf
commit 03f3e039e0
2 changed files with 360 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/models/imported_transaction.go
+25 -1
View File
@@ -102,7 +102,31 @@ func (s ImportedTransactionSlice) Less(i, j int) bool {
}
}
return s[i].TransactionTime < s[j].TransactionTime
if s[i].TransactionTime != s[j].TransactionTime {
return s[i].TransactionTime < s[j].TransactionTime
}
if s[i].Type != s[j].Type {
return s[i].Type < s[j].Type
}
if s[i].OriginalCategoryName != s[j].OriginalCategoryName {
return s[i].OriginalCategoryName < s[j].OriginalCategoryName
}
if s[i].OriginalSourceAccountName != s[j].OriginalSourceAccountName {
return s[i].OriginalSourceAccountName < s[j].OriginalSourceAccountName
}
if s[i].Amount != s[j].Amount {
return s[i].Amount < s[j].Amount
}
if s[i].Comment != s[j].Comment {
return s[i].Comment < s[j].Comment
}
return false
}
// ToTransactionsList returns a list of transaction models
pkg/models/imported_transaction_test.go
+335 -1
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert"
)
func TestImportTransactionSliceLess(t *testing.T) {
func TestImportTransactionSliceLess_NoSameTransactionTime(t *testing.T) {
var transactionSlice ImportedTransactionSlice
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
@@ -61,3 +61,337 @@ func TestImportTransactionSliceLess(t *testing.T) {
assert.Equal(t, int64(4), transactionSlice[4].TransactionId)
assert.Equal(t, int64(6), transactionSlice[5].TransactionId)
}
func TestImportTransactionSliceLess_SameTransactionTime(t *testing.T) {
var transactionSlice ImportedTransactionSlice
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 1,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 2,
Type: TRANSACTION_DB_TYPE_INCOME,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 3,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 4,
Type: TRANSACTION_DB_TYPE_TRANSFER_IN,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 5,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 6,
Type: TRANSACTION_DB_TYPE_TRANSFER_OUT,
TransactionTime: 1,
},
})
sort.Sort(transactionSlice)
assert.Equal(t, int64(3), transactionSlice[0].TransactionId)
assert.Equal(t, int64(5), transactionSlice[1].TransactionId)
assert.Equal(t, int64(2), transactionSlice[2].TransactionId)
assert.Equal(t, int64(1), transactionSlice[3].TransactionId)
assert.Equal(t, int64(6), transactionSlice[4].TransactionId)
assert.Equal(t, int64(4), transactionSlice[5].TransactionId)
}
func TestImportTransactionSliceLess_SameTransactionTimeAndSameType(t *testing.T) {
var transactionSlice ImportedTransactionSlice
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 1,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
OriginalCategoryName: "3",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 2,
Type: TRANSACTION_DB_TYPE_INCOME,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 3,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 4,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
OriginalCategoryName: "1",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 5,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 6,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
OriginalCategoryName: "2",
})
sort.Sort(transactionSlice)
assert.Equal(t, int64(3), transactionSlice[0].TransactionId)
assert.Equal(t, int64(5), transactionSlice[1].TransactionId)
assert.Equal(t, int64(2), transactionSlice[2].TransactionId)
assert.Equal(t, int64(4), transactionSlice[3].TransactionId)
assert.Equal(t, int64(6), transactionSlice[4].TransactionId)
assert.Equal(t, int64(1), transactionSlice[5].TransactionId)
}
func TestImportTransactionSliceLess_SameTransactionTimeSameTypeAndSameSubCategoryName(t *testing.T) {
var transactionSlice ImportedTransactionSlice
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 1,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "b",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 2,
Type: TRANSACTION_DB_TYPE_INCOME,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 3,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 4,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "c",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 5,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 6,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "a",
})
sort.Sort(transactionSlice)
assert.Equal(t, int64(3), transactionSlice[0].TransactionId)
assert.Equal(t, int64(5), transactionSlice[1].TransactionId)
assert.Equal(t, int64(2), transactionSlice[2].TransactionId)
assert.Equal(t, int64(6), transactionSlice[3].TransactionId)
assert.Equal(t, int64(1), transactionSlice[4].TransactionId)
assert.Equal(t, int64(4), transactionSlice[5].TransactionId)
}
func TestImportTransactionSliceLess_SameTransactionTimeSameTypeSameSubCategoryNameAndSameAccountName(t *testing.T) {
var transactionSlice ImportedTransactionSlice
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 1,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
Amount: 3,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "a",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 2,
Type: TRANSACTION_DB_TYPE_INCOME,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 3,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 4,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
Amount: 2,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "a",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 5,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 1,
},
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 6,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
Amount: 1,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "a",
})
sort.Sort(transactionSlice)
assert.Equal(t, int64(3), transactionSlice[0].TransactionId)
assert.Equal(t, int64(5), transactionSlice[1].TransactionId)
assert.Equal(t, int64(2), transactionSlice[2].TransactionId)
assert.Equal(t, int64(6), transactionSlice[3].TransactionId)
assert.Equal(t, int64(4), transactionSlice[4].TransactionId)
assert.Equal(t, int64(1), transactionSlice[5].TransactionId)
}
func TestImportTransactionSliceLess_SameTransactionTimeSameTypeSameSubCategoryNameSameAccountNameAndSameAmount(t *testing.T) {
var transactionSlice ImportedTransactionSlice
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 1,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 2,
Amount: 3,
Comment: "2",
},
OriginalCategoryName: "2",
OriginalSourceAccountName: "b",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 2,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 2,
Amount: 7,
},
OriginalCategoryName: "2",
OriginalSourceAccountName: "a",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 3,
Type: TRANSACTION_DB_TYPE_MODIFY_BALANCE,
TransactionTime: 8,
},
OriginalCategoryName: "9",
OriginalSourceAccountName: "x",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 4,
Type: TRANSACTION_DB_TYPE_INCOME,
TransactionTime: 2,
Amount: 6,
},
OriginalCategoryName: "7",
OriginalSourceAccountName: "z",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 5,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 2,
Amount: 3,
Comment: "1",
},
OriginalCategoryName: "2",
OriginalSourceAccountName: "b",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 6,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 2,
Amount: 1,
},
OriginalCategoryName: "2",
OriginalSourceAccountName: "b",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 7,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 2,
Amount: 6,
},
OriginalCategoryName: "1",
OriginalSourceAccountName: "b",
})
transactionSlice = append(transactionSlice, &ImportTransaction{
Transaction: &Transaction{
TransactionId: 8,
Type: TRANSACTION_DB_TYPE_EXPENSE,
TransactionTime: 1,
Amount: 9,
},
OriginalCategoryName: "9",
OriginalSourceAccountName: "y",
})
sort.Sort(transactionSlice)
assert.Equal(t, int64(3), transactionSlice[0].TransactionId)
assert.Equal(t, int64(8), transactionSlice[1].TransactionId)
assert.Equal(t, int64(4), transactionSlice[2].TransactionId)
assert.Equal(t, int64(7), transactionSlice[3].TransactionId)
assert.Equal(t, int64(2), transactionSlice[4].TransactionId)
assert.Equal(t, int64(6), transactionSlice[5].TransactionId)
assert.Equal(t, int64(5), transactionSlice[6].TransactionId)
assert.Equal(t, int64(1), transactionSlice[7].TransactionId)
}