From 9cac896e5c92fc6ef7ae828b218e6b87a67ff125 Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Thu, 28 Sep 2017 13:52:04 +0300
Subject: [PATCH] Improve DDC metric

---
 engine/statmetrics.go | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/engine/statmetrics.go b/engine/statmetrics.go
index 93990488b..da4068511 100644
--- a/engine/statmetrics.go
+++ b/engine/statmetrics.go
@@ -555,6 +555,7 @@ func NewDCC() (StatMetric, error) {
 	return &StatDDC{Destinations: make(map[string]utils.StringMap), EventDestinations: make(map[string]string)}, nil
 }
 
+// DDC implements Destination Distinct Count metric
 type StatDDC struct {
 	Destinations      map[string]utils.StringMap
 	EventDestinations map[string]string // map[EventTenantID]Destination
@@ -580,19 +581,14 @@ func (ddc *StatDDC) GetFloat64Value() (v float64) {
 
 func (ddc *StatDDC) AddEvent(ev *StatEvent) (err error) {
 	var dest string
-	if at, err := ev.AnswerTime(config.CgrConfig().DefaultTimezone); err != nil &&
-		err != utils.ErrNotFound {
+	if destination, err := ev.Destination(config.CgrConfig().DefaultTimezone); err != nil {
 		return err
-	} else if !at.IsZero() {
-		if destination, err := ev.Destination(config.CgrConfig().DefaultTimezone); err != nil {
-			return err
-		} else {
-			dest = destination
-			if _, has := ddc.Destinations[dest]; !has {
-				ddc.Destinations[dest] = make(map[string]bool)
-			}
-			ddc.Destinations[dest][ev.TenantID()] = true
+	} else {
+		dest = destination
+		if _, has := ddc.Destinations[dest]; !has {
+			ddc.Destinations[dest] = make(map[string]bool)
 		}
+		ddc.Destinations[dest][ev.TenantID()] = true
 	}
 	ddc.EventDestinations[ev.TenantID()] = dest
 	return
@@ -603,13 +599,12 @@ func (ddc *StatDDC) RemEvent(evTenantID string) (err error) {
 	if !has {
 		return utils.ErrNotFound
 	}
+	delete(ddc.EventDestinations, evTenantID)
 	if len(ddc.Destinations[destination]) == 1 {
 		delete(ddc.Destinations, destination)
-	} else {
-		delete(ddc.Destinations[destination], evTenantID)
+		return
 	}
-
-	delete(ddc.EventDestinations, evTenantID)
+	delete(ddc.Destinations[destination], evTenantID)
 	return
 }