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

Integration tests for CdrsV2.ProcesCDR with ChargerS

Browse Source
This commit is contained in:
DanB
2018-08-24 20:25:04 +02:00
parent 9ee04fa97b
commit aa6e18b27b
15 changed files with 466 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
engine/cdr.go
View File

@@ -105,6 +105,9 @@ func (cdr *CDR) AddDefaults(cfg *config.CGRConfig) {
if cdr.CGRID == "" {
cdr.ComputeCGRID()
}
if cdr.RunID == "" {
cdr.RunID = utils.MetaRaw
}
if cdr.ToR == "" {
cdr.ToR = utils.VOICE
}
@@ -117,6 +120,9 @@ func (cdr *CDR) AddDefaults(cfg *config.CGRConfig) {
if cdr.Category == "" {
cdr.Category = cfg.DefaultCategory
}
if cdr.Subject == "" {
cdr.Subject = cdr.Account
}
}
func (cdr *CDR) CostDetailsJson() string {

10
engine/cdrs.go
View File

@@ -468,7 +468,8 @@ func (self *CdrServer) getCostFromRater(cdr *CDR) (*CallCost, error) {
DurationIndex: cdr.Usage,
PerformRounding: true,
}
if utils.IsSliceMember([]string{utils.META_PSEUDOPREPAID, utils.META_POSTPAID, utils.META_PREPAID, utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID}, cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM
if utils.IsSliceMember([]string{utils.META_PSEUDOPREPAID, utils.META_POSTPAID, utils.META_PREPAID,
utils.PSEUDOPREPAID, utils.POSTPAID, utils.PREPAID}, cdr.RequestType) { // Prepaid - Cost can be recalculated in case of missing records from SM
err = self.rals.Call("Responder.Debit", cd, cc)
} else {
err = self.rals.Call("Responder.GetCost", cd, cc)
@@ -694,7 +695,7 @@ func (cdrS *CdrServer) chrgrSProcessEvent(cgrEv *utils.CGREvent) {
return
}
var chrgrs []*ChrgSProcessEventReply
if err := cdrS.chargerS.Call(utils.ChargerSv1ProcessEvent, cgrEv, &chrgrs); err == nil ||
if err := cdrS.chargerS.Call(utils.ChargerSv1ProcessEvent, cgrEv, &chrgrs); err != nil &&
err.Error() != utils.ErrNotFound.Error() {
utils.Logger.Warning(
fmt.Sprintf("<%s> error: %s processing CGR event %+v with %s.",
@@ -723,13 +724,13 @@ func (cdrS *CdrServer) chrgrSProcessEvent(cgrEv *utils.CGREvent) {
}
for _, cdr := range processedCDRs {
if cdrS.cgrCfg.CDRSStoreCdrs { // Store CDR
go func() {
go func(cdr *CDR) {
if err := cdrS.cdrDb.SetCDR(cdr, true); err != nil {
utils.Logger.Warning(
fmt.Sprintf("<%s> error: %s storing CDR %+v.",
utils.CDRs, err.Error(), cdr))
}
}()
}(cdr)
}
go cdrS.replicateCDRs([]*CDR{cdr}) // Replicate CDR
cgrEv := cdr.AsCGREvent()
@@ -753,6 +754,7 @@ func (cdrS *CdrServer) V2ProcessCDR(cgrEv *utils.CGREvent, reply *string) (err e
go cdrS.thdSProcessEvent(cgrEv)
go cdrS.statSProcessEvent(cgrEv)
go cdrS.chrgrSProcessEvent(cgrEv)
*reply = utils.OK