Move from EventExporterRequest to engine/EventRequest

This commit is contained in:
TeoV
2021-01-22 17:45:13 +02:00
committed by Dan Christian Bogos
parent 1d2c03e2cc
commit aa774f0fe6
17 changed files with 220 additions and 156 deletions

View File

@@ -150,20 +150,23 @@ func (sqlEe *SQLEe) ExportEvent(cgrEv *utils.CGREvent) (err error) {
var vals []interface{}
var colNames []string
oNm := map[string]*utils.OrderedNavigableMap{
utils.MetaExp: utils.NewOrderedNavigableMap(),
}
req := utils.MapStorage(cgrEv.Event)
eeReq := NewEventExporterRequest(req, sqlEe.dc, cgrEv.Opts,
eeReq := engine.NewEventRequest(req, sqlEe.dc, cgrEv.Opts,
sqlEe.cgrCfg.EEsCfg().Exporters[sqlEe.cfgIdx].Tenant,
sqlEe.cgrCfg.GeneralCfg().DefaultTenant,
utils.FirstNonEmpty(sqlEe.cgrCfg.EEsCfg().Exporters[sqlEe.cfgIdx].Timezone,
sqlEe.cgrCfg.GeneralCfg().DefaultTimezone),
sqlEe.filterS)
sqlEe.filterS, oNm)
if err = eeReq.SetFields(sqlEe.cgrCfg.EEsCfg().Exporters[sqlEe.cfgIdx].ContentFields()); err != nil {
return
}
for el := eeReq.cnt.GetFirstElement(); el != nil; el = el.Next() {
for el := eeReq.OrdNavMP[utils.MetaExp].GetFirstElement(); el != nil; el = el.Next() {
var iface interface{}
if iface, err = eeReq.cnt.FieldAsInterface(el.Value.Slice()); err != nil {
if iface, err = eeReq.OrdNavMP[utils.MetaExp].FieldAsInterface(el.Value.Slice()); err != nil {
return
}
pathWithoutIndex := utils.GetPathWithoutIndex(el.Value.String())