diff --git a/apier/v1/tpactionprofiles.go b/apier/v1/tpactionprofiles.go index 7b316e017..bb3466431 100644 --- a/apier/v1/tpactionprofiles.go +++ b/apier/v1/tpactionprofiles.go @@ -24,9 +24,13 @@ import ( // SetTPActionProfile creates a new TPActionProfile within a tariff plan func (apierSv1 *APIerSv1) SetTPActionProfile(attrs *utils.TPActionProfile, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attrs.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } if err := apierSv1.StorDb.SetTPActionProfiles([]*utils.TPActionProfile{attrs}); err != nil { return utils.NewErrServerError(err) } @@ -36,9 +40,13 @@ func (apierSv1 *APIerSv1) SetTPActionProfile(attrs *utils.TPActionProfile, reply // GetTPActionProfile queries specific TPActionProfile on tariff plan func (apierSv1 *APIerSv1) GetTPActionProfile(attr *utils.TPTntID, reply *utils.TPActionProfile) error { - if missing := utils.MissingStructFields(attr, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attr, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attr.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } spp, err := apierSv1.StorDb.GetTPActionProfiles(attr.TPid, attr.Tenant, attr.ID) if err != nil { if err.Error() != utils.ErrNotFound.Error() { @@ -57,7 +65,7 @@ type AttrGetTPActionProfileIDs struct { // GetTPRouteProfileIDs queries TPActionProfiles identities on specific tariff plan. func (apierSv1 *APIerSv1) GetTPActionProfileIDs(attrs *AttrGetTPActionProfileIDs, reply *[]string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := apierSv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPActionProfiles, @@ -74,11 +82,15 @@ func (apierSv1 *APIerSv1) GetTPActionProfileIDs(attrs *AttrGetTPActionProfileIDs // RemoveTPActionProfile removes specific TPActionProfile on Tariff plan func (apierSv1 *APIerSv1) RemoveTPActionProfile(attrs *utils.TPTntID, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.Tenant, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attrs.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } if err := apierSv1.StorDb.RemTpData(utils.TBLTPActionProfiles, attrs.TPid, - map[string]string{"tenant": attrs.Tenant, "id": attrs.ID}); err != nil { + map[string]string{utils.TenantCfg: attrs.Tenant, utils.IDCfg: attrs.ID}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK diff --git a/apier/v1/tpactions.go b/apier/v1/tpactions.go index 0d5745bfd..fcdacc1c9 100644 --- a/apier/v1/tpactions.go +++ b/apier/v1/tpactions.go @@ -24,7 +24,7 @@ import ( // SetTPActions creates a new Actions profile within a tariff plan func (apierSv1 *APIerSv1) SetTPActions(attrs *utils.TPActions, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID", "Actions"}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID, utils.Actions}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } if err := apierSv1.StorDb.SetTPActions([]*utils.TPActions{attrs}); err != nil { @@ -41,7 +41,7 @@ type AttrGetTPActions struct { // GetTPActions queries specific Actions profile on tariff plan func (apierSv1 *APIerSv1) GetTPActions(attrs *AttrGetTPActions, reply *utils.TPActions) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } as, err := apierSv1.StorDb.GetTPActions(attrs.TPid, attrs.ID) @@ -62,11 +62,11 @@ type AttrGetTPActionIds struct { // GetTPActionIds queries Actions identities on specific tariff plan. func (apierSv1 *APIerSv1) GetTPActionIds(attrs *AttrGetTPActionIds, reply *[]string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := apierSv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPActions, - utils.TPDistinctIds{"tag"}, nil, &attrs.PaginatorWithSearch) + utils.TPDistinctIds{utils.TagCfg}, nil, &attrs.PaginatorWithSearch) if err != nil { if err.Error() != utils.ErrNotFound.Error() { err = utils.NewErrServerError(err) @@ -79,11 +79,11 @@ func (apierSv1 *APIerSv1) GetTPActionIds(attrs *AttrGetTPActionIds, reply *[]str // RemoveTPActions removes specific Actions on Tariff plan func (apierSv1 *APIerSv1) RemoveTPActions(attrs *AttrGetTPActions, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } if err := apierSv1.StorDb.RemTpData(utils.TBLTPActions, - attrs.TPid, map[string]string{"tag": attrs.ID}); err != nil { + attrs.TPid, map[string]string{utils.TagCfg: attrs.ID}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK diff --git a/apier/v1/tpactiontriggers.go b/apier/v1/tpactiontriggers.go index fd7d40009..6102e4dd1 100644 --- a/apier/v1/tpactiontriggers.go +++ b/apier/v1/tpactiontriggers.go @@ -24,7 +24,7 @@ import ( // SetTPActionTriggers creates a new ActionTriggers profile within a tariff plan func (apierSv1 *APIerSv1) SetTPActionTriggers(attrs *utils.TPActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } if err := apierSv1.StorDb.SetTPActionTriggers([]*utils.TPActionTriggers{attrs}); err != nil { @@ -42,7 +42,7 @@ type AttrGetTPActionTriggers struct { // GetTPActionTriggers queries specific ActionTriggers profile on tariff plan func (apierSv1 *APIerSv1) GetTPActionTriggers(attrs *AttrGetTPActionTriggers, reply *utils.TPActionTriggers) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ats, err := apierSv1.StorDb.GetTPActionTriggers(attrs.TPid, attrs.ID) @@ -64,11 +64,11 @@ type AttrGetTPActionTriggerIds struct { // GetTPActionTriggerIds queries ActionTriggers identities on specific tariff plan. func (apierSv1 *APIerSv1) GetTPActionTriggerIds(attrs *AttrGetTPActionTriggerIds, reply *[]string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := apierSv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPActionTriggers, - utils.TPDistinctIds{"tag"}, nil, &attrs.PaginatorWithSearch) + utils.TPDistinctIds{utils.TagCfg}, nil, &attrs.PaginatorWithSearch) if err != nil { if err.Error() != utils.ErrNotFound.Error() { err = utils.NewErrServerError(err) @@ -81,11 +81,11 @@ func (apierSv1 *APIerSv1) GetTPActionTriggerIds(attrs *AttrGetTPActionTriggerIds // RemoveTPActionTriggers removes specific ActionTriggers on Tariff plan func (apierSv1 *APIerSv1) RemoveTPActionTriggers(attrs *AttrGetTPActionTriggers, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } err := apierSv1.StorDb.RemTpData(utils.TBLTPActionTriggers, - attrs.TPid, map[string]string{"tag": attrs.ID}) + attrs.TPid, map[string]string{utils.TagCfg: attrs.ID}) if err != nil { return utils.NewErrServerError(err) } diff --git a/apier/v1/tpattributes.go b/apier/v1/tpattributes.go index 796674e3d..2fc402b64 100644 --- a/apier/v1/tpattributes.go +++ b/apier/v1/tpattributes.go @@ -24,9 +24,13 @@ import ( // SetTPAttributeProfile creates a new AttributeProfile within a tariff plan func (apierSv1 *APIerSv1) SetTPAttributeProfile(attrs *utils.TPAttributeProfile, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attrs.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } if err := apierSv1.StorDb.SetTPAttributes([]*utils.TPAttributeProfile{attrs}); err != nil { return utils.NewErrServerError(err) } @@ -36,9 +40,13 @@ func (apierSv1 *APIerSv1) SetTPAttributeProfile(attrs *utils.TPAttributeProfile, // GetTPAttributeProfile queries specific AttributeProfile on Tariff plan func (apierSv1 *APIerSv1) GetTPAttributeProfile(attr *utils.TPTntID, reply *utils.TPAttributeProfile) error { - if missing := utils.MissingStructFields(attr, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attr, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attr.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } als, err := apierSv1.StorDb.GetTPAttributes(attr.TPid, attr.Tenant, attr.ID) if err != nil { if err.Error() != utils.ErrNotFound.Error() { @@ -57,11 +65,11 @@ type AttrGetTPAttributeProfileIds struct { // GetTPAttributeProfileIds queries attribute identities on specific tariff plan. func (apierSv1 *APIerSv1) GetTPAttributeProfileIds(attrs *AttrGetTPAttributeProfileIds, reply *[]string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } ids, err := apierSv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPAttributes, - utils.TPDistinctIds{"tenant", "id"}, nil, &attrs.PaginatorWithSearch) + utils.TPDistinctIds{utils.TenantCfg, utils.IDCfg}, nil, &attrs.PaginatorWithSearch) if err != nil { return utils.NewErrServerError(err) } @@ -74,11 +82,15 @@ func (apierSv1 *APIerSv1) GetTPAttributeProfileIds(attrs *AttrGetTPAttributeProf // RemoveTPAttributeProfile removes specific AttributeProfile on Tariff plan func (apierSv1 *APIerSv1) RemoveTPAttributeProfile(attrs *utils.TPTntID, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attrs.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } if err := apierSv1.StorDb.RemTpData(utils.TBLTPAttributes, attrs.TPid, - map[string]string{"tenant": attrs.Tenant, "id": attrs.ID}); err != nil { + map[string]string{utils.TenantCfg: attrs.Tenant, utils.IDCfg: attrs.ID}); err != nil { return utils.NewErrServerError(err) } *reply = utils.OK diff --git a/apier/v1/tpchargers.go b/apier/v1/tpchargers.go index c79b7e4f9..c96c92ef5 100755 --- a/apier/v1/tpchargers.go +++ b/apier/v1/tpchargers.go @@ -24,9 +24,13 @@ import ( // SetTPCharger creates a new ChargerProfile within a tariff plan func (apierSv1 *APIerSv1) SetTPCharger(attr *utils.TPChargerProfile, reply *string) error { - if missing := utils.MissingStructFields(attr, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { + if missing := utils.MissingStructFields(attr, []string{utils.TPid, utils.ID}); len(missing) != 0 { return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attr.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } if err := apierSv1.StorDb.SetTPChargers([]*utils.TPChargerProfile{attr}); err != nil { return utils.APIErrorHandler(err) } @@ -36,9 +40,13 @@ func (apierSv1 *APIerSv1) SetTPCharger(attr *utils.TPChargerProfile, reply *stri // GetTPCharger queries specific ChargerProfile on Tariff plan func (apierSv1 *APIerSv1) GetTPCharger(attr *utils.TPTntID, reply *utils.TPChargerProfile) error { - if missing := utils.MissingStructFields(attr, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attr, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attr.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } rls, err := apierSv1.StorDb.GetTPChargers(attr.TPid, attr.Tenant, attr.ID) if err != nil { if err.Error() != utils.ErrNotFound.Error() { @@ -57,10 +65,10 @@ type AttrGetTPChargerIds struct { // GetTPChargerIDs queries Charger identities on specific tariff plan. func (apierSv1 *APIerSv1) GetTPChargerIDs(attrs *AttrGetTPChargerIds, reply *[]string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } - ids, err := apierSv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPChargers, utils.TPDistinctIds{"tenant", "id"}, + ids, err := apierSv1.StorDb.GetTpTableIds(attrs.TPid, utils.TBLTPChargers, utils.TPDistinctIds{utils.TenantCfg, utils.IDCfg}, nil, &attrs.PaginatorWithSearch) if err != nil { if err.Error() != utils.ErrNotFound.Error() { @@ -74,9 +82,13 @@ func (apierSv1 *APIerSv1) GetTPChargerIDs(attrs *AttrGetTPChargerIds, reply *[]s // RemoveTPCharger removes specific ChargerProfile on Tariff plan func (apierSv1 *APIerSv1) RemoveTPCharger(attrs *utils.TPTntID, reply *string) error { - if missing := utils.MissingStructFields(attrs, []string{"TPid", "Tenant", "ID"}); len(missing) != 0 { //Params missing + if missing := utils.MissingStructFields(attrs, []string{utils.TPid, utils.ID}); len(missing) != 0 { //Params missing return utils.NewErrMandatoryIeMissing(missing...) } + tnt := attrs.Tenant + if tnt == utils.EmptyString { + tnt = apierSv1.Config.GeneralCfg().DefaultTenant + } if err := apierSv1.StorDb.RemTpData(utils.TBLTPChargers, attrs.TPid, map[string]string{"tenant": attrs.Tenant, "id": attrs.ID}); err != nil { return utils.NewErrServerError(err)