aclindsa/moneygo
1
0
Fork 0
mirror of https://github.com/aclindsa/moneygo.git synced 2024-12-26 15:42:27 -05:00
Code Issues Releases Wiki Activity

OFX imports: Properly import 'trading' transaction splits

Browse Source
This commit is contained in:
Aaron Lindsay 2017-09-20 21:30:17 -04:00
parent 698d74d727
commit d0d6ea3a78
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
accounts.go
View File

@ -201,7 +201,7 @@ func GetTradingAccount(transaction *gorp.Transaction, userid int64, securityid i
return nil, err return nil, err
} }
security, err := GetSecurity(securityid, userid) security, err := GetSecurityTx(transaction, securityid, userid)
if err != nil { if err != nil {
return nil, err return nil, err
} }

31
imports.go
View File

@ -120,8 +120,21 @@ func ofxImportHelper(r io.Reader, w http.ResponseWriter, user *User, accountid i
split.AccountId = account.AccountId split.AccountId = account.AccountId
} else if split.SecurityId != -1 { } else if split.SecurityId != -1 {
if sec, ok := securitymap[split.SecurityId]; ok { if sec, ok := securitymap[split.SecurityId]; ok {
split.SecurityId = sec.SecurityId
// TODO try to auto-match splits to existing accounts based on past transactions that look like this one // TODO try to auto-match splits to existing accounts based on past transactions that look like this one
if split.ImportSplitType == TradingAccount {
// Find/make trading account if we're that type of split
trading_account, err := GetTradingAccount(sqltransaction, user.UserId, sec.SecurityId)
if err != nil {
sqltransaction.Rollback()
WriteError(w, 999 /*Internal Error*/)
log.Print("Couldn't find split's SecurityId in map during OFX import")
return
}
split.AccountId = trading_account.AccountId
split.SecurityId = -1
} else {
split.SecurityId = sec.SecurityId
}
} else { } else {
sqltransaction.Rollback() sqltransaction.Rollback()
WriteError(w, 999 /*Internal Error*/) WriteError(w, 999 /*Internal Error*/)
@ -146,23 +159,9 @@ func ofxImportHelper(r io.Reader, w http.ResponseWriter, user *User, accountid i
// Fixup any imbalances in transactions // Fixup any imbalances in transactions
var zero big.Rat var zero big.Rat
var num_imbalances int
for _, imbalance := range imbalances {
if imbalance.Cmp(&zero) != 0 {
num_imbalances += 1
}
}
for imbalanced_security, imbalance := range imbalances { for imbalanced_security, imbalance := range imbalances {
if imbalance.Cmp(&zero) != 0 { if imbalance.Cmp(&zero) != 0 {
var imbalanced_account *Account imbalanced_account, err := GetImbalanceAccount(sqltransaction, user.UserId, imbalanced_security)
// If we're dealing with exactly two securities, assume any imbalances
// from imports are from trading currencies/securities
if num_imbalances == 2 {
imbalanced_account, err = GetTradingAccount(sqltransaction, user.UserId, imbalanced_security)
} else {
imbalanced_account, err = GetImbalanceAccount(sqltransaction, user.UserId, imbalanced_security)
}
if err != nil { if err != nil {
sqltransaction.Rollback() sqltransaction.Rollback()
WriteError(w, 999 /*Internal Error*/) WriteError(w, 999 /*Internal Error*/)

5
transactions.go
View File

@ -26,8 +26,8 @@ const (
// Split.ImportSplitType // Split.ImportSplitType
const ( const (
Default int64 = 0 Default int64 = 0
ImportAccount = 1 ImportAccount = 1 // This split belongs to the main account being imported
SubAccount = 2 SubAccount = 2 // This split belongs to a sub-account of that being imported
ExternalAccount = 3 ExternalAccount = 3
TradingAccount = 4 TradingAccount = 4
Commission = 5 Commission = 5
@ -35,6 +35,7 @@ const (
Fees = 7 Fees = 7
Load = 8 Load = 8
IncomeAccount = 9 IncomeAccount = 9
ExpenseAccount = 10
) )
type Split struct { type Split struct {