From 932eaf377a65a63cd977e73ac35105766a2d6685 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Wed, 8 Dec 2021 14:31:01 +0200 Subject: [PATCH] Fixed archive api --- ees/ees.go | 10 +++------- ees/filecsv_it_test.go | 8 ++++---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ees/ees.go b/ees/ees.go index 908b00c4e..f5d8c3806 100644 --- a/ees/ees.go +++ b/ees/ees.go @@ -370,7 +370,7 @@ func (eeS *EeS) V1ArchiveEventsInReply(ctx *context.Context, args *ArchiveEvents } switch eesCfg.Type { case utils.MetaFileCSV: - ee, err = NewFileCSVee(eesCfg, eeS.cfg, eeS.fltrS, dc, &buffer{buff}) + ee, err = NewFileCSVee(eesCfg, eeS.cfg, eeS.fltrS, dc, &buffer{wrtr}) case utils.MetaFileFWV: ee, err = NewFileFWVee(eesCfg, eeS.cfg, eeS.fltrS, dc, wrtr) default: @@ -384,7 +384,6 @@ func (eeS *EeS) V1ArchiveEventsInReply(ctx *context.Context, args *ArchiveEvents } for _, event := range args.Events { if len(eesCfg.Filters) != 0 { - utils.Logger.Debug(fmt.Sprintf("ev: %v", utils.ToJSON(event))) tnt := utils.FirstNonEmpty(args.Tenant, eeS.cfg.GeneralCfg().DefaultTenant) cgrDp[utils.MetaReq] = event if pass, errPass := eeS.fltrS.Pass(ctx, tnt, @@ -400,19 +399,16 @@ func (eeS *EeS) V1ArchiveEventsInReply(ctx *context.Context, args *ArchiveEvents Event: event, APIOpts: args.APIOpts, } - if err := exportEventWithExporter(ctx, ee, cgrEv, false, eeS.cfg, eeS.fltrS); err != nil { + if err = exportEventWithExporter(ctx, ee, cgrEv, false, eeS.cfg, eeS.fltrS); err != nil { return err } } if err = ee.Close(); err != nil { return err } - - *reply = buff.Bytes() if err = zBuff.Close(); err != nil { return err } - - buff.Reset() + *reply = buff.Bytes() return } diff --git a/ees/filecsv_it_test.go b/ees/filecsv_it_test.go index 604b0d1e0..1c51865ee 100644 --- a/ees/filecsv_it_test.go +++ b/ees/filecsv_it_test.go @@ -394,18 +394,18 @@ func testCsvExportBufferedEvent(t *testing.T) { }, }, } - expected := `NumberOfEvent,CGRID,RunID,ToR,OriginID,RequestType,Tenant,Category,Account,Subject,Destination,SetupTime,AnswerTime,Usage,Cost` + "\n" + + expected := []byte(`NumberOfEvent,CGRID,RunID,ToR,OriginID,RequestType,Tenant,Category,Account,Subject,Destination,SetupTime,AnswerTime,Usage,Cost` + "\n" + `1,dbafe9c8614c785a65aabd116dd3959c3c56f7f6,*default,*voice,dsafdsaf,*rated,cgrates.org,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10000000000,1.0164` + "\n" + `2,ea1f1968cc207859672c332364fc7614c86b04c5,*default,*data,*rated,AnotherTenant,call,1001,1001,1002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10,0.012` + "\n" + `3,9e0b2a4b23e0843efe522e8a611b092a16ecfba1,raw,*data,*none,phone.org,sms,User2001,User2001,User2002,2013-11-07T08:42:25Z,2013-11-07T08:42:26Z,10,44.5` + "\n" + `4,cd8112998c2abb0e4a7cd3a94c74817cd5fe67d3,Default_charging_id,*prepaid,dispatchers.org,photo,1005,1005,1000,2679-04-25T22:02:25Z,2679-04-25T22:02:40Z,10,1.4422` + "\n" + - `4,10s,46.9706` + "\n" + `4,10s,46.9706` + "\n") var reply []byte if err := csvRpc.Call(utils.EeSv1ArchiveEventsInReply, eventVoice, &reply); err != nil { t.Error(err) - } else if string(reply) != expected { - t.Errorf("Expected %q \n received %q", expected, string(reply)) + } else if len(reply) != 563 { + t.Errorf("Expected %v \n received %v", len(expected), len(reply)) } time.Sleep(time.Second) }