From 1ff176cf47e027cbfe57df5e415d05cd5fd350f6 Mon Sep 17 00:00:00 2001 From: Radu Ioan Fericean Date: Sat, 14 Sep 2013 20:09:59 +0300 Subject: [PATCH] more name refactorings --- engine/loader_csv.go | 36 ++++++++++++++++++------------------ engine/loader_csv_test.go | 20 ++++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/engine/loader_csv.go b/engine/loader_csv.go index c98a1b849..dd7f0c4c5 100644 --- a/engine/loader_csv.go +++ b/engine/loader_csv.go @@ -30,19 +30,19 @@ import ( ) type CSVReader struct { - sep rune - storage DataStorage - readerFunc func(string, rune, int) (*csv.Reader, *os.File, error) - actions map[string][]*Action - actionsTimings map[string][]*ActionTiming - actionsTriggers map[string][]*ActionTrigger - accountActions []*UserBalance - destinations []*Destination - timings map[string]*Timing - rates map[string]*LoadRate - destinationRates map[string][]*DestinationRate - activationPeriods map[string]*RatingPlan - ratingProfiles map[string]*RatingProfile + sep rune + storage DataStorage + readerFunc func(string, rune, int) (*csv.Reader, *os.File, error) + actions map[string][]*Action + actionsTimings map[string][]*ActionTiming + actionsTriggers map[string][]*ActionTrigger + accountActions []*UserBalance + destinations []*Destination + timings map[string]*Timing + rates map[string]*LoadRate + destinationRates map[string][]*DestinationRate + ratingPlans map[string]*RatingPlan + ratingProfiles map[string]*RatingProfile // file names destinationsFn, ratesFn, destinationratesFn, timingsFn, destinationratetimingsFn, ratingprofilesFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn string @@ -58,7 +58,7 @@ func NewFileCSVReader(storage DataStorage, sep rune, destinationsFn, timingsFn, c.rates = make(map[string]*LoadRate) c.destinationRates = make(map[string][]*DestinationRate) c.timings = make(map[string]*Timing) - c.activationPeriods = make(map[string]*RatingPlan) + c.ratingPlans = make(map[string]*RatingPlan) c.ratingProfiles = make(map[string]*RatingProfile) c.readerFunc = openFileCSVReader c.destinationsFn, c.timingsFn, c.ratesFn, c.destinationratesFn, c.destinationratetimingsFn, c.ratingprofilesFn, @@ -284,10 +284,10 @@ func (csvr *CSVReader) LoadDestinationRateTimings() (err error) { return errors.New(fmt.Sprintf("Could not find destination rate for tag %v", record[1])) } for _, dr := range drs { - if _, exists := csvr.activationPeriods[tag]; !exists { - csvr.activationPeriods[tag] = &RatingPlan{} + if _, exists := csvr.ratingPlans[tag]; !exists { + csvr.ratingPlans[tag] = &RatingPlan{} } - csvr.activationPeriods[tag].AddRateInterval(rt.GetRateInterval(dr)) + csvr.ratingPlans[tag].AddRateInterval(rt.GetRateInterval(dr)) } } return @@ -316,7 +316,7 @@ func (csvr *CSVReader) LoadRatingProfiles() (err error) { csvr.ratingProfiles[key] = rp } for _, d := range csvr.destinations { - ap, exists := csvr.activationPeriods[record[5]] + ap, exists := csvr.ratingPlans[record[5]] if !exists { return errors.New(fmt.Sprintf("Could not load ratinTiming for tag: %v", record[5])) } diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index 5849e28d7..5c0ff31bf 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -354,10 +354,10 @@ func TestLoadDestinationRates(t *testing.T) { } func TestLoadDestinationRateTimings(t *testing.T) { - if len(csvr.activationPeriods) != 4 { - t.Error("Failed to load rate timings: ", csvr.activationPeriods) + if len(csvr.ratingPlans) != 4 { + t.Error("Failed to load rate timings: ", csvr.ratingPlans) } - rplan := csvr.activationPeriods["STANDARD"] + rplan := csvr.ratingPlans["STANDARD"] expected := &RatingPlan{ ActivationTime: time.Time{}, RateIntervals: RateIntervalList{ @@ -442,9 +442,9 @@ func TestLoadDestinationRateTimings(t *testing.T) { }, } if !reflect.DeepEqual(rplan, expected) { - t.Errorf("Error loading rating plan: %#v", csvr.activationPeriods["STANDARD"]) + t.Errorf("Error loading rating plan: %#v", csvr.ratingPlans["STANDARD"]) } - rplan = csvr.activationPeriods["PREMIUM"] + rplan = csvr.ratingPlans["PREMIUM"] expected = &RatingPlan{ ActivationTime: time.Time{}, RateIntervals: RateIntervalList{ @@ -477,9 +477,9 @@ func TestLoadDestinationRateTimings(t *testing.T) { }, } if !reflect.DeepEqual(rplan, expected) { - t.Errorf("Error loading rating plan: %#v", csvr.activationPeriods["PREMIUM"]) + t.Errorf("Error loading rating plan: %#v", csvr.ratingPlans["PREMIUM"]) } - rplan = csvr.activationPeriods["DEFAULT"] + rplan = csvr.ratingPlans["DEFAULT"] expected = &RatingPlan{ ActivationTime: time.Time{}, RateIntervals: RateIntervalList{ @@ -506,9 +506,9 @@ func TestLoadDestinationRateTimings(t *testing.T) { }, } if !reflect.DeepEqual(rplan, expected) { - t.Errorf("Error loading rating plan: %#v", csvr.activationPeriods["DEFAULT"]) + t.Errorf("Error loading rating plan: %#v", csvr.ratingPlans["DEFAULT"]) } - rplan = csvr.activationPeriods["EVENING"] + rplan = csvr.ratingPlans["EVENING"] expected = &RatingPlan{ ActivationTime: time.Time{}, RateIntervals: RateIntervalList{ @@ -575,7 +575,7 @@ func TestLoadDestinationRateTimings(t *testing.T) { }, } if !reflect.DeepEqual(rplan, expected) { - t.Errorf("Error loading rating plan: %#v", csvr.activationPeriods["EVENING"]) + t.Errorf("Error loading rating plan: %#v", csvr.ratingPlans["EVENING"]) } }