A continuation of HomeBox the inventory and organization system built for the Home User
feat: add currency swiss francs (#311)
Adriana005fa5b9b79
diff --git a/backend/go.sum b/backend/go.sumindex ae08117a..eb146f22 100644--- a/backend/go.sum+++ b/backend/go.sum@@ -41,8 +41,6 @@ github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=-github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669 h1:MvZzCA/mduVWoBSVKJeMdv+AqXQmZZ8i6p8889ejt/Y=-github.com/gocarina/gocsv v0.0.0-20230123225133-763e25b40669/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=github.com/gocarina/gocsv v0.0.0-20230219202803-bcce7dc8d0bb h1:WZ3ADdZNC1i7uJsarVzPSSh0B27+XlmmCerFmU28T/4=github.com/gocarina/gocsv v0.0.0-20230219202803-bcce7dc8d0bb/go.mod h1:5YoVOkjYAQumqlV356Hj3xeYh4BdZuLE0/nRkf2NKkI=github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=diff --git a/backend/internal/data/ent/group/group.go b/backend/internal/data/ent/group/group.goindex 28cf69d2..c527707f 100644--- a/backend/internal/data/ent/group/group.go+++ b/backend/internal/data/ent/group/group.go@@ -132,6 +132,7 @@ const (CurrencyInr Currency = "inr"CurrencyRmb Currency = "rmb"CurrencyBgn Currency = "bgn"+ CurrencyChf Currency = "chf")func (c Currency) String() string {@@ -141,7 +142,7 @@ func (c Currency) String() string {// CurrencyValidator is a validator for the "currency" field enum values. It is called by the builders before save.func CurrencyValidator(c Currency) error {switch c {- case CurrencyUsd, CurrencyEur, CurrencyGbp, CurrencyJpy, CurrencyZar, CurrencyAud, CurrencyNok, CurrencySek, CurrencyDkk, CurrencyInr, CurrencyRmb, CurrencyBgn:+ case CurrencyUsd, CurrencyEur, CurrencyGbp, CurrencyJpy, CurrencyZar, CurrencyAud, CurrencyNok, CurrencySek, CurrencyDkk, CurrencyInr, CurrencyRmb, CurrencyBgn, CurrencyChf:return nildefault:return fmt.Errorf("group: invalid enum value for currency field: %q", c)diff --git a/backend/internal/data/ent/migrate/schema.go b/backend/internal/data/ent/migrate/schema.goindex a5349e21..ed66810b 100644--- a/backend/internal/data/ent/migrate/schema.go+++ b/backend/internal/data/ent/migrate/schema.go@@ -116,7 +116,7 @@ var ({Name: "created_at", Type: field.TypeTime},{Name: "updated_at", Type: field.TypeTime},{Name: "name", Type: field.TypeString, Size: 255},- {Name: "currency", Type: field.TypeEnum, Enums: []string{"usd", "eur", "gbp", "jpy", "zar", "aud", "nok", "sek", "dkk", "inr", "rmb", "bgn"}, Default: "usd"},+ {Name: "currency", Type: field.TypeEnum, Enums: []string{"usd", "eur", "gbp", "jpy", "zar", "aud", "nok", "sek", "dkk", "inr", "rmb", "bgn", "chf"}, Default: "usd"},}// GroupsTable holds the schema information for the "groups" table.GroupsTable = &schema.Table{diff --git a/backend/internal/data/ent/schema/group.go b/backend/internal/data/ent/schema/group.goindex 2c0a5fe8..054f8184 100644--- a/backend/internal/data/ent/schema/group.go+++ b/backend/internal/data/ent/schema/group.go@@ -27,7 +27,7 @@ func (Group) Fields() []ent.Field {NotEmpty(),field.Enum("currency").Default("usd").- Values("usd", "eur", "gbp", "jpy", "zar", "aud", "nok", "sek", "dkk", "inr", "rmb", "bgn"),+ Values("usd", "eur", "gbp", "jpy", "zar", "aud", "nok", "sek", "dkk", "inr", "rmb", "bgn","chf"),}}diff --git a/frontend/lib/data/currency.ts b/frontend/lib/data/currency.tsindex e49ec09d..a0bda226 100644--- a/frontend/lib/data/currency.ts+++ b/frontend/lib/data/currency.ts@@ -1,4 +1,17 @@-export type Codes = "USD" | "EUR" | "GBP" | "JPY" | "ZAR" | "AUD" | "NOK" | "SEK" | "DKK" | "INR" | "RMB" | "BGN";+export type Codes =+ | "USD"+ | "EUR"+ | "GBP"+ | "JPY"+ | "ZAR"+ | "AUD"+ | "NOK"+ | "SEK"+ | "DKK"+ | "INR"+ | "RMB"+ | "BGN"+ | "CHF";export type Currency = {code: Codes;@@ -80,4 +93,10 @@ export const currencies: Currency[] = [symbol: "lv",name: "Bulgarian lev",},+ {+ code: "CHF",+ local: "de-CH",+ symbol: "chf",+ name: "Swiss Francs",+ },];