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 = {};
}
var returnedParamsList = paramsObj.list.filter( function (param){
- var paramIndex = usedParamLabelArray.indexOf(param.key);
+ var paramIndex = usedParamLabelArray.indexOf(param.name);
+
if ( paramIndex !== -1 ) {
return usedParamLabelArray.splice(paramIndex, 1);
}
});
usedParamLabelArray.forEach(function (param){
- returnedParamsList.push(ParametersService.createParameter(param));
+ returnedParamsList.push(ParametersService.createParameter({ name: param }));
});
return returnedParamsList;
function applyParams(paramsObj, data) {
var dataStr = JSON.stringify(data);
- paramsObj.list.forEach(function (param){
- dataStr = service.replaceStringInText(dataStr, '<<' + param.key + '>>', param.value);
- });
+ if (paramsObj && paramsObj.hasOwnProperty('list')) {
+ paramsObj.list.forEach(function (param){
+ dataStr = service.replaceStringInText(dataStr, '<<' + param.name + '>>', param.value);
+ });
+ }
return ParsingJsonService.parseJson(dataStr);
}
return replacedText;
}
-
-
-
/**
* Service for creating basic history object
* @param sentData
* @returns {*}
* @param timestamp
*/
- function createHistoryRequest(sentData, receivedData, path, operation, status, name, collection) {
-
- 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, Date.now());
+ result.setData(sentData, receivedData, status, path, operation, name, collection, timestamp,
+ responseStatus, responseStatusText, responseTime);
return result;
}
* @returns {*}
*/
function createHistoryRequestFromElement(elem) {
+ 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, Date.now());
+ elem.status, elem.name, elem.collection, elem.timestamp, elem.responseStatus,
+ elem.responseStatusText, elem.responseTime
+ );
}
/**
* @returns {*}
*/
function createEmptyHistoryList(name){
- var result = new HistoryListModel(ParsingJsonService, service);
+ var result = new HistoryListModel($filter, ParsingJsonService, service);
result.setName(name);
return result;
}
}
- });
+});