Merge pull request #36 from darcys22/dev

Dev

godbledger/cmd/config.go

@@ -150,7 +150,7 @@ func initConfig(ctx *cli.Context) error {
 	config := defaultLedgerConfig
 	if ctx.Bool("mysql") {
 		config.DatabaseType = "mysql"
-		config.DatabaseLocation = "godbledger:password@tcp(127.0.0.1:3306)/ledger?charset=utf8"
+		config.DatabaseLocation = "godbledger:password@tcp(127.0.0.1:3306)/ledger"
 	}
 
 	if len(ctx.Args().Get(0)) > 0 {

godbledger/core/transactions.go

@@ -56,6 +56,20 @@ func NewTransaction(usr *User) (*Transaction, error) {
 	return txn, nil
 }
 
+func ReverseTransaction(originalTxn *Transaction, usr *User) (*Transaction, error) {
+	guid := xid.New()
+	txn := &Transaction{guid.String(), time.Now(), usr, []byte{}, []*Split{}}
+
+	for _, split := range originalTxn.Splits {
+		newSplt, err := NewSplit(split.Date, split.Description, split.Accounts, split.Currency, big.NewInt(0).Mul(big.NewInt(-1), split.Amount))
+		if err != nil {
+			return nil, err
+		}
+		txn.AppendSplit(newSplt)
+	}
+	return txn, nil
+}
+
 func (txn *Transaction) AppendSplit(spl *Split) error {
 	txn.Splits = append(txn.Splits, spl)
 	return nil

godbledger/core/trialbalance.go

@@ -3,7 +3,9 @@ package core
 import ()
 
 type TBAccount struct {
-	Account string   `json:"Account"`
-	Amount  int      `json:"Amount"`
-	Tags    []string `json:"Tags"`
+	Account  string   `json:"Account"`
+	Amount   int      `json:"Amount"`
+	Tags     []string `json:"Tags"`
+	Currency string   `json:"Currency"`
+	Decimals int      `json:"Decimals"`
 }

godbledger/db/database.go

@@ -10,17 +10,22 @@ import (
 type Database interface {
 	InitDB() error
 	Close() error
-	AddTransaction(txn *core.Transaction) error
+	AddTransaction(txn *core.Transaction) (string, error)
+	FindTransaction(txnID string) (*core.Transaction, error)
 	DeleteTransaction(txnID string) error
 	FindTag(tag string) (int, error)
 	AddTag(tag string) error
 	SafeAddTag(tag string) error
 	SafeAddTagToAccount(account, tag string) error
 	AddTagToAccount(accountID string, tag int) error
 	DeleteTagFromAccount(account, tag string) error
+	SafeAddTagToTransaction(txnID, tag string) error
+	AddTagToTransaction(txnID string, tag int) error
+	DeleteTagFromTransaction(txnID, tag string) error
 	FindCurrency(cur string) (*core.Currency, error)
 	AddCurrency(cur *core.Currency) error
 	SafeAddCurrency(cur *core.Currency) error
+	DeleteCurrency(currency string) error
 	FindAccount(code string) (*core.Account, error)
 	AddAccount(*core.Account) error
 	SafeAddAccount(*core.Account) error

godbledger/db/mysql/mysqldb.go

@@ -21,22 +21,25 @@ func (db *Database) Close() error {
 }
 
 func DSN(DB_USER, DB_PASS, DB_HOST, DB_NAME string) string {
-	return DB_USER + ":" + DB_PASS + "@" + DB_HOST + "/" + DB_NAME + "?charset=utf8"
+	return DB_USER + ":" + DB_PASS + "@" + DB_HOST + "/" + DB_NAME + "?charset=utf8&parseTime=true"
 	//return DB_USER + ":" + DB_PASS + "@" + DB_HOST + "/"
 }
 
-// NewDB initializes a new DB.
-//TODO(Sean): this should actually use the connection_string rather than hardcoded
-func NewDB(connection_string string) (*Database, error) {
+func ValidateConnectionString(connection_string string) string {
 	//if connection_string == "" {
 	//DB_HOST := "tcp(127.0.0.1:3306)"
 	//DB_NAME := "ledger"
 	//DB_USER := "godbledger"
 	//DB_PASS := "password"
 	//connection_string = DSN(DB_USER, DB_PASS, DB_HOST, DB_NAME)
 	//}
+	return connection_string + "?charset=utf8&parseTime=true"
+}
+
+// NewDB initializes a new DB.
+func NewDB(connection_string string) (*Database, error) {
 	log.Debug(connection_string)
-	MySQLDB, err := sql.Open("mysql", connection_string)
+	MySQLDB, err := sql.Open("mysql", ValidateConnectionString(connection_string))
 	if err != nil {
 		log.Fatal(err.Error)
 		return nil, err
@@ -60,7 +63,7 @@ func (db *Database) InitDB() error {
 	log.Debug("Query: " + createDB)
 	_, err := db.DB.Exec(createDB)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Creating users table failed: %s", err)
 	}
 
 	//ACCOUNTS
@@ -73,7 +76,7 @@ func (db *Database) InitDB() error {
 	log.Debug("Query: " + createDB)
 	_, err = db.DB.Exec(createDB)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Creating accounts table failed: %s", err)
 	}
 
 	//TAGS
@@ -85,7 +88,7 @@ func (db *Database) InitDB() error {
 	log.Debug("Query: " + createDB)
 	_, err = db.DB.Exec(createDB)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Creating tags table failed: %s", err)
 	}
 
 	//TAGS FOR ACCOUNTS
@@ -100,7 +103,7 @@ func (db *Database) InitDB() error {
 	log.Debug("Query: " + createDB)
 	_, err = db.DB.Exec(createDB)
 	if err != nil {
-		log.Fatal(err)
+		log.Fatalf("Creating Account_Tag table failed: %s", err)
 	}
 
 	//CURRENCIES
@@ -122,7 +125,9 @@ func (db *Database) InitDB() error {
 		transaction_id VARCHAR(255) NOT NULL,
 		postdate DATETIME NOT NULL,
 		brief VARCHAR(255),
-		PRIMARY KEY(transaction_id)
+		poster_user_id VARCHAR(255),
+		PRIMARY KEY(transaction_id),
+    FOREIGN KEY (poster_user_id) REFERENCES users (user_id) ON DELETE RESTRICT
 	);`
 	log.Debug("Query: " + createDB)
 	_, err = db.DB.Exec(createDB)
@@ -143,6 +148,21 @@ func (db *Database) InitDB() error {
 		log.Fatal(err)
 	}
 
+	//TAGS FOR Transactions
+	createDB = `
+	CREATE TABLE IF NOT EXISTS transaction_tag (
+    transaction_id VARCHAR(255) NOT NULL,
+    tag_id INTEGER NOT NULL,
+    FOREIGN KEY (transaction_id) REFERENCES transactions (transaction_id) ON DELETE RESTRICT ON UPDATE CASCADE,
+    FOREIGN KEY (tag_id) REFERENCES tags (tag_id) ON DELETE RESTRICT ON UPDATE CASCADE,
+    PRIMARY KEY (transaction_id, tag_id)
+	);`
+	log.Debug("Query: " + createDB)
+	_, err = db.DB.Exec(createDB)
+	if err != nil {
+		log.Fatalf("Creating Transaction_Tag table failed: %s", err)
+	}
+
 	//LINE ITEMS FOR TRANSACTIONS (SPLITS)
 	createDB = `
 	CREATE TABLE IF NOT EXISTS splits (