From 0088a7f3ea61ce5a228d489f8bcc324505c3a23d Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Mon, 15 Feb 2021 17:58:19 +0200 Subject: [PATCH] Changed the weight field into db tables and csv --- data/storage/mysql/create_tariffplan_tables.sql | 8 ++++---- data/storage/postgres/create_tariffplan_tables.sql | 8 ++++---- data/tariffplans/testit/RateProfiles.csv | 8 ++++---- data/tariffplans/tutrates/RateProfiles.csv | 8 ++++---- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/storage/mysql/create_tariffplan_tables.sql b/data/storage/mysql/create_tariffplan_tables.sql index ad856e266..7745c1622 100644 --- a/data/storage/mysql/create_tariffplan_tables.sql +++ b/data/storage/mysql/create_tariffplan_tables.sql @@ -482,14 +482,14 @@ CREATE TABLE tp_rate_profiles ( `id` varchar(64) NOT NULL, `filter_ids` varchar(64) NOT NULL, `activation_interval` varchar(64) NOT NULL, - `weight` decimal(8,2) NOT NULL, + `weights` varchar(64) NOT NULL, `min_cost` decimal(8,4) NOT NULL, `max_cost` decimal(8,4) NOT NULL, `max_cost_strategy` varchar(64) NOT NULL, `rate_id` varchar(32) NOT NULL, `rate_filter_ids` varchar(64) NOT NULL, `rate_activation_times` varchar(64) NOT NULL, - `rate_weight` decimal(8,2) NOT NULL, + `rate_weights` varchar(64) NOT NULL, `rate_blocker` BOOLEAN NOT NULL, `rate_interval_start` varchar(64) NOT NULL, `rate_fixed_fee` decimal(8,4) NOT NULL, @@ -544,11 +544,11 @@ CREATE TABLE tp_account_profiles ( `id` varchar(64) NOT NULL, `filter_ids` varchar(64) NOT NULL, `activation_interval` varchar(64) NOT NULL, - `weights` decimal(8,2) NOT NULL, + `weights` varchar(64) NOT NULL, `opts` varchar(256) NOT NULL, `balance_id` varchar(64) NOT NULL, `balance_filter_ids` varchar(64) NOT NULL, - `balance_weights` decimal(8,2) NOT NULL, + `balance_weights` varchar(64) NOT NULL, `balance_type` varchar(64) NOT NULL, `balance_units` decimal(16,4) NOT NULL, `balance_unit_factors` varchar(64) NOT NULL, diff --git a/data/storage/postgres/create_tariffplan_tables.sql b/data/storage/postgres/create_tariffplan_tables.sql index a7447b8db..75c651c78 100644 --- a/data/storage/postgres/create_tariffplan_tables.sql +++ b/data/storage/postgres/create_tariffplan_tables.sql @@ -467,14 +467,14 @@ CREATE INDEX tp_routes_unique ON tp_routes ("tpid", "tenant", "id", "id" varchar(64) NOT NULL, "filter_ids" varchar(64) NOT NULL, "activation_interval" varchar(64) NOT NULL, - "weight" decimal(8,2) NOT NULL, + "weights" varchar(64) NOT NULL, "min_cost" decimal(8,4) NOT NULL, "max_cost" decimal(8,4) NOT NULL, "max_cost_strategy" VARCHAR(64) NOT NULL, "rate_id" VARCHAR(64) NOT NULL, "rate_filter_ids" VARCHAR(64) NOT NULL, "rate_activation_times" VARCHAR(64) NOT NULL, - "rate_weight" decimal(8,2) NOT NULL, + "rate_weights" varchar(64) NOT NULL, "rate_blocker" BOOLEAN NOT NULL, "rate_interval_start" VARCHAR(64) NOT NULL, "rate_fixed_fee" decimal(8,4) NOT NULL, @@ -527,11 +527,11 @@ CREATE TABLE tp_account_profiles ( "id" varchar(64) NOT NULL, "filter_ids" varchar(64) NOT NULL, "activation_interval" varchar(64) NOT NULL, - "weights" decimal(8,2) NOT NULL, + "weights" varchar(64) NOT NULL, "opts" varchar(256) NOT NULL, "balance_id" varchar(64) NOT NULL, "balance_filter_ids" varchar(64) NOT NULL, - "balance_weights" decimal(8,2) NOT NULL, + "balance_weights" varchar(64) NOT NULL, "balance_type" varchar(64) NOT NULL, "balance_units" decimal(16,4) NOT NULL, "balance_unit_factors" varchar(64) NOT NULL, diff --git a/data/tariffplans/testit/RateProfiles.csv b/data/tariffplans/testit/RateProfiles.csv index 01d02e0d7..353008802 100644 --- a/data/tariffplans/testit/RateProfiles.csv +++ b/data/tariffplans/testit/RateProfiles.csv @@ -1,5 +1,5 @@ -#Tenant,ID,FilterIDs,ActivationInterval,Weight,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeight,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement -cgrates.org,RT_SPECIAL_1002,*string:~*req.Account:1002,,10,0,0,*free,RT_ALWAYS,,"* * * * *",0,false,0s,,0.01,1m,1s -cgrates.org,RT_RETAIL1,,,0,0,0,*free,RT_ALWAYS,,"* * * * *",0,false,0s,,0.4,1m,30s -cgrates.org,RT_RETAIL1,,,,,,,RT_ALWAYS,,"* * * * *",0,false,1m,,0.2,1m,10s +#Tenant,ID,FilterIDs,ActivationInterval,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement +cgrates.org,RT_SPECIAL_1002,*string:~*req.Account:1002,,;10,0,0,*free,RT_ALWAYS,,"* * * * *",;0,false,0s,,0.01,1m,1s +cgrates.org,RT_RETAIL1,,,;0,0,0,*free,RT_ALWAYS,,"* * * * *",;0,false,0s,,0.4,1m,30s +cgrates.org,RT_RETAIL1,,,,,,,RT_ALWAYS,,"* * * * *",;0,false,1m,,0.2,1m,10s diff --git a/data/tariffplans/tutrates/RateProfiles.csv b/data/tariffplans/tutrates/RateProfiles.csv index 67eb4bbaa..5cd0711df 100644 --- a/data/tariffplans/tutrates/RateProfiles.csv +++ b/data/tariffplans/tutrates/RateProfiles.csv @@ -1,5 +1,5 @@ -#Tenant,ID,FilterIDs,ActivationInterval,Weight,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeight,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement -cgrates.org,RP1,*string:~*req.Subject:1001,,0,0.1,0.6,*free,RT_WEEK,,"* * * * 1-5",0,false,0s,,0.12,1m,1m +#Tenant,ID,FilterIDs,ActivationInterval,Weights,MinCost,MaxCost,MaxCostStrategy,RateID,RateFilterIDs,RateActivationStart,RateWeights,RateBlocker,RateIntervalStart,RateFixedFee,RateRecurrentFee,RateUnit,RateIncrement +cgrates.org,RP1,*string:~*req.Subject:1001,,;0,0.1,0.6,*free,RT_WEEK,,"* * * * 1-5",;0,false,0s,,0.12,1m,1m cgrates.org,RP1,,,,,,,RT_WEEK,,,,,1m,,0.6,1m,1s -cgrates.org,RP1,,,,,,,RT_WEEKEND,,"* * * * 0,6",10,false,0s,,0.06,1m,1s -cgrates.org,RP1,,,,,,,RT_CHRISTMAS,,* * 24 12 *,30,false,0s,,0.06,1m,1s \ No newline at end of file +cgrates.org,RP1,,,,,,,RT_WEEKEND,,"* * * * 0,6",;10,false,0s,,0.06,1m,1s +cgrates.org,RP1,,,,,,,RT_CHRISTMAS,,* * 24 12 *,;30,false,0s,,0.06,1m,1s \ No newline at end of file