From fe299a6add65e3395b3d6a8cb989828792875f4e Mon Sep 17 00:00:00 2001 From: Hayden <64056131+hay-kot@users.noreply.github.com> Date: Thu, 1 Dec 2022 16:40:11 -0900 Subject: [PATCH] feat: add RMB currency support --- backend/internal/data/ent/group/group.go | 3 ++- backend/internal/data/ent/migrate/schema.go | 2 +- backend/internal/data/ent/schema/group.go | 2 +- frontend/lib/data/currency.ts | 8 +++++++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/backend/internal/data/ent/group/group.go b/backend/internal/data/ent/group/group.go index a0269b4..379a114 100644 --- a/backend/internal/data/ent/group/group.go +++ b/backend/internal/data/ent/group/group.go @@ -130,6 +130,7 @@ const ( CurrencySek Currency = "sek" CurrencyDkk Currency = "dkk" CurrencyInr Currency = "inr" + CurrencyRmb Currency = "rmb" ) func (c Currency) String() string { @@ -139,7 +140,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: + case CurrencyUsd, CurrencyEur, CurrencyGbp, CurrencyJpy, CurrencyZar, CurrencyAud, CurrencyNok, CurrencySek, CurrencyDkk, CurrencyInr, CurrencyRmb: return nil default: 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.go index 464c3c6..81534c4 100644 --- a/backend/internal/data/ent/migrate/schema.go +++ b/backend/internal/data/ent/migrate/schema.go @@ -127,7 +127,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"}, Default: "usd"}, + {Name: "currency", Type: field.TypeEnum, Enums: []string{"usd", "eur", "gbp", "jpy", "zar", "aud", "nok", "sek", "dkk", "inr", "rmb"}, 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.go index c7c70d0..a2011d8 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"), + Values("usd", "eur", "gbp", "jpy", "zar", "aud", "nok", "sek", "dkk", "inr", "rmb"), } } diff --git a/frontend/lib/data/currency.ts b/frontend/lib/data/currency.ts index 7cdbca5..54d2b2d 100644 --- a/frontend/lib/data/currency.ts +++ b/frontend/lib/data/currency.ts @@ -1,4 +1,4 @@ -export type Codes = "USD" | "EUR" | "GBP" | "JPY" | "ZAR" | "AUD" | "NOK" | "SEK" | "DKK" | "INR"; +export type Codes = "USD" | "EUR" | "GBP" | "JPY" | "ZAR" | "AUD" | "NOK" | "SEK" | "DKK" | "INR" | "RMB"; export type Currency = { code: Codes; @@ -20,6 +20,12 @@ export const currencies: Currency[] = [ symbol: "£", name: "British Pound", }, + { + code: "RMB", + local: "zh-CN", + symbol: "¥", + name: "Chinese Yuan", + }, { code: "DKK", local: "da-DK",