From 0503a50754bb11a6af0d76ef0dfcd1910f4b7055 Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 16 Nov 2024 21:47:34 +0800 Subject: [PATCH] change timezone name --- conf/ezbookkeeping.ini | 12 ++--- .../exchange_rates_datasource_container.go | 32 ++++++------- pkg/settings/setting.go | 46 ++++++++----------- 3 files changed, 40 insertions(+), 50 deletions(-) diff --git a/conf/ezbookkeeping.ini b/conf/ezbookkeeping.ini index fa08f0a5..69ac2605 100644 --- a/conf/ezbookkeeping.ini +++ b/conf/ezbookkeeping.ini @@ -340,16 +340,16 @@ custom_map_tile_server_default_zoom_level = 14 [exchange_rates] # Exchange rates data source, supports the following types: -# "euro_central_bank": https://www.ecb.europa.eu/stats/policy_and_exchange_rates/euro_reference_exchange_rates/html/index.en.html -# "bank_of_canada": https://www.bankofcanada.ca/rates/exchange/daily-exchange-rates/ # "reserve_bank_of_australia": https://www.rba.gov.au/statistics/frequency/exchange-rates.html +# "bank_of_canada": https://www.bankofcanada.ca/rates/exchange/daily-exchange-rates/ # "czech_national_bank": https://www.cnb.cz/en/financial-markets/foreign-exchange-market/central-bank-exchange-rate-fixing/central-bank-exchange-rate-fixing/ -# "national_bank_of_poland": https://nbp.pl/en/statistic-and-financial-reporting/rates/ -# "bank_of_israel": https://www.boi.org.il/en/economic-roles/financial-markets/exchange-rates/ -# "swiss_national_bank": https://www.snb.ch/en/the-snb/mandates-goals/statistics/statistics-pub/current_interest_exchange_rates # "danmarks_national_bank": https://www.nationalbanken.dk/en/what-we-do/stable-prices-monetary-policy-and-the-danish-economy/exchange-rates -# "national_bank_of_romania": https://www.bnr.ro/Exchange-rates-1224.aspx +# "euro_central_bank": https://www.ecb.europa.eu/stats/policy_and_exchange_rates/euro_reference_exchange_rates/html/index.en.html # "national_bank_of_georgia": https://nbg.gov.ge/en/monetary-policy/currency +# "bank_of_israel": https://www.boi.org.il/en/economic-roles/financial-markets/exchange-rates/ +# "national_bank_of_poland": https://nbp.pl/en/statistic-and-financial-reporting/rates/ +# "national_bank_of_romania": https://www.bnr.ro/Exchange-rates-1224.aspx +# "swiss_national_bank": https://www.snb.ch/en/the-snb/mandates-goals/statistics/statistics-pub/current_interest_exchange_rates # "international_monetary_fund": https://www.imf.org/external/np/fin/data/param_rms_mth.aspx data_source = euro_central_bank diff --git a/pkg/exchangerates/exchange_rates_datasource_container.go b/pkg/exchangerates/exchange_rates_datasource_container.go index 1a78f2c6..a4aa5b19 100644 --- a/pkg/exchangerates/exchange_rates_datasource_container.go +++ b/pkg/exchangerates/exchange_rates_datasource_container.go @@ -17,36 +17,36 @@ var ( // InitializeExchangeRatesDataSource initializes the current exchange rates data source according to the config func InitializeExchangeRatesDataSource(config *settings.Config) error { - if config.ExchangeRatesDataSource == settings.EuroCentralBankDataSource { - Container.Current = &EuroCentralBankDataSource{} + if config.ExchangeRatesDataSource == settings.ReserveBankOfAustraliaDataSource { + Container.Current = &ReserveBankOfAustraliaDataSource{} return nil } else if config.ExchangeRatesDataSource == settings.BankOfCanadaDataSource { Container.Current = &BankOfCanadaDataSource{} return nil - } else if config.ExchangeRatesDataSource == settings.ReserveBankOfAustraliaDataSource { - Container.Current = &ReserveBankOfAustraliaDataSource{} - return nil } else if config.ExchangeRatesDataSource == settings.CzechNationalBankDataSource { Container.Current = &CzechNationalBankDataSource{} return nil - } else if config.ExchangeRatesDataSource == settings.NationalBankOfPolandDataSource { - Container.Current = &NationalBankOfPolandDataSource{} - return nil - } else if config.ExchangeRatesDataSource == settings.BankOfIsraelDataSource { - Container.Current = &BankOfIsraelDataSource{} - return nil - } else if config.ExchangeRatesDataSource == settings.SwissNationalBankDataSource { - Container.Current = &SwissNationalBankDataSource{} - return nil } else if config.ExchangeRatesDataSource == settings.DanmarksNationalbankDataSource { Container.Current = &DanmarksNationalbankDataSource{} return nil - } else if config.ExchangeRatesDataSource == settings.NationalBankOfRomaniaDataSource { - Container.Current = &NationalBankOfRomaniaDataSource{} + } else if config.ExchangeRatesDataSource == settings.EuroCentralBankDataSource { + Container.Current = &EuroCentralBankDataSource{} return nil } else if config.ExchangeRatesDataSource == settings.NationalBankOfGeorgiaDataSource { Container.Current = &NationalBankOfGeorgiaDataSource{} return nil + } else if config.ExchangeRatesDataSource == settings.BankOfIsraelDataSource { + Container.Current = &BankOfIsraelDataSource{} + return nil + } else if config.ExchangeRatesDataSource == settings.NationalBankOfPolandDataSource { + Container.Current = &NationalBankOfPolandDataSource{} + return nil + } else if config.ExchangeRatesDataSource == settings.NationalBankOfRomaniaDataSource { + Container.Current = &NationalBankOfRomaniaDataSource{} + return nil + } else if config.ExchangeRatesDataSource == settings.SwissNationalBankDataSource { + Container.Current = &SwissNationalBankDataSource{} + return nil } else if config.ExchangeRatesDataSource == settings.InternationalMonetaryFundDataSource { Container.Current = &InternationalMonetaryFundDataSource{} return nil diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go index 1f805f6c..a93685d8 100644 --- a/pkg/settings/setting.go +++ b/pkg/settings/setting.go @@ -100,16 +100,16 @@ const ( // Exchange rates data source types const ( - EuroCentralBankDataSource string = "euro_central_bank" - BankOfCanadaDataSource string = "bank_of_canada" ReserveBankOfAustraliaDataSource string = "reserve_bank_of_australia" + BankOfCanadaDataSource string = "bank_of_canada" CzechNationalBankDataSource string = "czech_national_bank" - NationalBankOfPolandDataSource string = "national_bank_of_poland" - BankOfIsraelDataSource string = "bank_of_israel" - SwissNationalBankDataSource string = "swiss_national_bank" DanmarksNationalbankDataSource string = "danmarks_national_bank" - NationalBankOfRomaniaDataSource string = "national_bank_of_romania" + EuroCentralBankDataSource string = "euro_central_bank" NationalBankOfGeorgiaDataSource string = "national_bank_of_georgia" + BankOfIsraelDataSource string = "bank_of_israel" + NationalBankOfPolandDataSource string = "national_bank_of_poland" + NationalBankOfRomaniaDataSource string = "national_bank_of_romania" + SwissNationalBankDataSource string = "swiss_national_bank" InternationalMonetaryFundDataSource string = "international_monetary_fund" ) @@ -883,28 +883,18 @@ func loadMapConfiguration(config *Config, configFile *ini.File, sectionName stri func loadExchangeRatesConfiguration(config *Config, configFile *ini.File, sectionName string) error { dataSource := getConfigItemStringValue(configFile, sectionName, "data_source") - if dataSource == EuroCentralBankDataSource { - config.ExchangeRatesDataSource = EuroCentralBankDataSource - } else if dataSource == BankOfCanadaDataSource { - config.ExchangeRatesDataSource = BankOfCanadaDataSource - } else if dataSource == ReserveBankOfAustraliaDataSource { - config.ExchangeRatesDataSource = ReserveBankOfAustraliaDataSource - } else if dataSource == CzechNationalBankDataSource { - config.ExchangeRatesDataSource = CzechNationalBankDataSource - } else if dataSource == NationalBankOfPolandDataSource { - config.ExchangeRatesDataSource = NationalBankOfPolandDataSource - } else if dataSource == BankOfIsraelDataSource { - config.ExchangeRatesDataSource = BankOfIsraelDataSource - } else if dataSource == SwissNationalBankDataSource { - config.ExchangeRatesDataSource = SwissNationalBankDataSource - } else if dataSource == DanmarksNationalbankDataSource { - config.ExchangeRatesDataSource = DanmarksNationalbankDataSource - } else if dataSource == NationalBankOfRomaniaDataSource { - config.ExchangeRatesDataSource = NationalBankOfRomaniaDataSource - } else if dataSource == NationalBankOfGeorgiaDataSource { - config.ExchangeRatesDataSource = NationalBankOfGeorgiaDataSource - } else if dataSource == InternationalMonetaryFundDataSource { - config.ExchangeRatesDataSource = InternationalMonetaryFundDataSource + if dataSource == ReserveBankOfAustraliaDataSource || + dataSource == BankOfCanadaDataSource || + dataSource == CzechNationalBankDataSource || + dataSource == DanmarksNationalbankDataSource || + dataSource == EuroCentralBankDataSource || + dataSource == NationalBankOfGeorgiaDataSource || + dataSource == BankOfIsraelDataSource || + dataSource == NationalBankOfPolandDataSource || + dataSource == NationalBankOfRomaniaDataSource || + dataSource == SwissNationalBankDataSource || + dataSource == InternationalMonetaryFundDataSource { + config.ExchangeRatesDataSource = dataSource } else { return errs.ErrInvalidExchangeRatesDataSource }