Yangman - validate collection name, ...

[dlux.git] / modules / yangman-resources / src / main / resources / yangman / services / requests.services.js

diff --git a/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js b/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js
index 9c74065dc8adcdce757f3910ffb3b69a26a4fb94..3c694fde295f63dc50aa544ce489d50b8829ffab 100644 (file)
--- a/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js
+++ b/modules/yangman-resources/src/main/resources/yangman/services/requests.services.js
@@ -7,9 +7,9 @@ define([
 
     angular.module('app.yangman').service('RequestsService', RequestsService);
 
-    RequestsService.$inject = ['PathUtilsService', 'ParametersService', 'ParsingJsonService', 'YangUtilsService'];
+    RequestsService.$inject = ['$filter', 'PathUtilsService', 'ParametersService', 'ParsingJsonService', 'YangUtilsService'];
 
-    function RequestsService(PathUtilsService, ParametersService, ParsingJsonService, YangUtilsService){
+    function RequestsService($filter, PathUtilsService, ParametersService, ParsingJsonService, YangUtilsService){
 
         var service = {};
 
@@ -42,7 +42,8 @@ define([
             }
 
             var returnedParamsList = paramsObj.list.filter( function (param){
-                    var paramIndex = usedParamLabelArray.indexOf(param.name);
+                var paramIndex = usedParamLabelArray.indexOf(param.name);
+
                 if ( paramIndex !== -1 ) {
                     return usedParamLabelArray.splice(paramIndex, 1);
                 }
@@ -52,7 +53,7 @@ define([
             });
 
             usedParamLabelArray.forEach(function (param){
-                    returnedParamsList.push(ParametersService.createParameter({ name: param }));
+                returnedParamsList.push(ParametersService.createParameter({ name: param }));
             });
 
             return returnedParamsList;
@@ -88,11 +89,11 @@ define([
         function applyParams(paramsObj, data) {
             var dataStr = JSON.stringify(data);
 
-                if (paramsObj && paramsObj.hasOwnProperty('list')) {
-                    paramsObj.list.forEach(function (param){
-                        dataStr = service.replaceStringInText(dataStr, '<<' + param.name + '>>', param.value);
-                    });
-                }
+            if (paramsObj && paramsObj.hasOwnProperty('list')) {
+                paramsObj.list.forEach(function (param){
+                    dataStr = service.replaceStringInText(dataStr, '<<' + param.name + '>>', param.value);
+                });
+            }
 
             return ParsingJsonService.parseJson(dataStr);
         }
@@ -112,9 +113,6 @@ define([
             return replacedText;
         }
 
-
-
-
         /**
          * Service for creating basic history object
          * @param sentData
@@ -127,12 +125,14 @@ define([
          * @returns {*}
          * @param timestamp
          */
-            function createHistoryRequest(sentData, receivedData, path, operation, status, name, collection, timestamp) {
-
-            var receivedDataProcessed = status === 'success' ? receivedData : null,
-                result = new HistoryRequestModel(PathUtilsService, YangUtilsService, ParsingJsonService);
+        function createHistoryRequest(sentData, receivedData, path, operation, status, name, collection, timestamp,
+                        responseStatus, responseStatusText, responseTime) {
+            // TODO: investigate, if this line is needed
+            // var receivedDataProcessed = status === 'success' ? receivedData : null,
+            var result = new HistoryRequestModel(PathUtilsService, YangUtilsService, ParsingJsonService);
 
-                result.setData(sentData, receivedDataProcessed, status, path, operation, name, collection, timestamp);
+            result.setData(sentData, receivedData, status, path, operation, name, collection, timestamp,
+                responseStatus, responseStatusText, responseTime);
 
             return result;
         }
@@ -143,11 +143,14 @@ define([
          * @returns {*}
          */
         function createHistoryRequestFromElement(elem) {
-                if (!elem.hasOwnProperty('timestamp')){
-                    elem.timestamp = Date.now();
-                }
+                if (!elem.hasOwnProperty('timestamp') || elem.timestamp === ''){
+                elem.timestamp = Date.now();
+            }
+
             return service.createHistoryRequest(elem.sentData, elem.receivedData, elem.path, elem.method,
-                    elem.status, elem.name, elem.collection, elem.timestamp);
+                    elem.status, elem.name, elem.collection, elem.timestamp, elem.responseStatus,
+                    elem.responseStatusText, elem.responseTime
+                );
         }
 
         /**
@@ -168,7 +171,7 @@ define([
          * @returns {*}
          */
         function createEmptyHistoryList(name){
-            var result = new HistoryListModel(ParsingJsonService, service);
+            var result = new HistoryListModel($filter, ParsingJsonService, service);
             result.setName(name);
             return result;
         }
@@ -177,4 +180,4 @@ define([
 
     }
 
-    });
+});