diff --git a/models/common/pricing/pricing_strategy.go b/models/common/pricing/pricing_strategy.go index fee356f..728e794 100755 --- a/models/common/pricing/pricing_strategy.go +++ b/models/common/pricing/pricing_strategy.go @@ -93,6 +93,10 @@ func (t TimePricingStrategy) String() string { return [...]string{"ONCE", "PER SECOND", "PER MINUTE", "PER HOUR", "PER DAY", "PER WEEK", "PER MONTH"}[t] } +func TimePricingStrategyListStr() []string { + return []string{"ONCE", "PER SECOND", "PER MINUTE", "PER HOUR", "PER DAY", "PER WEEK", "PER MONTH"} +} + func TimePricingStrategyList() []TimePricingStrategy { return []TimePricingStrategy{ONCE, PER_SECOND, PER_MINUTE, PER_HOUR, PER_DAY, PER_WEEK, PER_MONTH} } diff --git a/models/resources/data.go b/models/resources/data.go index aecf190..9a26a20 100755 --- a/models/resources/data.go +++ b/models/resources/data.go @@ -89,7 +89,9 @@ const ( ) func (t DataResourcePricingStrategy) String() string { - return [...]string{"PER DOWNLOAD", "PER TB DOWNLOADED", "PER GB DOWNLOADED", "PER MB DOWNLOADED", "PER KB DOWNLOADED"}[t] + l := pricing.TimePricingStrategyListStr() + l = append(l, []string{"PER DOWNLOAD", "PER TB DOWNLOADED", "PER GB DOWNLOADED", "PER MB DOWNLOADED", "PER KB DOWNLOADED"}...) + return l[t] } func DataResourcePricingStrategyList() []DataResourcePricingStrategy { @@ -101,7 +103,9 @@ func ToDataResourcePricingStrategy(i int) DataResourcePricingStrategy { } func (t DataResourcePricingStrategy) GetStrategy() string { - return [...]string{"PER_DOWNLOAD", "PER_GB", "PER_MB", "PER_KB"}[t] + l := pricing.TimePricingStrategyListStr() + l = append(l, []string{"PER DATA STORED", "PER TB STORED", "PER GB STORED", "PER MB STORED", "PER KB STORED"}...) + return l[t] } func (t DataResourcePricingStrategy) GetStrategyValue() int { diff --git a/models/resources/storage.go b/models/resources/storage.go index a1198ca..77a04c1 100755 --- a/models/resources/storage.go +++ b/models/resources/storage.go @@ -115,11 +115,15 @@ func StorageResourcePricingStrategyList() []StorageResourcePricingStrategy { } func (t StorageResourcePricingStrategy) String() string { - return [...]string{"PER DATA STORED", "PER TB STORED", "PER GB STORED", "PER MB STORED", "PER KB STORED"}[t] + l := pricing.TimePricingStrategyListStr() + l = append(l, []string{"PER DATA STORED", "PER TB STORED", "PER GB STORED", "PER MB STORED", "PER KB STORED"}...) + return l[t] } func (t StorageResourcePricingStrategy) GetStrategy() string { - return [...]string{"PER_DATA_STORED", "PER_GB_STORED", "PER_MB_STORED", "PER_KB_STORED"}[t] + l := pricing.TimePricingStrategyListStr() + l = append(l, []string{"PER DATA STORED", "PER TB STORED", "PER GB STORED", "PER MB STORED", "PER KB STORED"}...) + return l[t] } func (t StorageResourcePricingStrategy) GetStrategyValue() int {