Merge pull request #6163 from Countly/ar2rsawseen/master

ar2rsawseen · web-flow · commit 6089b9973c2d · 2025-04-23T13:13:29.000+03:00
do not allow empty metrics
diff --git a/api/parts/data/usage.js b/api/parts/data/usage.js
@@ -398,7 +398,7 @@ usage.returnAllProcessedMetrics = function(params) {
                 continue;
             }
 
-            if (recvMetricValue !== undefined && recvMetricValue !== null) {
+            if (recvMetricValue !== undefined && recvMetricValue !== null && recvMetricValue !== "") {
                 var escapedMetricVal = (recvMetricValue + "").replace(/^\$/, "").replace(/\./g, ":");
                 processedMetrics[tmpMetric.short_code] = escapedMetricVal;
             }
@@ -705,7 +705,7 @@ function processMetrics(user, uniqueLevelsZero, uniqueLevelsMonth, params, done)
                     continue;
                 }
 
-                if (recvMetricValue !== undefined && recvMetricValue !== null) {
+                if (recvMetricValue !== undefined && recvMetricValue !== null && recvMetricValue !== "") {
                     recvMetricValue = (recvMetricValue + "").replace(/^\$/, "").replace(/\./g, ":");
                     postfix = common.crypto.createHash("md5").update(recvMetricValue).digest('base64')[0];
                     metaToFetch[predefinedMetrics[i].db + params.app_id + "_" + dateIds.zero + "_" + postfix] = {
@@ -767,7 +767,7 @@ function processMetrics(user, uniqueLevelsZero, uniqueLevelsMonth, params, done)
                     continue;
                 }
 
-                if (recvMetricValue !== undefined && recvMetricValue !== null) {
+                if (recvMetricValue !== undefined && recvMetricValue !== null && recvMetricValue !== "") {
                     escapedMetricVal = (recvMetricValue + "").replace(/^\$/, "").replace(/\./g, ":");
                     postfix = common.crypto.createHash("md5").update(escapedMetricVal).digest('base64')[0];
 

Original file line number	Diff line number	Diff line change
`@@ -398,7 +398,7 @@ usage.returnAllProcessedMetrics = function(params) {`
`398`	`398`	`continue;`
`399`	`399`	`}`
`400`	`400`
`401`		`- if (recvMetricValue !== undefined && recvMetricValue !== null) {`
	`401`	`+ if (recvMetricValue !== undefined && recvMetricValue !== null && recvMetricValue !== "") {`
`402`	`402`	`var escapedMetricVal = (recvMetricValue + "").replace(/^\$/, "").replace(/\./g, ":");`
`403`	`403`	`processedMetrics[tmpMetric.short_code] = escapedMetricVal;`
`404`	`404`	`}`
`@@ -705,7 +705,7 @@ function processMetrics(user, uniqueLevelsZero, uniqueLevelsMonth, params, done)`
`705`	`705`	`continue;`
`706`	`706`	`}`
`707`	`707`
`708`		`- if (recvMetricValue !== undefined && recvMetricValue !== null) {`
	`708`	`+ if (recvMetricValue !== undefined && recvMetricValue !== null && recvMetricValue !== "") {`
`709`	`709`	`recvMetricValue = (recvMetricValue + "").replace(/^\$/, "").replace(/\./g, ":");`
`710`	`710`	`postfix = common.crypto.createHash("md5").update(recvMetricValue).digest('base64')[0];`
`711`	`711`	`metaToFetch[predefinedMetrics[i].db + params.app_id + "_" + dateIds.zero + "_" + postfix] = {`
`@@ -767,7 +767,7 @@ function processMetrics(user, uniqueLevelsZero, uniqueLevelsMonth, params, done)`
`767`	`767`	`continue;`
`768`	`768`	`}`
`769`	`769`
`770`		`- if (recvMetricValue !== undefined && recvMetricValue !== null) {`
	`770`	`+ if (recvMetricValue !== undefined && recvMetricValue !== null && recvMetricValue !== "") {`
`771`	`771`	`escapedMetricVal = (recvMetricValue + "").replace(/^\$/, "").replace(/\./g, ":");`
`772`	`772`	`postfix = common.crypto.createHash("md5").update(escapedMetricVal).digest('base64')[0];`
`773`	`773`