Fixed APIerv1.GetCallCostLog to query cdrs table

apier/v1/apier_it_test.go

@@ -1380,21 +1380,6 @@ func TestApierResponderGetCost(t *testing.T) {
 	}
 }
 
-// Test here ResponderGetCost
-func TestApierGetCallCostLog(t *testing.T) {
-	var cc engine.CallCost
-	var attrs utils.AttrGetCallCost
-	// Simple test that command is executed without errors
-	if err := rater.Call("ApierV1.GetCallCostLog", attrs, &cc); err == nil {
-		t.Error("Failed to detect missing fields in ApierV1.GetCallCostLog")
-	}
-	attrs.CgrId = "dummyid"
-	attrs.RunId = "default"
-	if err := rater.Call("ApierV1.GetCallCostLog", attrs, &cc); err == nil || err.Error() != utils.ErrNotFound.Error() {
-		t.Error("ApierV1.GetCallCostLog: should return NOT_FOUND, got:", err)
-	}
-}
-
 func TestApierMaxDebitInexistentAcnt(t *testing.T) {
 
 	cc := &engine.CallCost{}
@@ -1468,6 +1453,82 @@ func TestApierITProcessCdr(t *testing.T) {
 	}
 }
 
+// Test here ResponderGetCost
+func TestApierGetCallCostLog(t *testing.T) {
+	var cc engine.SMCost
+	var attrs utils.AttrGetCallCost
+	// Simple test that command is executed without errors
+	if err := rater.Call("ApierV1.GetCallCostLog", attrs, &cc); err == nil {
+		t.Error("Failed to detect missing fields in ApierV1.GetCallCostLog")
+	}
+	attrs.CgrId = "dummyid"
+	attrs.RunId = "default"
+	if err := rater.Call("ApierV1.GetCallCostLog", attrs, &cc); err == nil || err.Error() != utils.ErrNotFound.Error() {
+		t.Error("ApierV1.GetCallCostLog: should return NOT_FOUND, got:", err)
+	}
+	tm := time.Now().Truncate(time.Millisecond)
+	cdr := &engine.CDR{
+		CGRID:       "Cdr1",
+		OrderID:     123,
+		ToR:         utils.VOICE,
+		OriginID:    "OriginCDR1",
+		OriginHost:  "192.168.1.1",
+		Source:      "test",
+		RequestType: utils.META_RATED,
+		Tenant:      "cgrates.org",
+		Category:    "call",
+		Account:     "1001",
+		Subject:     "1001",
+		Destination: "+4986517174963",
+		SetupTime:   tm,
+		AnswerTime:  tm,
+		RunID:       utils.DEFAULT_RUNID,
+		Usage:       time.Duration(0),
+		ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"},
+		Cost:        1.01,
+	}
+	var reply string
+	if err := rater.Call("CdrsV1.ProcessCDR", cdr, &reply); err != nil {
+		t.Error("Unexpected error: ", err.Error())
+	} else if reply != utils.OK {
+		t.Error("Unexpected reply received: ", reply)
+	}
+	time.Sleep(100 * time.Millisecond)
+	expected := engine.SMCost{
+		CGRID:      "Cdr1",
+		RunID:      "*default",
+		OriginHost: "192.168.1.1",
+		OriginID:   "OriginCDR1",
+		CostSource: "*cdrs",
+		Usage:      0 * time.Second,
+		CostDetails: &engine.EventCost{
+			CGRID:     "Cdr1",
+			RunID:     "*default",
+			StartTime: tm,
+			Usage:     utils.DurationPointer(0),
+			Cost:      utils.Float64Pointer(0),
+			Charges: []*engine.ChargingInterval{{
+				RatingID:       "",
+				Increments:     nil,
+				CompressFactor: 0,
+			}},
+			AccountSummary: nil,
+			Rating:         engine.Rating{},
+			Accounting:     engine.Accounting{},
+			RatingFilters:  engine.RatingFilters{},
+			Rates:          engine.ChargedRates{},
+			Timings:        engine.ChargedTimings{},
+		},
+	}
+	attrs.CgrId = "Cdr1"
+	attrs.RunId = ""
+	if err := rater.Call("ApierV1.GetCallCostLog", attrs, &cc); err != nil {
+		t.Error(err)
+	} else if !reflect.DeepEqual(expected, cc) {
+		t.Errorf("Expecting %s ,recived %s", utils.ToJSON(expected.CostDetails), utils.ToJSON(cc.CostDetails))
+	}
+}
+
 func TestApierITSetDC(t *testing.T) {
 	dcs1 := []*utils.DerivedCharger{
 		{RunID: "extra1", RequestTypeField: "^prepaid", DirectionField: "*default", TenantField: "*default", CategoryField: "*default",

apier/v1/cdrs.go

@@ -34,13 +34,19 @@ func (apier *ApierV1) GetCallCostLog(attrs utils.AttrGetCallCost, reply *engine.
 	if attrs.RunId == "" {
 		attrs.RunId = utils.META_DEFAULT
 	}
-	if smcs, err := apier.CdrDb.GetSMCosts(attrs.CgrId, attrs.RunId, "", ""); err != nil {
+	cdrFltr := &utils.CDRsFilter{
+		CGRIDs: []string{attrs.CgrId},
+		RunIDs: []string{attrs.RunId},
+	}
+	if cdrs, _, err := apier.CdrDb.GetCDRs(cdrFltr, false); err != nil {
 		if err != utils.ErrNotFound {
 			err = utils.NewErrServerError(err)
 		}
 		return err
+	} else if len(cdrs) == 0 {
+		return utils.ErrNotFound
 	} else {
-		*reply = *smcs[0]
+		*reply = *cdrs[0].AsSMCost()
 	}
 	return nil
 }

console/callcost.go

@@ -61,5 +61,5 @@ func (self *CmdGetCostDetails) PostprocessRpcParams() error {
 }
 
 func (self *CmdGetCostDetails) RpcResult() interface{} {
-	return &engine.CallCost{}
+	return &engine.SMCost{}
 }

engine/cdr.go

@@ -468,6 +468,18 @@ func (cdr *CDR) AsExternalCDR() *ExternalCDR {
 	}
 }
 
+func (cdr *CDR) AsSMCost() *SMCost {
+	return &SMCost{
+		CGRID:       cdr.CGRID,
+		RunID:       cdr.RunID,
+		OriginHost:  cdr.OriginHost,
+		OriginID:    cdr.OriginID,
+		CostSource:  cdr.CostSource,
+		Usage:       cdr.Usage,
+		CostDetails: cdr.CostDetails,
+	}
+}
+
 func (cdr *CDR) String() string {
 	mrsh, _ := json.Marshal(cdr)
 	return string(mrsh)