uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Postgresql table creation fix for aliases, RemRatingProfile fix on Tenant name

Browse Source
This commit is contained in:
DanB
2015-08-19 13:52:36 +02:00
parent 68f6b10be9
commit d782bb9bdb
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apier/v1/apier.go
View File

@@ -1128,7 +1128,7 @@ func (self *ApierV1) LoadTariffPlanFromFolder(attrs utils.AttrLoadTpFromFolder,
type AttrRemoveRatingProfile struct {
Direction string
Tennat string
Tenant string
Category string
Subject string
}
@@ -1140,8 +1140,8 @@ func (arrp *AttrRemoveRatingProfile) GetId() (result string) {
} else {
return
}
if arrp.Tennat != "" && arrp.Tennat != utils.ANY {
result += arrp.Tennat
if arrp.Tenant != "" && arrp.Tenant != utils.ANY {
result += arrp.Tenant
result += utils.CONCATENATED_KEY_SEP
} else {
return
@@ -1160,14 +1160,13 @@ func (arrp *AttrRemoveRatingProfile) GetId() (result string) {
}
func (self *ApierV1) RemoveRatingProfile(attr AttrRemoveRatingProfile, reply *string) error {
if attr.Subject != "" && attr.Category == "" {
return fmt.Errorf("%s:%s", utils.ErrMandatoryIeMissing.Error(), "Category")
if attr.Direction == "" {
attr.Direction = utils.OUT
}
if attr.Category != "" && attr.Tennat == "" {
return fmt.Errorf("%s:%s", utils.ErrMandatoryIeMissing.Error(), "Tenant")
}
if attr.Tennat != "" && attr.Direction == "" {
return fmt.Errorf("%s:%s", utils.ErrMandatoryIeMissing.Error(), "Direction")
if (attr.Subject != "" && utils.IsSliceMember([]string{attr.Direction, attr.Tenant, attr.Category}, "")) ||
(attr.Category != "" && utils.IsSliceMember([]string{attr.Direction, attr.Tenant}, "")) ||
attr.Tenant != "" && attr.Direction == "" {
return utils.ErrMandatoryIeMissing
}
_, err := engine.Guardian.Guard(func() (interface{}, error) {
err := self.RatingDb.RemoveRatingProfile(attr.GetId())

26
data/storage/postgres/create_tariffplan_tables.sql
View File

@@ -355,18 +355,18 @@ CREATE INDEX tpusers_idx ON tp_users (tpid,tenant,user_name);
DROP TABLE IF EXISTS tp_aliases;
CREATE TABLE tp_aliases (
`id` SERIAL PRIMARY KEY,
`tpid` VARCHAR(64) NOT NULL,
`direction` VARCHAR(8) NOT NULL,
`tenant` VARCHAR(64) NOT NULL,
`category` VARCHAR(32) NOT NULL,
`account` VARCHAR(64) NOT NULL,
`subject` VARCHAR(64) NOT NULL,
`group` VARCHAR(64) NOT NULL,
`destionation_id` VARCHAR(64) NOT NULL,
`alias` VARCHAR(64) NOT NULL,
`weight` NUMERIC(8,2) NOT NULL,
`created_at` TIMESTAMP
"id" SERIAL PRIMARY KEY,
"tpid" VARCHAR(64) NOT NULL,
"direction" VARCHAR(8) NOT NULL,
"tenant" VARCHAR(64) NOT NULL,
"category" VARCHAR(32) NOT NULL,
"account" VARCHAR(64) NOT NULL,
"subject" VARCHAR(64) NOT NULL,
"group" VARCHAR(64) NOT NULL,
"destionation_id" VARCHAR(64) NOT NULL,
"alias" VARCHAR(64) NOT NULL,
"weight" NUMERIC(8,2) NOT NULL,
"created_at" TIMESTAMP
);
CREATE INDEX tpaliases_tpid_idx ON tp_aliases (tpid);
CREATE INDEX tpaliases_idx ON tp_aliases (`tpid`,`direction`,`tenant,category`,`account`,`subject`,`group`);
CREATE INDEX tpaliases_idx ON tp_aliases ("tpid","direction","tenant","category","account","subject","group");