From 81b774f1d5d1ca3dec6845d857d30ed8afe92f13 Mon Sep 17 00:00:00 2001 From: NikolasPetriti Date: Thu, 10 Aug 2023 10:18:37 +0200 Subject: [PATCH] Revise invalid struct tags for tp models --- engine/models.go | 352 +++++++++++++++++++++++------------------------ 1 file changed, 176 insertions(+), 176 deletions(-) diff --git a/engine/models.go b/engine/models.go index 69eaafc2a..749462d6b 100644 --- a/engine/models.go +++ b/engine/models.go @@ -32,55 +32,55 @@ import ( type TpTiming struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*,\s*"` - Years string `index:"1" re:"\*any\s*,\s*|(?:\d{1,4};?)+\s*,\s*|\s*,\s*"` - Months string `index:"2" re:"\*any\s*,\s*|(?:\d{1,4};?)+\s*,\s*|\s*,\s*"` - MonthDays string `index:"3" re:"\*any\s*,\s*|(?:\d{1,4};?)+\s*,\s*|\s*,\s*"` - WeekDays string `index:"4" re:"\*any\s*,\s*|(?:\d{1,4};?)+\s*,\s*|\s*,\s*"` - Time string `index:"5" re:"\d{2}:\d{2}:\d{2}|\*asap"` + Tag string `index:"0" re:".*"` + Years string `index:"1" re:".*"` + Months string `index:"2" re:".*"` + MonthDays string `index:"3" re:".*"` + WeekDays string `index:"4" re:".*"` + Time string `index:"5" re:".*"` CreatedAt time.Time } type TpDestination struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*,\s*"` - Prefix string `index:"1" re:"\+?\d+.?\d*"` + Tag string `index:"0" re:".*"` + Prefix string `index:"1" re:".*"` CreatedAt time.Time } type TpRate struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*"` - ConnectFee float64 `index:"1" re:"\d+\.*\d*s*"` - Rate float64 `index:"2" re:"\d+\.*\d*s*"` - RateUnit string `index:"3" re:"\d+\.*\d*(ns|us|µs|ms|s|m|h)*\s*"` - RateIncrement string `index:"4" re:"\d+\.*\d*(ns|us|µs|ms|s|m|h)*\s*"` - GroupIntervalStart string `index:"5" re:"\d+\.*\d*(ns|us|µs|ms|s|m|h)*\s*"` + Tag string `index:"0" re:".*"` + ConnectFee float64 `index:"1" re:".*"` + Rate float64 `index:"2" re:".*"` + RateUnit string `index:"3" re:".*"` + RateIncrement string `index:"4" re:".*"` + GroupIntervalStart string `index:"5" re:".*"` CreatedAt time.Time } type TpDestinationRate struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*"` - DestinationsTag string `index:"1" re:"\w+\s*|\*any"` - RatesTag string `index:"2" re:"\w+\s*"` - RoundingMethod string `index:"3" re:"\*up|\*down|\*middle"` - RoundingDecimals int `index:"4" re:"\d+"` - MaxCost float64 `index:"5" re:"\d+\.*\d*s*"` - MaxCostStrategy string `index:"6" re:"\*free|\*disconnect"` + Tag string `index:"0" re:".*"` + DestinationsTag string `index:"1" re:".*"` + RatesTag string `index:"2" re:".*"` + RoundingMethod string `index:"3" re:".*"` + RoundingDecimals int `index:"4" re:".*"` + MaxCost float64 `index:"5" re:".*"` + MaxCostStrategy string `index:"6" re:".*"` CreatedAt time.Time } type TpRatingPlan struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*,\s*"` - DestratesTag string `index:"1" re:"\w+\s*,\s*|\*any"` - TimingTag string `index:"2" re:"\w+\s*,\s*|\*any"` - Weight float64 `index:"3" re:"\d+.?\d*"` + Tag string `index:"0" re:".*"` + DestratesTag string `index:"1" re:".*"` + TimingTag string `index:"2" re:".*"` + Weight float64 `index:"3" re:".*"` CreatedAt time.Time } @@ -88,72 +88,72 @@ type TpRatingProfile struct { Id int64 Tpid string Loadid string - Tenant string `index:"0" re:"[0-9A-Za-z_\.]+\s*"` - Category string `index:"1" re:"\w+\s*"` - Subject string `index:"2" re:"\*any\s*|(\w+;?)+\s*"` - ActivationTime string `index:"3" re:"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z"` - RatingPlanTag string `index:"4" re:"\w+\s*"` - FallbackSubjects string `index:"5" re:"\w+\s*"` + Tenant string `index:"0" re:".*"` + Category string `index:"1" re:".*"` + Subject string `index:"2" re:".*"` + ActivationTime string `index:"3" re:".*"` + RatingPlanTag string `index:"4" re:".*"` + FallbackSubjects string `index:"5" re:".*"` CreatedAt time.Time } type TpAction struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*"` - Action string `index:"1" re:"\*\w+\s*"` - ExtraParameters string `index:"2" re:"\S+\s*"` - Filter string `index:"3" re:"\S+\s*"` - BalanceTag string `index:"4" re:"\w+\s*"` - BalanceType string `index:"5" re:"\*\w+\s*"` - Categories string `index:"6" re:""` - DestinationTags string `index:"7" re:"\*any|\w+\s*"` - RatingSubject string `index:"8" re:"\w+\s*"` - SharedGroups string `index:"9" re:"[0-9A-Za-z_;]*"` - ExpiryTime string `index:"10" re:"\*\w+\s*|\+\d+[smh]\s*|\d+\s*"` - TimingTags string `index:"11" re:"[0-9A-Za-z_;]*|\*any"` - Units string `index:"12" re:"\d+\s*"` - BalanceWeight string `index:"13" re:"\d+\.?\d*\s*"` - BalanceBlocker string `index:"14" re:""` - BalanceDisabled string `index:"15" re:""` - Weight float64 `index:"16" re:"\d+\.?\d*\s*"` + Tag string `index:"0" re:".*"` + Action string `index:"1" re:".*"` + ExtraParameters string `index:"2" re:".*"` + Filter string `index:"3" re:".*"` + BalanceTag string `index:"4" re:".*"` + BalanceType string `index:"5" re:".*"` + Categories string `index:"6" re:".*"` + DestinationTags string `index:"7" re:".*"` + RatingSubject string `index:"8" re:".*"` + SharedGroups string `index:"9" re:".*"` + ExpiryTime string `index:"10" re:".*"` + TimingTags string `index:"11" re:".*"` + Units string `index:"12" re:".*"` + BalanceWeight string `index:"13" re:".*"` + BalanceBlocker string `index:"14" re:".*"` + BalanceDisabled string `index:"15" re:".*"` + Weight float64 `index:"16" re:".*"` CreatedAt time.Time } type TpActionPlan struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*,\s*"` - ActionsTag string `index:"1" re:"\w+\s*,\s*"` - TimingTag string `index:"2" re:"\w+\s*,\s*"|\*any` - Weight float64 `index:"3" re:"\d+\.?\d*"` + Tag string `index:"0" re:".*"` + ActionsTag string `index:"1" re:".*"` + TimingTag string `index:"2" re:".*"` + Weight float64 `index:"3" re:".*"` CreatedAt time.Time } type TpActionTrigger struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+"` - UniqueId string `index:"1" re:"\w+"` - ThresholdType string `index:"2" re:"\*\w+"` - ThresholdValue float64 `index:"3" re:"\d+\.?\d*"` - Recurrent bool `index:"4" re:"true|false|"` - MinSleep string `index:"5" re:"\d+[smh]?"` - ExpiryTime string `index:"6" re:""` - ActivationTime string `index:"7" re:""` - BalanceTag string `index:"8" re:"\w+\s*"` - BalanceType string `index:"9" re:"\*\w+"` - BalanceCategories string `index:"10" re:""` - BalanceDestinationTags string `index:"11" re:"\w+|\*any"` - BalanceRatingSubject string `index:"12" re:"\w+|\*any"` - BalanceSharedGroups string `index:"13" re:"\w+|\*any"` - BalanceExpiryTime string `index:"14" re:"\*\w+\s*|\+\d+[smh]\s*|\d+\s*"` - BalanceTimingTags string `index:"15" re:"[0-9A-Za-z_;]*|\*any"` - BalanceWeight string `index:"16" re:"\d+\.?\d*"` - BalanceBlocker string `index:"17" re:""` - BalanceDisabled string `index:"18" re:""` - ActionsTag string `index:"19" re:"\w+"` - Weight float64 `index:"20" re:"\d+\.?\d*"` + Tag string `index:"0" re:".*"` + UniqueId string `index:"1" re:".*"` + ThresholdType string `index:"2" re:".*"` + ThresholdValue float64 `index:"3" re:".*"` + Recurrent bool `index:"4" re:".*"` + MinSleep string `index:"5" re:".*"` + ExpiryTime string `index:"6" re:".*"` + ActivationTime string `index:"7" re:".*"` + BalanceTag string `index:"8" re:".*"` + BalanceType string `index:"9" re:".*"` + BalanceCategories string `index:"10" re:".*"` + BalanceDestinationTags string `index:"11" re:".*"` + BalanceRatingSubject string `index:"12" re:".*"` + BalanceSharedGroups string `index:"13" re:".*"` + BalanceExpiryTime string `index:"14" re:".*"` + BalanceTimingTags string `index:"15" re:".*"` + BalanceWeight string `index:"16" re:".*"` + BalanceBlocker string `index:"17" re:".*"` + BalanceDisabled string `index:"18" re:".*"` + ActionsTag string `index:"19" re:".*"` + Weight float64 `index:"20" re:".*"` CreatedAt time.Time } @@ -161,12 +161,12 @@ type TpAccountAction struct { Id int64 Tpid string Loadid string - Tenant string `index:"0" re:"\w+\s*"` - Account string `index:"1" re:"(\w+;?)+\s*"` - ActionPlanTag string `index:"2" re:"\w+\s*"` - ActionTriggersTag string `index:"3" re:"\w+\s*"` - AllowNegative bool `index:"4" re:""` - Disabled bool `index:"5" re:""` + Tenant string `index:"0" re:".*"` + Account string `index:"1" re:".*"` + ActionPlanTag string `index:"2" re:".*"` + ActionTriggersTag string `index:"3" re:".*"` + AllowNegative bool `index:"4" re:".*"` + Disabled bool `index:"5" re:".*"` CreatedAt time.Time } @@ -188,75 +188,75 @@ func (aa *TpAccountAction) GetAccountActionId() string { type TpSharedGroup struct { Id int64 Tpid string - Tag string `index:"0" re:"\w+\s*"` - Account string `index:"1" re:"\*?\w+\s*"` - Strategy string `index:"2" re:"\*\w+\s*"` - RatingSubject string `index:"3" re:"\*?\w]+\s*"` + Tag string `index:"0" re:".*"` + Account string `index:"1" re:".*"` + Strategy string `index:"2" re:".*"` + RatingSubject string `index:"3" re:".*"` CreatedAt time.Time } type TpResource struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - FilterIDs string `index:"2" re:""` - ActivationInterval string `index:"3" re:""` - UsageTTL string `index:"4" re:""` - Limit string `index:"5" re:""` - AllocationMessage string `index:"6" re:""` - Blocker bool `index:"7" re:""` - Stored bool `index:"8" re:""` - Weight float64 `index:"9" re:"\d+\.?\d*"` - ThresholdIDs string `index:"10" re:""` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + FilterIDs string `index:"2" re:".*"` + ActivationInterval string `index:"3" re:".*"` + UsageTTL string `index:"4" re:".*"` + Limit string `index:"5" re:".*"` + AllocationMessage string `index:"6" re:".*"` + Blocker bool `index:"7" re:".*"` + Stored bool `index:"8" re:".*"` + Weight float64 `index:"9" re:".*"` + ThresholdIDs string `index:"10" re:".*"` CreatedAt time.Time } type TpStat struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - FilterIDs string `index:"2" re:""` - ActivationInterval string `index:"3" re:""` - QueueLength int `index:"4" re:""` - TTL string `index:"5" re:""` - MinItems int `index:"6" re:""` - MetricIDs string `index:"7" re:""` - MetricFilterIDs string `index:"8" re:""` - Stored bool `index:"9" re:""` - Blocker bool `index:"10" re:""` - Weight float64 `index:"11" re:"\d+\.?\d*"` - ThresholdIDs string `index:"12" re:""` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + FilterIDs string `index:"2" re:".*"` + ActivationInterval string `index:"3" re:".*"` + QueueLength int `index:"4" re:".*"` + TTL string `index:"5" re:".*"` + MinItems int `index:"6" re:".*"` + MetricIDs string `index:"7" re:".*"` + MetricFilterIDs string `index:"8" re:".*"` + Stored bool `index:"9" re:".*"` + Blocker bool `index:"10" re:".*"` + Weight float64 `index:"11" re:".*"` + ThresholdIDs string `index:"12" re:".*"` CreatedAt time.Time } type TpThreshold struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - FilterIDs string `index:"2" re:""` - ActivationInterval string `index:"3" re:""` - MaxHits int `index:"4" re:""` - MinHits int `index:"5" re:""` - MinSleep string `index:"6" re:""` - Blocker bool `index:"7" re:""` - Weight float64 `index:"8" re:"\d+\.?\d*"` - ActionIDs string `index:"9" re:""` - Async bool `index:"10" re:""` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + FilterIDs string `index:"2" re:".*"` + ActivationInterval string `index:"3" re:".*"` + MaxHits int `index:"4" re:".*"` + MinHits int `index:"5" re:".*"` + MinSleep string `index:"6" re:".*"` + Blocker bool `index:"7" re:".*"` + Weight float64 `index:"8" re:".*"` + ActionIDs string `index:"9" re:".*"` + Async bool `index:"10" re:".*"` CreatedAt time.Time } type TpFilter struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - Type string `index:"2" re:"^\*[A-Za-z].*"` - Element string `index:"3" re:""` - Values string `index:"4" re:""` - ActivationInterval string `index:"5" re:""` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + Type string `index:"2" re:".*"` + Element string `index:"3" re:".*"` + Values string `index:"4" re:".*"` + ActivationInterval string `index:"5" re:".*"` CreatedAt time.Time } @@ -351,81 +351,81 @@ func (t TBLVersion) TableName() string { type TpSupplier struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - FilterIDs string `index:"2" re:""` - ActivationInterval string `index:"3" re:""` - Sorting string `index:"4" re:""` - SortingParameters string `index:"5" re:""` - SupplierID string `index:"6" re:""` - SupplierFilterIDs string `index:"7" re:""` - SupplierAccountIDs string `index:"8" re:""` - SupplierRatingplanIDs string `index:"9" re:""` - SupplierResourceIDs string `index:"10" re:""` - SupplierStatIDs string `index:"11" re:""` - SupplierWeight float64 `index:"12" re:"\d+\.?\d*"` - SupplierBlocker bool `index:"13" re:""` - SupplierParameters string `index:"14" re:""` - Weight float64 `index:"15" re:"\d+\.?\d*"` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + FilterIDs string `index:"2" re:".*"` + ActivationInterval string `index:"3" re:".*"` + Sorting string `index:"4" re:".*"` + SortingParameters string `index:"5" re:".*"` + SupplierID string `index:"6" re:".*"` + SupplierFilterIDs string `index:"7" re:".*"` + SupplierAccountIDs string `index:"8" re:".*"` + SupplierRatingplanIDs string `index:"9" re:".*"` + SupplierResourceIDs string `index:"10" re:".*"` + SupplierStatIDs string `index:"11" re:".*"` + SupplierWeight float64 `index:"12" re:".*"` + SupplierBlocker bool `index:"13" re:".*"` + SupplierParameters string `index:"14" re:".*"` + Weight float64 `index:"15" re:".*"` CreatedAt time.Time } type TPAttribute struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - Contexts string `index:"2" re:""` - FilterIDs string `index:"3" re:""` - ActivationInterval string `index:"4" re:""` - AttributeFilterIDs string `index:"5" re:""` - Path string `index:"6" re:""` - Type string `index:"7" re:""` - Value string `index:"8" re:""` - Blocker bool `index:"9" re:""` - Weight float64 `index:"10" re:"\d+\.?\d*"` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + Contexts string `index:"2" re:".*"` + FilterIDs string `index:"3" re:".*"` + ActivationInterval string `index:"4" re:".*"` + AttributeFilterIDs string `index:"5" re:".*"` + Path string `index:"6" re:".*"` + Type string `index:"7" re:".*"` + Value string `index:"8" re:".*"` + Blocker bool `index:"9" re:".*"` + Weight float64 `index:"10" re:".*"` CreatedAt time.Time } type TPCharger struct { PK uint `gorm:"primary_key"` Tpid string - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - FilterIDs string `index:"2" re:""` - ActivationInterval string `index:"3" re:""` - RunID string `index:"4" re:""` - AttributeIDs string `index:"5" re:""` - Weight float64 `index:"6" re:"\d+\.?\d*"` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + FilterIDs string `index:"2" re:".*"` + ActivationInterval string `index:"3" re:".*"` + RunID string `index:"4" re:".*"` + AttributeIDs string `index:"5" re:".*"` + Weight float64 `index:"6" re:".*"` CreatedAt time.Time } type TPDispatcherProfile struct { PK uint `gorm:"primary_key"` Tpid string // - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - Subsystems string `index:"2" re:""` - FilterIDs string `index:"3" re:""` - ActivationInterval string `index:"4" re:""` - Strategy string `index:"5" re:""` - StrategyParameters string `index:"6" re:""` - ConnID string `index:"7" re:""` - ConnFilterIDs string `index:"8" re:""` - ConnWeight float64 `index:"9" re:"\d+\.?\d*"` - ConnBlocker bool `index:"10" re:""` - ConnParameters string `index:"11" re:""` - Weight float64 `index:"12" re:"\d+\.?\d*"` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + Subsystems string `index:"2" re:".*"` + FilterIDs string `index:"3" re:".*"` + ActivationInterval string `index:"4" re:".*"` + Strategy string `index:"5" re:".*"` + StrategyParameters string `index:"6" re:".*"` + ConnID string `index:"7" re:".*"` + ConnFilterIDs string `index:"8" re:".*"` + ConnWeight float64 `index:"9" re:".*"` + ConnBlocker bool `index:"10" re:".*"` + ConnParameters string `index:"11" re:".*"` + Weight float64 `index:"12" re:".*"` CreatedAt time.Time } type TPDispatcherHost struct { PK uint `gorm:"primary_key"` Tpid string // - Tenant string `index:"0" re:""` - ID string `index:"1" re:""` - Address string `index:"2" re:""` - Transport string `index:"3" re:""` - TLS bool `index:"4" re:""` + Tenant string `index:"0" re:".*"` + ID string `index:"1" re:".*"` + Address string `index:"2" re:".*"` + Transport string `index:"3" re:".*"` + TLS bool `index:"4" re:".*"` CreatedAt time.Time }