diff --git a/apis/account.go b/apis/account.go index aac4c846a..a7d7f6bac 100644 --- a/apis/account.go +++ b/apis/account.go @@ -52,7 +52,9 @@ func (admS *AdminSv1) GetAccountIDs(ctx *context.Context, args *utils.ArgsItemID if tnt == utils.EmptyString { tnt = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.AccountPrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.AccountPrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -62,7 +64,7 @@ func (admS *AdminSv1) GetAccountIDs(ctx *context.Context, args *utils.ArgsItemID } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/actions.go b/apis/actions.go index d81475c4c..8c73731e3 100644 --- a/apis/actions.go +++ b/apis/actions.go @@ -53,7 +53,9 @@ func (admS *AdminSv1) GetActionProfileIDs(ctx *context.Context, args *utils.Args if tnt == utils.EmptyString { tnt = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.ActionProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.ActionProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -63,7 +65,7 @@ func (admS *AdminSv1) GetActionProfileIDs(ctx *context.Context, args *utils.Args } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/attributes.go b/apis/attributes.go index d5775e3d0..0139d2fdb 100644 --- a/apis/attributes.go +++ b/apis/attributes.go @@ -53,7 +53,9 @@ func (admS *AdminSv1) GetAttributeProfileIDs(ctx *context.Context, args *utils.A if tnt == utils.EmptyString { tnt = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.AttributeProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.AttributeProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -63,7 +65,7 @@ func (admS *AdminSv1) GetAttributeProfileIDs(ctx *context.Context, args *utils.A } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/chargers.go b/apis/chargers.go index f540242b7..6555de61f 100644 --- a/apis/chargers.go +++ b/apis/chargers.go @@ -50,7 +50,9 @@ func (adms *AdminSv1) GetChargerProfileIDs(ctx *context.Context, args *utils.Arg if tnt == utils.EmptyString { tnt = adms.cfg.GeneralCfg().DefaultTenant } - prfx := utils.ChargerProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.ChargerProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = adms.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -60,7 +62,7 @@ func (adms *AdminSv1) GetChargerProfileIDs(ctx *context.Context, args *utils.Arg } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { @@ -77,7 +79,7 @@ func (admS *AdminSv1) GetChargerProfileCount(ctx *context.Context, args *utils.A if tnt == utils.EmptyString { tnt = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.ChargerProfilePrefix + tnt + utils.ConcatenatedKeySep + prfx := utils.ChargerProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return err diff --git a/apis/dispatchers.go b/apis/dispatchers.go index 0f6a0c044..12bcc1054 100644 --- a/apis/dispatchers.go +++ b/apis/dispatchers.go @@ -49,7 +49,9 @@ func (admS *AdminSv1) GetDispatcherProfileIDs(ctx *context.Context, args *utils. if tnt == utils.EmptyString { tnt = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.DispatcherProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.DispatcherProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -66,7 +68,7 @@ func (admS *AdminSv1) GetDispatcherProfileIDs(ctx *context.Context, args *utils. } *dPrfIDs = make([]string, len(keys)) for i, key := range keys { - (*dPrfIDs)[i] = key[len(prfx):] + (*dPrfIDs)[i] = key[lenPrfx:] } return } @@ -163,12 +165,14 @@ func (admS *AdminSv1) GetDispatcherHost(ctx *context.Context, arg *utils.TenantI } // GetDispatcherHostIDs returns list of dispatcherHost IDs registered for a tenant -func (admS *AdminSv1) GetDispatcherHostIDs(ctx *context.Context, tenantArg *utils.ArgsItemIDs, dPrfIDs *[]string) (err error) { - tenant := tenantArg.Tenant +func (admS *AdminSv1) GetDispatcherHostIDs(ctx *context.Context, args *utils.ArgsItemIDs, dPrfIDs *[]string) (err error) { + tenant := args.Tenant if tenant == utils.EmptyString { tenant = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.DispatcherHostPrefix + tenant + utils.ConcatenatedKeySep + tenantArg.ItemsPrefix + prfx := utils.DispatcherHostPrefix + tenant + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return err @@ -177,7 +181,7 @@ func (admS *AdminSv1) GetDispatcherHostIDs(ctx *context.Context, tenantArg *util return utils.ErrNotFound } var limit, offset, maxItems int - if limit, offset, maxItems, err = utils.GetPaginateOpts(tenantArg.APIOpts); err != nil { + if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { return } if keys, err = utils.Paginate(keys, limit, offset, maxItems); err != nil { @@ -185,7 +189,7 @@ func (admS *AdminSv1) GetDispatcherHostIDs(ctx *context.Context, tenantArg *util } *dPrfIDs = make([]string, len(keys)) for i, key := range keys { - (*dPrfIDs)[i] = key[len(prfx):] + (*dPrfIDs)[i] = key[lenPrfx:] } return } diff --git a/apis/rates.go b/apis/rates.go index d2141a063..62bc4b4b1 100644 --- a/apis/rates.go +++ b/apis/rates.go @@ -53,7 +53,9 @@ func (admS *AdminSv1) GetRateProfileIDs(ctx *context.Context, args *utils.ArgsIt if tnt == utils.EmptyString { tnt = admS.cfg.GeneralCfg().DefaultTenant } - prfx := utils.RateProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.RateProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = admS.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -63,7 +65,7 @@ func (admS *AdminSv1) GetRateProfileIDs(ctx *context.Context, args *utils.ArgsIt } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/resources.go b/apis/resources.go index 1b2d080d3..c05567c2e 100644 --- a/apis/resources.go +++ b/apis/resources.go @@ -49,7 +49,9 @@ func (adms *AdminSv1) GetResourceProfileIDs(ctx *context.Context, args *utils.Ar if tnt == utils.EmptyString { tnt = adms.cfg.GeneralCfg().DefaultTenant } - prfx := utils.ResourceProfilesPrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.ResourceProfilesPrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = adms.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -59,7 +61,7 @@ func (adms *AdminSv1) GetResourceProfileIDs(ctx *context.Context, args *utils.Ar } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/routes.go b/apis/routes.go index 71def75ec..adb6c347d 100644 --- a/apis/routes.go +++ b/apis/routes.go @@ -49,7 +49,9 @@ func (adms *AdminSv1) GetRouteProfileIDs(ctx *context.Context, args *utils.ArgsI if tnt == utils.EmptyString { tnt = adms.cfg.GeneralCfg().DefaultTenant } - prfx := utils.RouteProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.RouteProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = adms.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -59,7 +61,7 @@ func (adms *AdminSv1) GetRouteProfileIDs(ctx *context.Context, args *utils.ArgsI } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/stats.go b/apis/stats.go index 71449a5ef..75a775f50 100644 --- a/apis/stats.go +++ b/apis/stats.go @@ -49,7 +49,9 @@ func (adms *AdminSv1) GetStatQueueProfileIDs(ctx *context.Context, args *utils.A if tnt == utils.EmptyString { tnt = adms.cfg.GeneralCfg().DefaultTenant } - prfx := utils.StatQueueProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.StatQueueProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = adms.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -59,7 +61,7 @@ func (adms *AdminSv1) GetStatQueueProfileIDs(ctx *context.Context, args *utils.A } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil { diff --git a/apis/thresholds.go b/apis/thresholds.go index 5b8b883ea..47ee3d0b8 100644 --- a/apis/thresholds.go +++ b/apis/thresholds.go @@ -49,7 +49,9 @@ func (adms *AdminSv1) GetThresholdProfileIDs(ctx *context.Context, args *utils.A if tnt == utils.EmptyString { tnt = adms.cfg.GeneralCfg().DefaultTenant } - prfx := utils.ThresholdProfilePrefix + tnt + utils.ConcatenatedKeySep + args.ItemsPrefix + prfx := utils.ThresholdProfilePrefix + tnt + utils.ConcatenatedKeySep + lenPrfx := len(prfx) + prfx += args.ItemsPrefix var keys []string if keys, err = adms.dm.DataDB().GetKeysForPrefix(ctx, prfx); err != nil { return @@ -59,7 +61,7 @@ func (adms *AdminSv1) GetThresholdProfileIDs(ctx *context.Context, args *utils.A } retIDs := make([]string, len(keys)) for i, key := range keys { - retIDs[i] = key[len(prfx):] + retIDs[i] = key[lenPrfx:] } var limit, offset, maxItems int if limit, offset, maxItems, err = utils.GetPaginateOpts(args.APIOpts); err != nil {