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

Default value for answer time is now null in cdrsql

Browse Source
This commit is contained in:
andronache98
2021-12-21 17:58:48 +02:00
committed by Dan Christian Bogos
parent 8cad69d2a3
commit fc3c644f05
6 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/storage/docker_mysql/scripts/create_cdrs_tables.sql
View File

@@ -18,7 +18,7 @@ CREATE TABLE cdrs (
subject varchar(128) NOT NULL,
destination varchar(128) NOT NULL,
setup_time datetime NOT NULL,
answer_time datetime NOT NULL,
answer_time datetime NULL,
`usage` BIGINT NOT NULL,
extra_fields text NOT NULL,
cost_source varchar(64) NOT NULL,

2
data/storage/mysql/create_cdrs_tables.sql
View File

@@ -18,7 +18,7 @@ CREATE TABLE cdrs (
subject varchar(128) NOT NULL,
destination varchar(128) NOT NULL,
setup_time datetime NOT NULL,
answer_time datetime NOT NULL,
answer_time datetime NULL,
`usage` BIGINT NOT NULL,
extra_fields text NOT NULL,
cost_source varchar(64) NOT NULL,

2
data/storage/postgres/create_cdrs_tables.sql
View File

@@ -18,7 +18,7 @@ CREATE TABLE cdrs (
subject VARCHAR(128) NOT NULL,
destination VARCHAR(128) NOT NULL,
setup_time TIMESTAMP WITH TIME ZONE NOT NULL,
answer_time TIMESTAMP WITH TIME ZONE NOT NULL,
answer_time TIMESTAMP WITH TIME ZONE NULL,
usage BIGINT NOT NULL,
extra_fields jsonb NOT NULL,
cost_source VARCHAR(64) NOT NULL,

8
engine/cdr.go
View File

@@ -272,7 +272,9 @@ func (cdr *CDR) AsCDRsql() (cdrSQL *CDRsql) {
cdrSQL.Subject = cdr.Subject
cdrSQL.Destination = cdr.Destination
cdrSQL.SetupTime = cdr.SetupTime
cdrSQL.AnswerTime = cdr.AnswerTime
if cdrSQL.AnswerTime != nil {
cdr.AnswerTime = *cdrSQL.AnswerTime
}
cdrSQL.Usage = cdr.Usage.Nanoseconds()
cdrSQL.ExtraFields = utils.ToJSON(cdr.ExtraFields)
cdrSQL.CostSource = cdr.CostSource
@@ -308,7 +310,9 @@ func NewCDRFromSQL(cdrSQL *CDRsql) (cdr *CDR, err error) {
cdr.Subject = cdrSQL.Subject
cdr.Destination = cdrSQL.Destination
cdr.SetupTime = cdrSQL.SetupTime
cdr.AnswerTime = cdrSQL.AnswerTime
if cdrSQL.AnswerTime != nil {
cdr.AnswerTime = *cdrSQL.AnswerTime
}
cdr.Usage = time.Duration(cdrSQL.Usage)
cdr.CostSource = cdrSQL.CostSource
cdr.Cost = cdrSQL.Cost

2
engine/models.go
View File

@@ -119,7 +119,7 @@ type CDRsql struct {
Subject string
Destination string
SetupTime time.Time
AnswerTime time.Time
AnswerTime *time.Time
Usage int64
ExtraFields string
CostSource string

8
migrator/cdrs.go
View File

@@ -195,7 +195,9 @@ func NewV1CDRFromCDRSql(cdrSql *engine.CDRsql) (cdr *v1Cdrs, err error) {
cdr.Subject = cdrSql.Subject
cdr.Destination = cdrSql.Destination
cdr.SetupTime = cdrSql.SetupTime
cdr.AnswerTime = cdrSql.AnswerTime
if !cdr.AnswerTime.IsZero() {
cdrSql.AnswerTime = utils.TimePointer(cdr.AnswerTime)
}
cdr.Usage = time.Duration(cdrSql.Usage)
cdr.CostSource = cdrSql.CostSource
cdr.Cost = cdrSql.Cost
@@ -223,7 +225,9 @@ func (cdr *v1Cdrs) AsCDRsql() (cdrSql *engine.CDRsql) {
cdrSql.Subject = cdr.Subject
cdrSql.Destination = cdr.Destination
cdrSql.SetupTime = cdr.SetupTime
cdrSql.AnswerTime = cdr.AnswerTime
if cdrSql.AnswerTime != nil {
cdr.AnswerTime = *cdrSql.AnswerTime
}
cdrSql.Usage = cdr.Usage.Nanoseconds()
cdrSql.ExtraFields = utils.ToJSON(cdr.ExtraFields)
cdrSql.CostSource = cdr.CostSource