diff --git a/core/api/org.go b/core/api/org.go index 75facc9..36cde51 100644 --- a/core/api/org.go +++ b/core/api/org.go @@ -54,39 +54,39 @@ func GetOrg(w rest.ResponseWriter, r *rest.Request) { } /** - * @api {get} /orgs Get a User's Orgs - * @apiVersion 1.4.0 - * @apiName GetOrgs - * @apiGroup Org - * - * @apiHeader {String} Authorization HTTP Basic Auth - * @apiHeader {String} Accept-Version ^1.4.0 semver versioning - * - * @apiSuccess {String} id Id of the Org. - * @apiSuccess {Date} inserted Date Org was created - * @apiSuccess {Date} updated Date Org was updated - * @apiSuccess {String} name Name of the Org. - * @apiSuccess {String} currency Three letter currency code. - * @apiSuccess {Number} precision How many digits the currency goes out to. - @apiSuccess {String} timezone Timezone to use for accounting. - * - * @apiSuccessExample Success-Response: - * HTTP/1.1 200 OK - * [ - * { - * "id": "11111111111111111111111111111111", - * "inserted": "2018-09-11T18:05:04.420Z", - * "updated": "2018-09-11T18:05:04.420Z", - * "name": "MyOrg", - * "currency": "USD", - * "precision": 2, - * "timezone": "America/New_York" - * } - * ] - * - * @apiUse NotAuthorizedError - * @apiUse InternalServerError - */ +* @api {get} /orgs Get a User's Orgs +* @apiVersion 1.4.0 +* @apiName GetOrgs +* @apiGroup Org +* +* @apiHeader {String} Authorization HTTP Basic Auth +* @apiHeader {String} Accept-Version ^1.4.0 semver versioning +* +* @apiSuccess {String} id Id of the Org. +* @apiSuccess {Date} inserted Date Org was created +* @apiSuccess {Date} updated Date Org was updated +* @apiSuccess {String} name Name of the Org. +* @apiSuccess {String} currency Three letter currency code. +* @apiSuccess {Number} precision How many digits the currency goes out to. +@apiSuccess {String} timezone Timezone to use for accounting. +* +* @apiSuccessExample Success-Response: +* HTTP/1.1 200 OK +* [ +* { +* "id": "11111111111111111111111111111111", +* "inserted": "2018-09-11T18:05:04.420Z", +* "updated": "2018-09-11T18:05:04.420Z", +* "name": "MyOrg", +* "currency": "USD", +* "precision": 2, +* "timezone": "America/New_York" +* } +* ] +* +* @apiUse NotAuthorizedError +* @apiUse InternalServerError +*/ func GetOrgs(w rest.ResponseWriter, r *rest.Request) { user := r.Env["USER"].(*types.User) diff --git a/core/auth/auth.go b/core/auth/auth.go index 4849a31..68a49a0 100644 --- a/core/auth/auth.go +++ b/core/auth/auth.go @@ -105,4 +105,4 @@ func (auth *AuthService) AuthenticateEmailVerifyCode(code string) (*types.User, } return u, nil -} \ No newline at end of file +} diff --git a/core/model/db/budget.go b/core/model/db/budget.go index af85f6c..e34cadc 100644 --- a/core/model/db/budget.go +++ b/core/model/db/budget.go @@ -77,17 +77,17 @@ func (db *DB) InsertAndReplaceBudget(budget *types.Budget) (err error) { } }() - // delete previous budget - query1 := "DELETE FROM budgetitem WHERE orgId = UNHEX(?)" + // delete previous budget + query1 := "DELETE FROM budgetitem WHERE orgId = UNHEX(?)" - _, err = dbTx.Exec( - query1, - budget.OrgId, - ) - - if err != nil { - return - } + _, err = dbTx.Exec( + query1, + budget.OrgId, + ) + + if err != nil { + return + } // save items for _, item := range budget.Items { @@ -114,4 +114,4 @@ func (db *DB) DeleteBudget(orgId string) error { _, err := db.Exec(query, orgId) return err -} \ No newline at end of file +} diff --git a/core/model/types/budget.go b/core/model/types/budget.go index d8ac0b7..398d09b 100644 --- a/core/model/types/budget.go +++ b/core/model/types/budget.go @@ -5,13 +5,13 @@ import ( ) type Budget struct { - OrgId string `json:"orgId"` - Inserted time.Time `json:"inserted"` - Items []*BudgetItem `json:"items"` + OrgId string `json:"orgId"` + Inserted time.Time `json:"inserted"` + Items []*BudgetItem `json:"items"` } type BudgetItem struct { - OrgId string `json:"-"` - AccountId string `json:"accountId"` - Amount int64 `json:"amount"` + OrgId string `json:"-"` + AccountId string `json:"accountId"` + Amount int64 `json:"amount"` } diff --git a/migrations/migrate1.go b/migrations/migrate1.go index a5be973..d5bd796 100644 --- a/migrations/migrate1.go +++ b/migrations/migrate1.go @@ -1,105 +1,105 @@ package main import ( - "encoding/json" - "github.com/openaccounting/oa-server/core/model/db" - "github.com/openaccounting/oa-server/core/model/types" - "log" - "os" + "encoding/json" + "github.com/openaccounting/oa-server/core/model/db" + "github.com/openaccounting/oa-server/core/model/types" + "log" + "os" ) func main() { - if len(os.Args) != 2 { - log.Fatal("Usage: migrate1.go ") - } + if len(os.Args) != 2 { + log.Fatal("Usage: migrate1.go ") + } - command := os.Args[1] + command := os.Args[1] - if command != "upgrade" && command != "downgrade" { - log.Fatal("Usage: migrate1.go ") - } + if command != "upgrade" && command != "downgrade" { + log.Fatal("Usage: migrate1.go ") + } - //filename is the path to the json config file - var config types.Config - file, err := os.Open("./config.json") + //filename is the path to the json config file + var config types.Config + file, err := os.Open("./config.json") - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - decoder := json.NewDecoder(file) - err = decoder.Decode(&config) + decoder := json.NewDecoder(file) + err = decoder.Decode(&config) - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - connectionString := config.User + ":" + config.Password + "@/" + config.Database - db, err := db.NewDB(connectionString) + connectionString := config.User + ":" + config.Password + "@/" + config.Database + db, err := db.NewDB(connectionString) - if command == "upgrade" { - err = upgrade(db) - } else { - err = downgrade(db) - } + if command == "upgrade" { + err = upgrade(db) + } else { + err = downgrade(db) + } - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - log.Println("done") + log.Println("done") } func upgrade(db *db.DB) (err error) { - tx, err := db.Begin() + tx, err := db.Begin() - if err != nil { - return - } + if err != nil { + return + } - defer func() { - if p := recover(); p != nil { - tx.Rollback() - panic(p) // re-throw panic after Rollback - } else if err != nil { - tx.Rollback() - } else { - err = tx.Commit() - } - }() + defer func() { + if p := recover(); p != nil { + tx.Rollback() + panic(p) // re-throw panic after Rollback + } else if err != nil { + tx.Rollback() + } else { + err = tx.Commit() + } + }() - query1 := "ALTER TABLE user ADD COLUMN signupSource VARCHAR(100) NOT NULL AFTER emailVerifyCode" + query1 := "ALTER TABLE user ADD COLUMN signupSource VARCHAR(100) NOT NULL AFTER emailVerifyCode" - if _, err = tx.Exec(query1); err != nil { - return - } + if _, err = tx.Exec(query1); err != nil { + return + } - return + return } func downgrade(db *db.DB) (err error) { - tx, err := db.Begin() + tx, err := db.Begin() - if err != nil { - return - } + if err != nil { + return + } - defer func() { - if p := recover(); p != nil { - tx.Rollback() - panic(p) // re-throw panic after Rollback - } else if err != nil { - tx.Rollback() - } else { - err = tx.Commit() - } - }() + defer func() { + if p := recover(); p != nil { + tx.Rollback() + panic(p) // re-throw panic after Rollback + } else if err != nil { + tx.Rollback() + } else { + err = tx.Commit() + } + }() - query1 := "ALTER TABLE user DROP COLUMN signupSource" + query1 := "ALTER TABLE user DROP COLUMN signupSource" - if _, err = tx.Exec(query1); err != nil { - return - } + if _, err = tx.Exec(query1); err != nil { + return + } - return + return } diff --git a/migrations/migrate2.go b/migrations/migrate2.go index 87f28d9..5a09364 100644 --- a/migrations/migrate2.go +++ b/migrations/migrate2.go @@ -1,105 +1,105 @@ package main import ( - "encoding/json" - "github.com/openaccounting/oa-server/core/model/db" - "github.com/openaccounting/oa-server/core/model/types" - "log" - "os" + "encoding/json" + "github.com/openaccounting/oa-server/core/model/db" + "github.com/openaccounting/oa-server/core/model/types" + "log" + "os" ) func main() { - if len(os.Args) != 2 { - log.Fatal("Usage: migrate2.go ") - } + if len(os.Args) != 2 { + log.Fatal("Usage: migrate2.go ") + } - command := os.Args[1] + command := os.Args[1] - if command != "upgrade" && command != "downgrade" { - log.Fatal("Usage: migrate2.go ") - } + if command != "upgrade" && command != "downgrade" { + log.Fatal("Usage: migrate2.go ") + } - //filename is the path to the json config file - var config types.Config - file, err := os.Open("./config.json") + //filename is the path to the json config file + var config types.Config + file, err := os.Open("./config.json") - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - decoder := json.NewDecoder(file) - err = decoder.Decode(&config) + decoder := json.NewDecoder(file) + err = decoder.Decode(&config) - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - connectionString := config.User + ":" + config.Password + "@/" + config.Database - db, err := db.NewDB(connectionString) + connectionString := config.User + ":" + config.Password + "@/" + config.Database + db, err := db.NewDB(connectionString) - if command == "upgrade" { - err = upgrade(db) - } else { - err = downgrade(db) - } + if command == "upgrade" { + err = upgrade(db) + } else { + err = downgrade(db) + } - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - log.Println("done") + log.Println("done") } func upgrade(db *db.DB) (err error) { - tx, err := db.Begin() + tx, err := db.Begin() - if err != nil { - return - } + if err != nil { + return + } - defer func() { - if p := recover(); p != nil { - tx.Rollback() - panic(p) // re-throw panic after Rollback - } else if err != nil { - tx.Rollback() - } else { - err = tx.Commit() - } - }() + defer func() { + if p := recover(); p != nil { + tx.Rollback() + panic(p) // re-throw panic after Rollback + } else if err != nil { + tx.Rollback() + } else { + err = tx.Commit() + } + }() - query1 := "ALTER TABLE org ADD COLUMN timezone VARCHAR(100) NOT NULL AFTER `precision`" + query1 := "ALTER TABLE org ADD COLUMN timezone VARCHAR(100) NOT NULL AFTER `precision`" - if _, err = tx.Exec(query1); err != nil { - return - } + if _, err = tx.Exec(query1); err != nil { + return + } - return + return } func downgrade(db *db.DB) (err error) { - tx, err := db.Begin() + tx, err := db.Begin() - if err != nil { - return - } + if err != nil { + return + } - defer func() { - if p := recover(); p != nil { - tx.Rollback() - panic(p) // re-throw panic after Rollback - } else if err != nil { - tx.Rollback() - } else { - err = tx.Commit() - } - }() + defer func() { + if p := recover(); p != nil { + tx.Rollback() + panic(p) // re-throw panic after Rollback + } else if err != nil { + tx.Rollback() + } else { + err = tx.Commit() + } + }() - query1 := "ALTER TABLE org DROP COLUMN timezone" + query1 := "ALTER TABLE org DROP COLUMN timezone" - if _, err = tx.Exec(query1); err != nil { - return - } + if _, err = tx.Exec(query1); err != nil { + return + } - return + return } diff --git a/migrations/migrate3.go b/migrations/migrate3.go index c7cf43a..608e1f9 100644 --- a/migrations/migrate3.go +++ b/migrations/migrate3.go @@ -1,105 +1,105 @@ package main import ( - "encoding/json" - "github.com/openaccounting/oa-server/core/model/db" - "github.com/openaccounting/oa-server/core/model/types" - "log" - "os" + "encoding/json" + "github.com/openaccounting/oa-server/core/model/db" + "github.com/openaccounting/oa-server/core/model/types" + "log" + "os" ) func main() { - if len(os.Args) != 2 { - log.Fatal("Usage: migrate3.go ") - } + if len(os.Args) != 2 { + log.Fatal("Usage: migrate3.go ") + } - command := os.Args[1] + command := os.Args[1] - if command != "upgrade" && command != "downgrade" { - log.Fatal("Usage: migrate3.go ") - } + if command != "upgrade" && command != "downgrade" { + log.Fatal("Usage: migrate3.go ") + } - //filename is the path to the json config file - var config types.Config - file, err := os.Open("./config.json") + //filename is the path to the json config file + var config types.Config + file, err := os.Open("./config.json") - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - decoder := json.NewDecoder(file) - err = decoder.Decode(&config) + decoder := json.NewDecoder(file) + err = decoder.Decode(&config) - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - connectionString := config.User + ":" + config.Password + "@/" + config.Database - db, err := db.NewDB(connectionString) + connectionString := config.User + ":" + config.Password + "@/" + config.Database + db, err := db.NewDB(connectionString) - if command == "upgrade" { - err = upgrade(db) - } else { - err = downgrade(db) - } + if command == "upgrade" { + err = upgrade(db) + } else { + err = downgrade(db) + } - if err != nil { - log.Fatal(err) - } + if err != nil { + log.Fatal(err) + } - log.Println("done") + log.Println("done") } func upgrade(db *db.DB) (err error) { - tx, err := db.Begin() + tx, err := db.Begin() - if err != nil { - return - } + if err != nil { + return + } - defer func() { - if p := recover(); p != nil { - tx.Rollback() - panic(p) // re-throw panic after Rollback - } else if err != nil { - tx.Rollback() - } else { - err = tx.Commit() - } - }() + defer func() { + if p := recover(); p != nil { + tx.Rollback() + panic(p) // re-throw panic after Rollback + } else if err != nil { + tx.Rollback() + } else { + err = tx.Commit() + } + }() - query1 := "CREATE TABLE budgetitem (id INT UNSIGNED NOT NULL AUTO_INCREMENT, orgId BINARY(16) NOT NULL, accountId BINARY(16) NOT NULL, inserted BIGINT UNSIGNED NOT NULL, amount BIGINT NOT NULL, PRIMARY KEY(id)) ENGINE=InnoDB;" + query1 := "CREATE TABLE budgetitem (id INT UNSIGNED NOT NULL AUTO_INCREMENT, orgId BINARY(16) NOT NULL, accountId BINARY(16) NOT NULL, inserted BIGINT UNSIGNED NOT NULL, amount BIGINT NOT NULL, PRIMARY KEY(id)) ENGINE=InnoDB;" - if _, err = tx.Exec(query1); err != nil { - return - } + if _, err = tx.Exec(query1); err != nil { + return + } - return + return } func downgrade(db *db.DB) (err error) { - tx, err := db.Begin() + tx, err := db.Begin() - if err != nil { - return - } + if err != nil { + return + } - defer func() { - if p := recover(); p != nil { - tx.Rollback() - panic(p) // re-throw panic after Rollback - } else if err != nil { - tx.Rollback() - } else { - err = tx.Commit() - } - }() + defer func() { + if p := recover(); p != nil { + tx.Rollback() + panic(p) // re-throw panic after Rollback + } else if err != nil { + tx.Rollback() + } else { + err = tx.Commit() + } + }() - query1 := "DROP TABLE budgetitem" + query1 := "DROP TABLE budgetitem" - if _, err = tx.Exec(query1); err != nil { - return - } + if _, err = tx.Exec(query1); err != nil { + return + } - return + return }