stuzer05/monobank-firefly3-bot
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Activity

Fix ATM transfer between accounts support

Browse Source
This commit is contained in:
Illya Marchenko 2024-04-03 21:55:53 +03:00
parent 876edee3a7
commit 37e1445f3f
Signed by: stuzer05
GPG Key ID: A6ABAAA9268F9F4F
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config.go
View File

@ -12,8 +12,7 @@ type Config struct {
} }
type ConfigAccount struct { type ConfigAccount struct {
Name string `json:"name"` Firefly3Name string `json:"firefly3_name,omitempty"`
Firefly3Id string `json:"firefly3_id,omitempty"`
MonobankId string `json:"monobank_id,omitempty"` MonobankId string `json:"monobank_id,omitempty"`
} }
@ -57,16 +56,6 @@ func ReadConfig(path string) (Config, error) {
return config, nil return config, nil
} }
func ConfigGetAccountByName(config Config, q string) ConfigAccount {
for _, row := range config.Accounts {
if row.Name == q {
return row
}
}
return ConfigAccount{}
}
func ConfigGetAccountByMonobankId(config Config, q string) ConfigAccount { func ConfigGetAccountByMonobankId(config Config, q string) ConfigAccount {
for _, row := range config.Accounts { for _, row := range config.Accounts {
if row.MonobankId == q { if row.MonobankId == q {

9
webhook.go
View File

@ -4,6 +4,7 @@ import (
"bytes" "bytes"
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"github.com/antihax/optional" "github.com/antihax/optional"
"main/firefly3" "main/firefly3"
monobank "main/monobank/api/webhook/models" monobank "main/monobank/api/webhook/models"
@ -52,7 +53,7 @@ func handleWebhook(w http.ResponseWriter, r *http.Request) {
account := ConfigGetAccountByMonobankId(config, monobankTransaction.Data.Account) account := ConfigGetAccountByMonobankId(config, monobankTransaction.Data.Account)
// cancel if one of account ids is empty // cancel if one of account ids is empty
if len(account.Firefly3Id) == 0 || len(account.MonobankId) == 0 { if len(account.Firefly3Name) == 0 || len(account.MonobankId) == 0 {
LogString("cannot find firefly3 or monobank ids (" + monobankTransaction.Data.Account + ")") LogString("cannot find firefly3 or monobank ids (" + monobankTransaction.Data.Account + ")")
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
return return
@ -129,7 +130,7 @@ func handleWebhook(w http.ResponseWriter, r *http.Request) {
Date: time.Unix(int64(monobankTransaction.Data.StatementItem.Time), 0).Add(time.Hour * 2), Date: time.Unix(int64(monobankTransaction.Data.StatementItem.Time), 0).Add(time.Hour * 2),
Notes: string(monobankTransactionJson), Notes: string(monobankTransactionJson),
Amount: strconv.Itoa(int(math.Abs(math.Round(float64(monobankTransaction.Data.StatementItem.Amount/100)))) - int(math.Abs(math.Round(float64(monobankTransaction.Data.StatementItem.CommissionRate/100))))), Amount: strconv.Itoa(int(math.Abs(math.Round(float64(monobankTransaction.Data.StatementItem.Amount/100)))) - int(math.Abs(math.Round(float64(monobankTransaction.Data.StatementItem.CommissionRate/100))))),
SourceId: account.Firefly3Id, SourceName: account.Firefly3Name,
} }
// check max sum // check max sum
@ -172,7 +173,7 @@ func handleWebhook(w http.ResponseWriter, r *http.Request) {
Notes: string(monobankTransactionJson), Notes: string(monobankTransactionJson),
Description: "Transfer fee", Description: "Transfer fee",
Amount: strconv.Itoa(int(math.Abs(math.Round(float64(monobankTransaction.Data.StatementItem.CommissionRate / 100))))), Amount: strconv.Itoa(int(math.Abs(math.Round(float64(monobankTransaction.Data.StatementItem.CommissionRate / 100))))),
SourceId: account.Firefly3Id, SourceName: account.Firefly3Name,
}) })
} }
@ -186,7 +187,7 @@ func handleWebhook(w http.ResponseWriter, r *http.Request) {
Transactions: []firefly3.TransactionSplitStore{transaction}, Transactions: []firefly3.TransactionSplitStore{transaction},
}, &transactionOpts) }, &transactionOpts)
if err != nil { if err != nil {
LogString(err.Error()) fmt.Printf(err.Error())
w.WriteHeader(http.StatusOK) w.WriteHeader(http.StatusOK)
return return
} }