added loaders for user data

apier/v1/apier.go

@@ -1015,7 +1015,8 @@ func (self *ApierV1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder,
 		path.Join(attrs.FolderPath, utils.ACTION_TRIGGERS_CSV),
 		path.Join(attrs.FolderPath, utils.ACCOUNT_ACTIONS_CSV),
 		path.Join(attrs.FolderPath, utils.DERIVED_CHARGERS_CSV),
-		path.Join(attrs.FolderPath, utils.CDR_STATS_CSV)), "")
+		path.Join(attrs.FolderPath, utils.CDR_STATS_CSV),
+		path.Join(attrs.FolderPath, utils.USERS_CSV)), "")
 	if err := loader.LoadAll(); err != nil {
 		return utils.NewErrServerError(err)
 	}

cmd/cgr-loader/cgr-loader.go

@@ -154,7 +154,8 @@ func main() {
 			path.Join(*dataPath, utils.ACTION_TRIGGERS_CSV),
 			path.Join(*dataPath, utils.ACCOUNT_ACTIONS_CSV),
 			path.Join(*dataPath, utils.DERIVED_CHARGERS_CSV),
-			path.Join(*dataPath, utils.CDR_STATS_CSV))
+			path.Join(*dataPath, utils.CDR_STATS_CSV),
+			path.Join(*dataPath, utils.USERS_CSV))
 	}
 	tpReader := engine.NewTpReader(ratingDb, accountDb, loader, *tpid)
 	err = tpReader.LoadAll()

data/storage/mysql/create_tariffplan_tables.sql

@@ -335,3 +335,20 @@ CREATE TABLE tp_cdrstats (
   PRIMARY KEY (`id`),
   KEY `tpid` (`tpid`)
 );
+
+    --
+-- Table structure for table `tp_cdrstats`
+--
+
+DROP TABLE IF EXISTS tp_cdrstats;
+CREATE TABLE tp_cdrstats (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `tpid` varchar(64) NOT NULL,
+  `tenant` varchar(64) NOT NULL,
+  `user_name` varchar(64) NOT NULL,
+  `attribute` varchar(64) NOT NULL,
+  `value` varchar(64) NOT NULL,
+  `created_at` TIMESTAMP,
+  PRIMARY KEY (`id`),
+  KEY `tpid` (`tpid`)
+);

data/storage/postgres/create_tariffplan_tables.sql

@@ -330,3 +330,20 @@ CREATE TABLE tp_cdrstats (
 );
 CREATE INDEX tpcdrstats_tpid_idx ON tp_cdrstats (tpid);
 CREATE INDEX tpcdrstats_idx ON tp_cdrstats (tpid,tag);
+
+--
+-- Table structure for table `tp_users`
+--
+
+DROP TABLE IF EXISTS tp_users;
+CREATE TABLE tp_users (
+  id SERIAL PRIMARY KEY,
+  tpid VARCHAR(64) NOT NULL,
+  tenant VARCHAR(64) NOT NULL,
+  user_name VARCHAR(64) NOT NULL,
+  attribute VARCHAR(64) NOT NULL,
+  `value` VARCHAR(64) NOT NULL,
+  created_at TIMESTAMP
+);
+CREATE INDEX tpusers_tpid_idx ON tp_users (tpid);
+CREATE INDEX tpusers_idx ON tp_users (tpid,tenant,user_name);

data/tariffplans/tutorial/User.csv

@@ -0,0 +1,4 @@
+#Tenant[0],UserName[1],Attribute[2],Value[3]
+cgrates.org,1001,test0,val0
+cgrates.org,1001,test1,val1
+cgrates.org,1002,another,value

engine/libtest.go

@@ -105,7 +105,8 @@ func LoadTariffPlanFromFolder(tpPath string, ratingDb RatingStorage, accountingD
 		path.Join(tpPath, utils.ACTION_TRIGGERS_CSV),
 		path.Join(tpPath, utils.ACCOUNT_ACTIONS_CSV),
 		path.Join(tpPath, utils.DERIVED_CHARGERS_CSV),
-		path.Join(tpPath, utils.CDR_STATS_CSV)), "")
+		path.Join(tpPath, utils.CDR_STATS_CSV),
+		path.Join(tpPath, utils.USERS_CSV)), "")
 	if err := loader.LoadAll(); err != nil {
 		return utils.NewErrServerError(err)
 	}

engine/loader_csv_test.go

@@ -208,6 +208,12 @@ CDRST1,,,,ACD,,,,,,,,,,,,,,,,,,,,STANDARD_TRIGGER
 CDRST1,,,,ACC,,,,,,,,,,,,,,,,,,,,
 CDRST2,10,10m,,ASR,,,,,,,cgrates.org,call,,,,,,,,,,,,
 CDRST2,,,,ACD,,,,,,,,,,,,,,,,,,,,
+`
+	users = `
+#Tenant[0],UserName[1],Attribute[2],Value[3]
+cgrates.org,rif,test0,val0
+cgrates.org,rif,test1,val1
+cgrates.org,dan,another,value
 `
 )
 
@@ -215,7 +221,7 @@ var csvr *TpReader
 
 func init() {
 	csvr = NewTpReader(ratingStorage, accountingStorage, NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		sharedGroups, lcrs, actions, actionTimings, actionTriggers, accountActions, derivedCharges, cdrStats), "")
+		sharedGroups, lcrs, actions, actionTimings, actionTriggers, accountActions, derivedCharges, cdrStats, users), "")
 	if err := csvr.LoadDestinations(); err != nil {
 		log.Print("error in LoadDestinations:", err)
 	}
@@ -258,6 +264,9 @@ func init() {
 	if err := csvr.LoadCdrStats(); err != nil {
 		log.Print("error in LoadCdrStats:", err)
 	}
+	if err := csvr.LoadUsers(); err != nil {
+		log.Print("error in LoadUsers:", err)
+	}
 	csvr.WriteToDatabase(false, false)
 	ratingStorage.CacheAll()
 }
@@ -1104,3 +1113,21 @@ func TestLoadCdrStats(t *testing.T) {
 		t.Errorf("Unexpected stats %+v", csvr.cdrStats[cdrStats1.Id])
 	}
 }
+
+func TestLoadUsers(t *testing.T) {
+	if len(csvr.users) != 2 {
+		t.Error("Failed to load users: ", csvr.users)
+	}
+	user1 := &UserProfile{
+		Tenant:   "cgrates.org",
+		UserName: "rif",
+		Profile: map[string]string{
+			"test0": "val0",
+			"test1": "val1",
+		},
+	}
+
+	if !reflect.DeepEqual(csvr.users[user1.GetId()], user1) {
+		t.Errorf("Unexpected user %+v", csvr.users[user1.GetId()])
+	}
+}

engine/loader_local_test.go

@@ -130,7 +130,8 @@ func TestLoadFromCSV(t *testing.T) {
 		path.Join(*dataDir, "tariffplans", *tpCsvScenario, utils.ACTION_TRIGGERS_CSV),
 		path.Join(*dataDir, "tariffplans", *tpCsvScenario, utils.ACCOUNT_ACTIONS_CSV),
 		path.Join(*dataDir, "tariffplans", *tpCsvScenario, utils.DERIVED_CHARGERS_CSV),
-		path.Join(*dataDir, "tariffplans", *tpCsvScenario, utils.CDR_STATS_CSV)), "")
+		path.Join(*dataDir, "tariffplans", *tpCsvScenario, utils.CDR_STATS_CSV),
+		path.Join(*dataDir, "tariffplans", *tpCsvScenario, utils.USERS_CSV)), "")
 
 	if err = loader.LoadDestinations(); err != nil {
 		t.Error("Failed loading destinations: ", err.Error())
@@ -165,6 +166,9 @@ func TestLoadFromCSV(t *testing.T) {
 	if err = loader.LoadDerivedChargers(); err != nil {
 		t.Error("Failed loading derived chargers: ", err.Error())
 	}
+	if err = loader.LoadUsers(); err != nil {
+		t.Error("Failed loading users: ", err.Error())
+	}
 	if err := loader.WriteToDatabase(true, false); err != nil {
 		t.Error("Could not write data into ratingDb: ", err.Error())
 	}

engine/model_helpers.go

@@ -714,3 +714,23 @@ func ValueOrDefault(val string, deflt string) string {
 	}
 	return val
 }
+
+type TpUsers []TpUser
+
+func (tps TpUsers) GetUsers() (map[string]*UserProfile, error) {
+	users := make(map[string]*UserProfile)
+	for _, tp := range tps {
+		var user *UserProfile
+		var found bool
+		if user, found = users[tp.GetId()]; !found {
+			user = &UserProfile{
+				Tenant:   tp.Tenant,
+				UserName: tp.UserName,
+				Profile:  make(map[string]string),
+			}
+			users[tp.GetId()] = user
+		}
+		user.Profile[tp.Attribute] = tp.Value
+	}
+	return users, nil
+}

engine/models.go

@@ -320,6 +320,19 @@ type TpCdrstat struct {
 	CreatedAt           time.Time
 }
 
+type TpUser struct {
+	Id        int64
+	Tpid      string
+	Tenant    string `index:"0" re:""`
+	UserName  string `index:"1" re:""`
+	Attribute string `index:"2" re:""`
+	Value     string `index:"3" re:""`
+}
+
+func (tu *TpUser) GetId() string {
+	return utils.ConcatenatedKey(tu.Tenant, tu.UserName)
+}
+
 type TblCdrsPrimary struct {
 	Id              int64
 	Cgrid           string

engine/storage_csv.go

@@ -15,26 +15,26 @@ type CSVStorage struct {
 	readerFunc func(string, rune, int) (*csv.Reader, *os.File, error)
 	// file names
 	destinationsFn, ratesFn, destinationratesFn, timingsFn, destinationratetimingsFn, ratingprofilesFn,
-	sharedgroupsFn, lcrFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn string
+	sharedgroupsFn, lcrFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn, usersFn string
 }
 
 func NewFileCSVStorage(sep rune,
 	destinationsFn, timingsFn, ratesFn, destinationratesFn, destinationratetimingsFn, ratingprofilesFn, sharedgroupsFn, lcrFn,
-	actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn string) *CSVStorage {
+	actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn, usersFn string) *CSVStorage {
 	c := new(CSVStorage)
 	c.sep = sep
 	c.readerFunc = openFileCSVStorage
 	c.destinationsFn, c.timingsFn, c.ratesFn, c.destinationratesFn, c.destinationratetimingsFn, c.ratingprofilesFn,
-		c.sharedgroupsFn, c.lcrFn, c.actionsFn, c.actiontimingsFn, c.actiontriggersFn, c.accountactionsFn, c.derivedChargersFn, c.cdrStatsFn = destinationsFn, timingsFn,
-		ratesFn, destinationratesFn, destinationratetimingsFn, ratingprofilesFn, sharedgroupsFn, lcrFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn
+		c.sharedgroupsFn, c.lcrFn, c.actionsFn, c.actiontimingsFn, c.actiontriggersFn, c.accountactionsFn, c.derivedChargersFn, c.cdrStatsFn, c.usersFn = destinationsFn, timingsFn,
+		ratesFn, destinationratesFn, destinationratetimingsFn, ratingprofilesFn, sharedgroupsFn, lcrFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn, usersFn
 	return c
 }
 
 func NewStringCSVStorage(sep rune,
 	destinationsFn, timingsFn, ratesFn, destinationratesFn, destinationratetimingsFn, ratingprofilesFn, sharedgroupsFn, lcrFn,
-	actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn string) *CSVStorage {
+	actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn, usersFn string) *CSVStorage {
 	c := NewFileCSVStorage(sep, destinationsFn, timingsFn, ratesFn, destinationratesFn, destinationratetimingsFn,
-		ratingprofilesFn, sharedgroupsFn, lcrFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn)
+		ratingprofilesFn, sharedgroupsFn, lcrFn, actionsFn, actiontimingsFn, actiontriggersFn, accountactionsFn, derivedChargersFn, cdrStatsFn, usersFn)
 	c.readerFunc = openStringCSVStorage
 	return c
 }
@@ -458,6 +458,34 @@ func (csvs *CSVStorage) GetTpCdrStats(tpid, tag string) ([]TpCdrstat, error) {
 	return tpCdrStats, nil
 }
 
+func (csvs *CSVStorage) GetTpUsers(filter *TpUser) ([]TpUser, error) {
+	csvReader, fp, err := csvs.readerFunc(csvs.usersFn, csvs.sep, getColumnCount(TpUser{}))
+	if err != nil {
+		log.Print("Could not load users file: ", err)
+		// allow writing of the other values
+		return nil, nil
+	}
+	if fp != nil {
+		defer fp.Close()
+	}
+	var tpUsers []TpUser
+	for record, err := csvReader.Read(); err != io.EOF; record, err = csvReader.Read() {
+		if err != nil {
+			log.Print("bad line in users csv: ", err)
+			return nil, err
+		}
+		if tpUser, err := csvLoad(TpUser{}, record); err != nil {
+			log.Print("error loading user: ", err)
+			return nil, err
+		} else {
+			u := tpUser.(TpUser)
+			u.Tpid = filter.Tpid
+			tpUsers = append(tpUsers, u)
+		}
+	}
+	return tpUsers, nil
+}
+
 func (csvs *CSVStorage) GetTpIds() ([]string, error) {
 	return nil, utils.ErrNotImplemented
 }

engine/storage_interface.go

@@ -71,6 +71,9 @@ type RatingStorage interface {
 	SetAccAlias(string, string) error
 	RemoveAccAliases([]*TenantAccount) error
 	GetAccountAliases(string, string, bool) ([]string, error)
+	SetUser(*UserProfile) error
+	GetUser(string) (*UserProfile, error)
+	RemoveUser(string) error
 }
 
 type AccountingStorage interface {
@@ -119,6 +122,7 @@ type LoadReader interface {
 	GetTpRatingProfiles(*TpRatingProfile) ([]TpRatingProfile, error)
 	GetTpSharedGroups(string, string) ([]TpSharedGroup, error)
 	GetTpCdrStats(string, string) ([]TpCdrstat, error)
+	GetTpUsers(*TpUser) ([]TpUser, error)
 	GetTpDerivedChargers(*TpDerivedCharger) ([]TpDerivedCharger, error)
 	GetTpLCRs(string, string) ([]TpLcrRule, error)
 	GetTpActions(string, string) ([]TpAction, error)
@@ -137,6 +141,7 @@ type LoadWriter interface {
 	SetTpRatingProfiles([]TpRatingProfile) error
 	SetTpSharedGroups([]TpSharedGroup) error
 	SetTpCdrStats([]TpCdrstat) error
+	SetTpUsers([]TpUser) error
 	SetTpDerivedChargers([]TpDerivedCharger) error
 	SetTpLCRs([]TpLcrRule) error
 	SetTpActions([]TpAction) error

engine/storage_map.go

@@ -584,6 +584,28 @@ func (ms *MapStorage) RemoveSubscriber(key string) (err error) {
 	return
 }
 
+func (ms *MapStorage) SetUser(up *UserProfile) error {
+	result, err := ms.ms.Marshal(up)
+	if err != nil {
+		return err
+	}
+	ms.dict[utils.USERS_PREFIX+up.GetId()] = result
+	return nil
+}
+func (ms *MapStorage) GetUser(key string) (up *UserProfile, err error) {
+	up = &UserProfile{}
+	if values, ok := ms.dict[utils.USERS_PREFIX+key]; ok {
+		err = ms.ms.Unmarshal(values, &up)
+	} else {
+		return nil, utils.ErrNotFound
+	}
+	return
+}
+func (ms *MapStorage) RemoveUser(key string) error {
+	delete(ms.dict, utils.USERS_PREFIX+key)
+	return nil
+}
+
 func (ms *MapStorage) GetActionPlans(key string) (ats ActionPlans, err error) {
 	if values, ok := ms.dict[utils.ACTION_TIMING_PREFIX+key]; ok {
 		err = ms.ms.Unmarshal(values, &ats)

engine/storage_redis.go

@@ -707,6 +707,15 @@ func (rs *RedisStorage) GetSubscribers() (result map[string]*SubscriberData, err
 	return
 }
 
+func (rs *RedisStorage) GetUser(key string) (up *UserProfile, err error) {
+	var values []byte
+	if values, err = rs.db.Get(utils.USERS_PREFIX + key); err == nil {
+		up = &UserProfile{}
+		err = rs.ms.Unmarshal(values, &up)
+	}
+	return
+}
+
 func (rs *RedisStorage) SetSubscriber(key string, sub *SubscriberData) (err error) {
 	result, err := rs.ms.Marshal(sub)
 	rs.db.Set(utils.PUBSUB_SUBSCRIBERS_PREFIX+key, result)
@@ -718,6 +727,17 @@ func (rs *RedisStorage) RemoveSubscriber(key string) (err error) {
 	return
 }
 
+func (rs *RedisStorage) SetUser(up *UserProfile) (err error) {
+	result, err := rs.ms.Marshal(up)
+	rs.db.Set(utils.USERS_PREFIX+up.GetId(), result)
+	return
+}
+
+func (rs *RedisStorage) RemoveUser(key string) (err error) {
+	rs.db.Del(utils.USERS_PREFIX + key)
+	return
+}
+
 func (rs *RedisStorage) GetActionPlans(key string) (ats ActionPlans, err error) {
 	var values []byte
 	if values, err = rs.db.Get(utils.ACTION_TIMING_PREFIX + key); err == nil {

engine/storage_sql.go

@@ -1311,3 +1311,44 @@ func (self *SQLStorage) GetTpCdrStats(tpid, tag string) ([]TpCdrstat, error) {
 
 	return tpCdrStats, nil
 }
+
+func (self *SQLStorage) SetTpUsers(users []TpUser) error {
+	if len(users) == 0 {
+		return nil
+	}
+	m := make(map[string]bool)
+
+	tx := self.db.Begin()
+	for _, user := range users {
+		if found, _ := m[user.GetId()]; !found {
+			m[user.GetId()] = true
+			if err := tx.Where(&TpUser{Tpid: user.Tpid, Tenant: user.Tenant, UserName: user.UserName}).Delete(TpUser{}).Error; err != nil {
+				tx.Rollback()
+				return err
+			}
+		}
+		save := tx.Save(&user)
+		if save.Error != nil {
+			tx.Rollback()
+			return save.Error
+		}
+	}
+	tx.Commit()
+	return nil
+}
+
+func (self *SQLStorage) GetTpUsers(filter *TpUser) ([]TpUser, error) {
+	var tpUsers []TpUser
+	q := self.db.Where("tpid = ?", filter.Tpid)
+	if len(filter.Tenant) != 0 {
+		q = q.Where("tenant = ?", filter.Tenant)
+	}
+	if len(filter.UserName) != 0 {
+		q = q.Where("user_name = ?", filter.UserName)
+	}
+	if err := q.Find(&tpUsers).Error; err != nil {
+		return nil, err
+	}
+
+	return tpUsers, nil
+}

engine/tp_reader.go

@@ -33,6 +33,7 @@ type TpReader struct {
 	lcrs              map[string]*LCR
 	derivedChargers   map[string]utils.DerivedChargers
 	cdrStats          map[string]*CdrStats
+	users             map[string]*UserProfile
 }
 
 func NewTpReader(rs RatingStorage, as AccountingStorage, lr LoadReader, tpid string) *TpReader {
@@ -56,6 +57,7 @@ func NewTpReader(rs RatingStorage, as AccountingStorage, lr LoadReader, tpid str
 		accAliases:        make(map[string]string),
 		accountActions:    make(map[string]*Account),
 		cdrStats:          make(map[string]*CdrStats),
+		users:             make(map[string]*UserProfile),
 		derivedChargers:   make(map[string]utils.DerivedChargers),
 	}
 	//add *any and *asap timing tag (in case of no timings file)
@@ -1050,6 +1052,30 @@ func (tpr *TpReader) LoadCdrStats() error {
 	return tpr.LoadCdrStatsFiltered("", false)
 }
 
+func (tpr *TpReader) LoadUsersFiltered(filter *TpUser) (bool, error) {
+	tpUsers, err := tpr.lr.GetTpUsers(filter)
+
+	user := &UserProfile{
+		Tenant:   filter.Tenant,
+		UserName: filter.UserName,
+		Profile:  make(map[string]string),
+	}
+	for _, tpUser := range tpUsers {
+		user.Profile[tpUser.Attribute] = tpUser.Value
+	}
+	tpr.ratingStorage.SetUser(user)
+	return len(tpUsers) > 0, err
+}
+
+func (tpr *TpReader) LoadUsers() error {
+	tps, err := tpr.lr.GetTpUsers(&TpUser{Tpid: tpr.tpid})
+	if err != nil {
+		return err
+	}
+	tpr.users, err = TpUsers(tps).GetUsers()
+	return err
+}
+
 func (tpr *TpReader) LoadAll() error {
 	var err error
 	if err = tpr.LoadDestinations(); err != nil {
@@ -1094,6 +1120,9 @@ func (tpr *TpReader) LoadAll() error {
 	if err = tpr.LoadCdrStats(); err != nil {
 		return err
 	}
+	if err = tpr.LoadUsers(); err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -1273,6 +1302,18 @@ func (tpr *TpReader) WriteToDatabase(flush, verbose bool) (err error) {
 			log.Print("\t", sq.Id)
 		}
 	}
+	if verbose {
+		log.Print("Users:")
+	}
+	for _, u := range tpr.users {
+		err = tpr.ratingStorage.SetUser(u)
+		if err != nil {
+			return err
+		}
+		if verbose {
+			log.Print("\t", u.GetId())
+		}
+	}
 	return
 }
 

engine/tpimporter_csv.go

@@ -54,6 +54,7 @@ var fileHandlers = map[string]func(*TPCSVImporter, string) error{
 	utils.ACCOUNT_ACTIONS_CSV:   (*TPCSVImporter).importAccountActions,
 	utils.DERIVED_CHARGERS_CSV:  (*TPCSVImporter).importDerivedChargers,
 	utils.CDR_STATS_CSV:         (*TPCSVImporter).importCdrStats,
+	utils.USERS_CSV:             (*TPCSVImporter).importUsers,
 }
 
 func (self *TPCSVImporter) Run() error {
@@ -71,7 +72,8 @@ func (self *TPCSVImporter) Run() error {
 		path.Join(self.DirPath, utils.ACTION_TRIGGERS_CSV),
 		path.Join(self.DirPath, utils.ACCOUNT_ACTIONS_CSV),
 		path.Join(self.DirPath, utils.DERIVED_CHARGERS_CSV),
-		path.Join(self.DirPath, utils.CDR_STATS_CSV))
+		path.Join(self.DirPath, utils.CDR_STATS_CSV),
+		path.Join(self.DirPath, utils.USERS_CSV))
 	files, _ := ioutil.ReadDir(self.DirPath)
 	for _, f := range files {
 		fHandler, hasName := fileHandlers[f.Name()]
@@ -295,3 +297,18 @@ func (self *TPCSVImporter) importCdrStats(fn string) error {
 
 	return self.StorDb.SetTpCdrStats(tps)
 }
+
+func (self *TPCSVImporter) importUsers(fn string) error {
+	if self.Verbose {
+		log.Printf("Processing file: <%s> ", fn)
+	}
+	tps, err := self.csvr.GetTpUsers(nil)
+	if err != nil {
+		return err
+	}
+	for i := 0; i < len(tps); i++ {
+		tps[i].Tpid = self.TPid
+	}
+
+	return self.StorDb.SetTpUsers(tps)
+}

engine/users.go

@@ -1,4 +1,4 @@
-package users
+package engine
 
 import (
 	"strings"

engine/users_test.go

@@ -1,4 +1,4 @@
-package users
+package engine
 
 import (
 	"testing"

general_tests/acntacts_test.go

@@ -52,8 +52,9 @@ ENABLE_ACNT,*enable_account,,,,,,,,,,,,,10`
 	accountActions := `cgrates.org,1,*out,TOPUP10_AT,`
 	derivedCharges := ``
 	cdrStats := ``
+	users := ``
 	csvr := engine.NewTpReader(ratingDbAcntActs, acntDbAcntActs, engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats), "")
+		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users), "")
 	if err := csvr.LoadAll(); err != nil {
 		t.Fatal(err)
 	}

general_tests/costs1_test.go

@@ -54,7 +54,7 @@ RP_SMS1,DR_SMS_1,ALWAYS,10`
 *out,cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,,
 *out,cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,,`
 	csvr := engine.NewTpReader(ratingDb, acntDb, engine.NewStringCSVStorage(',', dests, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		"", "", "", "", "", "", "", ""), "")
+		"", "", "", "", "", "", "", "", ""), "")
 
 	if err := csvr.LoadTimings(); err != nil {
 		t.Fatal(err)

general_tests/datachrg1_test.go

@@ -45,7 +45,7 @@ DR_DATA_2,*any,RT_DATA_1c,*up,4,0,`
 RP_DATA1,DR_DATA_2,TM2,10`
 	ratingProfiles := `*out,cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,,`
 	csvr := engine.NewTpReader(ratingDb, acntDb, engine.NewStringCSVStorage(',', "", timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		"", "", "", "", "", "", "", ""), "")
+		"", "", "", "", "", "", "", "", ""), "")
 	if err := csvr.LoadTimings(); err != nil {
 		t.Fatal(err)
 	}

general_tests/ddazmbl1_test.go

@@ -61,8 +61,9 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
 	accountActions := `cgrates.org,12344,*out,TOPUP10_AT,`
 	derivedCharges := ``
 	cdrStats := ``
+	users := ``
 	csvr := engine.NewTpReader(ratingDb, acntDb, engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats), "")
+		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users), "")
 	if err := csvr.LoadDestinations(); err != nil {
 		t.Fatal(err)
 	}

general_tests/ddazmbl2_test.go

@@ -61,8 +61,9 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10`
 	accountActions := `cgrates.org,12345,*out,TOPUP10_AT,`
 	derivedCharges := ``
 	cdrStats := ``
+	users := ``
 	csvr := engine.NewTpReader(ratingDb2, acntDb2, engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats), "")
+		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users), "")
 	if err := csvr.LoadDestinations(); err != nil {
 		t.Fatal(err)
 	}

general_tests/ddazmbl3_test.go

@@ -59,8 +59,9 @@ RP_UK,DR_UK_Mobile_BIG5,ALWAYS,10`
 	accountActions := `cgrates.org,12346,*out,TOPUP10_AT,`
 	derivedCharges := ``
 	cdrStats := ``
+	users := ``
 	csvr := engine.NewTpReader(ratingDb3, acntDb3, engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats), "")
+		sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users), "")
 	if err := csvr.LoadDestinations(); err != nil {
 		t.Fatal(err)
 	}

general_tests/smschrg1_test.go

@@ -41,7 +41,7 @@ func TestSMSLoadCsvTpSmsChrg1(t *testing.T) {
 	ratingPlans := `RP_SMS1,DR_SMS_1,ALWAYS,10`
 	ratingProfiles := `*out,cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,,`
 	csvr := engine.NewTpReader(ratingDb, acntDb, engine.NewStringCSVStorage(',', "", timings, rates, destinationRates, ratingPlans, ratingProfiles,
-		"", "", "", "", "", "", "", ""), "")
+		"", "", "", "", "", "", "", "", ""), "")
 	if err := csvr.LoadTimings(); err != nil {
 		t.Fatal(err)
 	}

utils/consts.go

@@ -77,6 +77,7 @@ const (
 	ACCOUNT_ACTIONS_CSV        = "AccountActions.csv"
 	DERIVED_CHARGERS_CSV       = "DerivedChargers.csv"
 	CDR_STATS_CSV              = "CdrStats.csv"
+	USERS_CSV                  = "Users.csv"
 	ROUNDING_UP                = "*up"
 	ROUNDING_MIDDLE            = "*middle"
 	ROUNDING_DOWN              = "*down"
@@ -167,6 +168,7 @@ const (
 	DERIVEDCHARGERS_PREFIX     = "dcs_"
 	CDR_STATS_QUEUE_PREFIX     = "csq_"
 	PUBSUB_SUBSCRIBERS_PREFIX  = "pss_"
+	USERS_PREFIX               = "usr_"
 	CDR_STATS_PREFIX           = "cst_"
 	TEMP_DESTINATION_PREFIX    = "tmp_"
 	LOG_CALL_COST_PREFIX       = "cco_"