[api] process metrics in single place

Author: ar2rsawseen

api/parts/data/usage.js

@@ -425,6 +425,26 @@ usage.processSessionDuration = function(params, callback) {
 * @returns {array} collected metrics
 **/
 usage.getPredefinedMetrics = function(params, userProps) {
+
+    if (params.qstring.metrics) {
+        common.processCarrier(params.qstring.metrics);
+
+        if (params.qstring.metrics._os && params.qstring.metrics._os_version) {
+            if (common.os_mapping[params.qstring.metrics._os.toLowerCase()] && !params.qstring.metrics._os_version.startsWith(common.os_mapping[params.qstring.metrics._os.toLowerCase()])) {
+                params.qstring.metrics._os_version = common.os_mapping[params.qstring.metrics._os.toLowerCase()] + params.qstring.metrics._os_version;
+            }
+            else if (!params.qstring.metrics._os_version.startsWith(params.qstring.metrics._os[0].toLowerCase())) {
+                params.qstring.metrics._os_version = params.qstring.metrics._os[0].toLowerCase() + params.qstring.metrics._os_version;
+            }
+        }
+        if (params.qstring.metrics._app_version) {
+            params.qstring.metrics._app_version += "";
+            if (params.qstring.metrics._app_version.indexOf('.') === -1) {
+                params.qstring.metrics._app_version += ".0";
+            }
+        }
+    }
+
     var predefinedMetrics = [
         {
             db: "carriers",
@@ -916,13 +936,6 @@ function processMetrics(user, uniqueLevelsZero, uniqueLevelsMonth, params, done)
         }
 
         for (let i = 0; i < predefinedMetrics.length; i++) {
-            if (params.qstring.metrics && params.qstring.metrics._app_version) {
-                params.qstring.metrics._app_version += "";
-                if (params.qstring.metrics._app_version.indexOf('.') === -1) {
-                    params.qstring.metrics._app_version += ".0";
-                }
-            }
-
             for (let j = 0; j < predefinedMetrics[i].metrics.length; j++) {
                 let tmpTimeObjZero = {},
                     tmpTimeObjMonth = {},

api/utils/requestProcessor.js

@@ -2072,19 +2072,6 @@ const validateAppForWriteAPI = (params, done, try_times) => {
                 app: app
             }, () => {
 
-                if (params.qstring.metrics && !params.retry_request) {
-                    common.processCarrier(params.qstring.metrics);
-
-                    if (params.qstring.metrics._os && params.qstring.metrics._os_version) {
-                        if (common.os_mapping[params.qstring.metrics._os.toLowerCase()]) {
-                            params.qstring.metrics._os_version = common.os_mapping[params.qstring.metrics._os.toLowerCase()] + params.qstring.metrics._os_version;
-                        }
-                        else {
-                            params.qstring.metrics._os_version = params.qstring.metrics._os[0].toLowerCase() + params.qstring.metrics._os_version;
-                        }
-                    }
-                }
-
                 if (!params.cancelRequest) {
                     if (!params.app_user.uid) {
                         //first time we see this user, we need to id him with uid