cybercinch/openaccounting-server
0
0
Fork 1
mirror of https://github.com/openaccounting/oa-server.git synced 2025-12-09 00:50:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

format code

Browse Source
This commit is contained in:
Patrick Nagurny
2020-01-14 14:29:00 -05:00
parent 83f3cfc983
commit f2877230e2
7 changed files with 267 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
core/api/org.go
View File

@@ -54,39 +54,39 @@ func GetOrg(w rest.ResponseWriter, r *rest.Request) {
} }
/** /**
* @api {get} /orgs Get a User's Orgs * @api {get} /orgs Get a User's Orgs
* @apiVersion 1.4.0 * @apiVersion 1.4.0
* @apiName GetOrgs * @apiName GetOrgs
* @apiGroup Org * @apiGroup Org
* *
* @apiHeader {String} Authorization HTTP Basic Auth * @apiHeader {String} Authorization HTTP Basic Auth
* @apiHeader {String} Accept-Version ^1.4.0 semver versioning * @apiHeader {String} Accept-Version ^1.4.0 semver versioning
* *
* @apiSuccess {String} id Id of the Org. * @apiSuccess {String} id Id of the Org.
* @apiSuccess {Date} inserted Date Org was created * @apiSuccess {Date} inserted Date Org was created
* @apiSuccess {Date} updated Date Org was updated * @apiSuccess {Date} updated Date Org was updated
* @apiSuccess {String} name Name of the Org. * @apiSuccess {String} name Name of the Org.
* @apiSuccess {String} currency Three letter currency code. * @apiSuccess {String} currency Three letter currency code.
* @apiSuccess {Number} precision How many digits the currency goes out to. * @apiSuccess {Number} precision How many digits the currency goes out to.
@apiSuccess {String} timezone Timezone to use for accounting. @apiSuccess {String} timezone Timezone to use for accounting.
* *
* @apiSuccessExample Success-Response: * @apiSuccessExample Success-Response:
* HTTP/1.1 200 OK * HTTP/1.1 200 OK
* [ * [
* { * {
* "id": "11111111111111111111111111111111", * "id": "11111111111111111111111111111111",
* "inserted": "2018-09-11T18:05:04.420Z", * "inserted": "2018-09-11T18:05:04.420Z",
* "updated": "2018-09-11T18:05:04.420Z", * "updated": "2018-09-11T18:05:04.420Z",
* "name": "MyOrg", * "name": "MyOrg",
* "currency": "USD", * "currency": "USD",
* "precision": 2, * "precision": 2,
* "timezone": "America/New_York" * "timezone": "America/New_York"
* } * }
* ] * ]
* *
* @apiUse NotAuthorizedError * @apiUse NotAuthorizedError
* @apiUse InternalServerError * @apiUse InternalServerError
*/ */
func GetOrgs(w rest.ResponseWriter, r *rest.Request) { func GetOrgs(w rest.ResponseWriter, r *rest.Request) {
user := r.Env["USER"].(*types.User) user := r.Env["USER"].(*types.User)

2
core/auth/auth.go
View File

@@ -105,4 +105,4 @@ func (auth *AuthService) AuthenticateEmailVerifyCode(code string) (*types.User,
} }
return u, nil return u, nil
} }

22
core/model/db/budget.go
View File

@@ -77,17 +77,17 @@ func (db *DB) InsertAndReplaceBudget(budget *types.Budget) (err error) {
} }
}() }()
// delete previous budget // delete previous budget
query1 := "DELETE FROM budgetitem WHERE orgId = UNHEX(?)" query1 := "DELETE FROM budgetitem WHERE orgId = UNHEX(?)"
_, err = dbTx.Exec( _, err = dbTx.Exec(
query1, query1,
budget.OrgId, budget.OrgId,
) )
if err != nil { if err != nil {
return return
} }
// save items // save items
for _, item := range budget.Items { for _, item := range budget.Items {
@@ -114,4 +114,4 @@ func (db *DB) DeleteBudget(orgId string) error {
_, err := db.Exec(query, orgId) _, err := db.Exec(query, orgId)
return err return err
} }

12
core/model/types/budget.go
View File

@@ -5,13 +5,13 @@ import (
) )
type Budget struct { type Budget struct {
OrgId string `json:"orgId"` OrgId string `json:"orgId"`
Inserted time.Time `json:"inserted"` Inserted time.Time `json:"inserted"`
Items []*BudgetItem `json:"items"` Items []*BudgetItem `json:"items"`
} }
type BudgetItem struct { type BudgetItem struct {
OrgId string `json:"-"` OrgId string `json:"-"`
AccountId string `json:"accountId"` AccountId string `json:"accountId"`
Amount int64 `json:"amount"` Amount int64 `json:"amount"`
} }

144
migrations/migrate1.go
View File

@@ -1,105 +1,105 @@
package main package main
import ( import (
"encoding/json" "encoding/json"
"github.com/openaccounting/oa-server/core/model/db" "github.com/openaccounting/oa-server/core/model/db"
"github.com/openaccounting/oa-server/core/model/types" "github.com/openaccounting/oa-server/core/model/types"
"log" "log"
"os" "os"
) )
func main() { func main() {
if len(os.Args) != 2 { if len(os.Args) != 2 {
log.Fatal("Usage: migrate1.go <upgrade/downgrade>") log.Fatal("Usage: migrate1.go <upgrade/downgrade>")
} }
command := os.Args[1] command := os.Args[1]
if command != "upgrade" && command != "downgrade" { if command != "upgrade" && command != "downgrade" {
log.Fatal("Usage: migrate1.go <upgrade/downgrade>") log.Fatal("Usage: migrate1.go <upgrade/downgrade>")
} }
//filename is the path to the json config file //filename is the path to the json config file
var config types.Config var config types.Config
file, err := os.Open("./config.json") file, err := os.Open("./config.json")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
decoder := json.NewDecoder(file) decoder := json.NewDecoder(file)
err = decoder.Decode(&config) err = decoder.Decode(&config)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
connectionString := config.User + ":" + config.Password + "@/" + config.Database connectionString := config.User + ":" + config.Password + "@/" + config.Database
db, err := db.NewDB(connectionString) db, err := db.NewDB(connectionString)
if command == "upgrade" { if command == "upgrade" {
err = upgrade(db) err = upgrade(db)
} else { } else {
err = downgrade(db) err = downgrade(db)
} }
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
log.Println("done") log.Println("done")
} }
func upgrade(db *db.DB) (err error) { func upgrade(db *db.DB) (err error) {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return return
} }
defer func() { defer func() {
if p := recover(); p != nil { if p := recover(); p != nil {
tx.Rollback() tx.Rollback()
panic(p) // re-throw panic after Rollback panic(p) // re-throw panic after Rollback
} else if err != nil { } else if err != nil {
tx.Rollback() tx.Rollback()
} else { } else {
err = tx.Commit() 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 { if _, err = tx.Exec(query1); err != nil {
return return
} }
return return
} }
func downgrade(db *db.DB) (err error) { func downgrade(db *db.DB) (err error) {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return return
} }
defer func() { defer func() {
if p := recover(); p != nil { if p := recover(); p != nil {
tx.Rollback() tx.Rollback()
panic(p) // re-throw panic after Rollback panic(p) // re-throw panic after Rollback
} else if err != nil { } else if err != nil {
tx.Rollback() tx.Rollback()
} else { } else {
err = tx.Commit() err = tx.Commit()
} }
}() }()
query1 := "ALTER TABLE user DROP COLUMN signupSource" query1 := "ALTER TABLE user DROP COLUMN signupSource"
if _, err = tx.Exec(query1); err != nil { if _, err = tx.Exec(query1); err != nil {
return return
} }
return return
} }

144
migrations/migrate2.go
View File

@@ -1,105 +1,105 @@
package main package main
import ( import (
"encoding/json" "encoding/json"
"github.com/openaccounting/oa-server/core/model/db" "github.com/openaccounting/oa-server/core/model/db"
"github.com/openaccounting/oa-server/core/model/types" "github.com/openaccounting/oa-server/core/model/types"
"log" "log"
"os" "os"
) )
func main() { func main() {
if len(os.Args) != 2 { if len(os.Args) != 2 {
log.Fatal("Usage: migrate2.go <upgrade/downgrade>") log.Fatal("Usage: migrate2.go <upgrade/downgrade>")
} }
command := os.Args[1] command := os.Args[1]
if command != "upgrade" && command != "downgrade" { if command != "upgrade" && command != "downgrade" {
log.Fatal("Usage: migrate2.go <upgrade/downgrade>") log.Fatal("Usage: migrate2.go <upgrade/downgrade>")
} }
//filename is the path to the json config file //filename is the path to the json config file
var config types.Config var config types.Config
file, err := os.Open("./config.json") file, err := os.Open("./config.json")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
decoder := json.NewDecoder(file) decoder := json.NewDecoder(file)
err = decoder.Decode(&config) err = decoder.Decode(&config)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
connectionString := config.User + ":" + config.Password + "@/" + config.Database connectionString := config.User + ":" + config.Password + "@/" + config.Database
db, err := db.NewDB(connectionString) db, err := db.NewDB(connectionString)
if command == "upgrade" { if command == "upgrade" {
err = upgrade(db) err = upgrade(db)
} else { } else {
err = downgrade(db) err = downgrade(db)
} }
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
log.Println("done") log.Println("done")
} }
func upgrade(db *db.DB) (err error) { func upgrade(db *db.DB) (err error) {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return return
} }
defer func() { defer func() {
if p := recover(); p != nil { if p := recover(); p != nil {
tx.Rollback() tx.Rollback()
panic(p) // re-throw panic after Rollback panic(p) // re-throw panic after Rollback
} else if err != nil { } else if err != nil {
tx.Rollback() tx.Rollback()
} else { } else {
err = tx.Commit() 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 { if _, err = tx.Exec(query1); err != nil {
return return
} }
return return
} }
func downgrade(db *db.DB) (err error) { func downgrade(db *db.DB) (err error) {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return return
} }
defer func() { defer func() {
if p := recover(); p != nil { if p := recover(); p != nil {
tx.Rollback() tx.Rollback()
panic(p) // re-throw panic after Rollback panic(p) // re-throw panic after Rollback
} else if err != nil { } else if err != nil {
tx.Rollback() tx.Rollback()
} else { } else {
err = tx.Commit() err = tx.Commit()
} }
}() }()
query1 := "ALTER TABLE org DROP COLUMN timezone" query1 := "ALTER TABLE org DROP COLUMN timezone"
if _, err = tx.Exec(query1); err != nil { if _, err = tx.Exec(query1); err != nil {
return return
} }
return return
} }

144
migrations/migrate3.go
View File

@@ -1,105 +1,105 @@
package main package main
import ( import (
"encoding/json" "encoding/json"
"github.com/openaccounting/oa-server/core/model/db" "github.com/openaccounting/oa-server/core/model/db"
"github.com/openaccounting/oa-server/core/model/types" "github.com/openaccounting/oa-server/core/model/types"
"log" "log"
"os" "os"
) )
func main() { func main() {
if len(os.Args) != 2 { if len(os.Args) != 2 {
log.Fatal("Usage: migrate3.go <upgrade/downgrade>") log.Fatal("Usage: migrate3.go <upgrade/downgrade>")
} }
command := os.Args[1] command := os.Args[1]
if command != "upgrade" && command != "downgrade" { if command != "upgrade" && command != "downgrade" {
log.Fatal("Usage: migrate3.go <upgrade/downgrade>") log.Fatal("Usage: migrate3.go <upgrade/downgrade>")
} }
//filename is the path to the json config file //filename is the path to the json config file
var config types.Config var config types.Config
file, err := os.Open("./config.json") file, err := os.Open("./config.json")
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
decoder := json.NewDecoder(file) decoder := json.NewDecoder(file)
err = decoder.Decode(&config) err = decoder.Decode(&config)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
connectionString := config.User + ":" + config.Password + "@/" + config.Database connectionString := config.User + ":" + config.Password + "@/" + config.Database
db, err := db.NewDB(connectionString) db, err := db.NewDB(connectionString)
if command == "upgrade" { if command == "upgrade" {
err = upgrade(db) err = upgrade(db)
} else { } else {
err = downgrade(db) err = downgrade(db)
} }
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
log.Println("done") log.Println("done")
} }
func upgrade(db *db.DB) (err error) { func upgrade(db *db.DB) (err error) {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return return
} }
defer func() { defer func() {
if p := recover(); p != nil { if p := recover(); p != nil {
tx.Rollback() tx.Rollback()
panic(p) // re-throw panic after Rollback panic(p) // re-throw panic after Rollback
} else if err != nil { } else if err != nil {
tx.Rollback() tx.Rollback()
} else { } else {
err = tx.Commit() 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 { if _, err = tx.Exec(query1); err != nil {
return return
} }
return return
} }
func downgrade(db *db.DB) (err error) { func downgrade(db *db.DB) (err error) {
tx, err := db.Begin() tx, err := db.Begin()
if err != nil { if err != nil {
return return
} }
defer func() { defer func() {
if p := recover(); p != nil { if p := recover(); p != nil {
tx.Rollback() tx.Rollback()
panic(p) // re-throw panic after Rollback panic(p) // re-throw panic after Rollback
} else if err != nil { } else if err != nil {
tx.Rollback() tx.Rollback()
} else { } else {
err = tx.Commit() err = tx.Commit()
} }
}() }()
query1 := "DROP TABLE budgetitem" query1 := "DROP TABLE budgetitem"
if _, err = tx.Exec(query1); err != nil { if _, err = tx.Exec(query1); err != nil {
return return
} }
return return
} }