From bdb015b1c538dc2db3b65fb86e8cd9d88b70624e Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 18 Oct 2019 17:04:58 +0200 Subject: [PATCH] Stringify Nodes done --- .../FunctionLibraries/PartsFromNodes.js | 12 +++ .../FunctionLibraries/ProtocolNode.js | 24 ++++-- .../FunctionLibraries/StringifyNode.js | 80 +++++++++++++++++++ 3 files changed, 108 insertions(+), 8 deletions(-) diff --git a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js index 651339d16..844519643 100644 --- a/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js +++ b/StrategySpace/Workspace/FunctionLibraries/PartsFromNodes.js @@ -510,6 +510,9 @@ function newPartsFromNodes () { if (node.layerManager !== undefined) { createPartFromNode(node.layerManager, node, node) } + if (node.socialBots !== undefined) { + createPartFromNode(node.socialBots, node, node) + } return } case 'Live Trading Session': { @@ -520,6 +523,9 @@ function newPartsFromNodes () { if (node.layerManager !== undefined) { createPartFromNode(node.layerManager, node, node) } + if (node.socialBots !== undefined) { + createPartFromNode(node.socialBots, node, node) + } return } case 'Fordward Testing Session': { @@ -530,6 +536,9 @@ function newPartsFromNodes () { if (node.layerManager !== undefined) { createPartFromNode(node.layerManager, node, node) } + if (node.socialBots !== undefined) { + createPartFromNode(node.socialBots, node, node) + } return } case 'Paper Trading Session': { @@ -540,6 +549,9 @@ function newPartsFromNodes () { if (node.layerManager !== undefined) { createPartFromNode(node.layerManager, node, node) } + if (node.socialBots !== undefined) { + createPartFromNode(node.socialBots, node, node) + } return } } diff --git a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js index 1d969c0f3..b0039a1e3 100644 --- a/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/ProtocolNode.js @@ -69,7 +69,8 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - situations: [] + situations: [], + announcements: [] } for (let m = 0; m < node.situations.length; m++) { let situation = getProtocolNode(node.situations[m], removePersonalData, parseCode, includeIds) @@ -136,7 +137,8 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - situations: [] + situations: [], + announcements: [] } for (let m = 0; m < node.situations.length; m++) { @@ -157,7 +159,8 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - situations: [] + situations: [], + announcements: [] } for (let m = 0; m < node.situations.length; m++) { @@ -178,7 +181,8 @@ function newProtocolNode () { type: node.type, subType: node.subType, name: node.name, - situations: [] + situations: [], + announcements: [] } for (let m = 0; m < node.situations.length; m++) { @@ -675,7 +679,8 @@ function newProtocolNode () { name: node.name, code: node.code, parameters: getProtocolNode(node.parameters, removePersonalData, parseCode, includeIds), - layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds) + layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds), + socialBots: getProtocolNode(node.socialBots, removePersonalData, parseCode, includeIds) } if (parseCode) { object.code = JSON.parse(object.code) @@ -693,7 +698,8 @@ function newProtocolNode () { name: node.name, code: node.code, parameters: getProtocolNode(node.parameters, removePersonalData, parseCode, includeIds), - layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds) + layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds), + socialBots: getProtocolNode(node.socialBots, removePersonalData, parseCode, includeIds) } if (parseCode) { object.code = JSON.parse(object.code) @@ -711,7 +717,8 @@ function newProtocolNode () { name: node.name, code: node.code, parameters: getProtocolNode(node.parameters, removePersonalData, parseCode, includeIds), - layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds) + layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds), + socialBots: getProtocolNode(node.socialBots, removePersonalData, parseCode, includeIds) } if (parseCode) { object.code = JSON.parse(object.code) @@ -729,7 +736,8 @@ function newProtocolNode () { name: node.name, code: node.code, parameters: getProtocolNode(node.parameters, removePersonalData, parseCode, includeIds), - layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds) + layerManager: getProtocolNode(node.layerManager, removePersonalData, parseCode, includeIds), + socialBots: getProtocolNode(node.socialBots, removePersonalData, parseCode, includeIds) } if (parseCode) { object.code = JSON.parse(object.code) diff --git a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js index ff0d1d6db..d72abbc07 100644 --- a/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js +++ b/StrategySpace/Workspace/FunctionLibraries/StringifyNode.js @@ -67,12 +67,19 @@ function newStringifyNode () { subType: node.subType, name: node.name, situations: [], + announcements: [], savedPayload: getSavedPayload(node) } for (let m = 0; m < node.situations.length; m++) { let situation = prepareForStringify(node.situations[m], removePersonalData) event.situations.push(situation) } + if (node.announcements !== undefined) { + for (let m = 0; m < node.announcements.length; m++) { + let announcement = prepareForStringify(node.announcements[m], removePersonalData) + event.announcements.push(announcement) + } + } return event } case 'Phase': { @@ -128,6 +135,7 @@ function newStringifyNode () { subType: node.subType, name: node.name, situations: [], + announcements: [], savedPayload: getSavedPayload(node) } @@ -135,6 +143,12 @@ function newStringifyNode () { let situation = prepareForStringify(node.situations[m], removePersonalData) event.situations.push(situation) } + if (node.announcements !== undefined) { + for (let m = 0; m < node.announcements.length; m++) { + let announcement = prepareForStringify(node.announcements[m], removePersonalData) + event.announcements.push(announcement) + } + } return event } case 'Trigger On Event': { @@ -144,6 +158,7 @@ function newStringifyNode () { subType: node.subType, name: node.name, situations: [], + announcements: [], savedPayload: getSavedPayload(node) } @@ -151,6 +166,12 @@ function newStringifyNode () { let situation = prepareForStringify(node.situations[m], removePersonalData) event.situations.push(situation) } + if (node.announcements !== undefined) { + for (let m = 0; m < node.announcements.length; m++) { + let announcement = prepareForStringify(node.announcements[m], removePersonalData) + event.announcements.push(announcement) + } + } return event } case 'Trigger Off Event': { @@ -160,6 +181,7 @@ function newStringifyNode () { subType: node.subType, name: node.name, situations: [], + announcements: [], savedPayload: getSavedPayload(node) } @@ -167,6 +189,12 @@ function newStringifyNode () { let situation = prepareForStringify(node.situations[m], removePersonalData) event.situations.push(situation) } + if (node.announcements !== undefined) { + for (let m = 0; m < node.announcements.length; m++) { + let announcement = prepareForStringify(node.announcements[m], removePersonalData) + event.announcements.push(announcement) + } + } return event } case 'Initial Definition': { @@ -438,6 +466,54 @@ function newStringifyNode () { } return key } + case 'Social Bots': { + let object = { + id: node.id, + type: node.type, + subType: node.subType, + name: node.name, + bots: [], + savedPayload: getSavedPayload(node) + } + + if (node.announcements !== undefined) { + for (let m = 0; m < node.bots.length; m++) { + let bot = prepareForStringify(node.bots[m], removePersonalData) + object.bots.push(bot) + } + } + return object + } + case 'Telegram Bot': { + let object = { + id: node.id, + type: node.type, + subType: node.subType, + name: node.name, + code: node.code, + announcements: [], + savedPayload: getSavedPayload(node) + } + + if (node.announcements !== undefined) { + for (let m = 0; m < node.announcements.length; m++) { + let announcement = prepareForStringify(node.announcements[m], removePersonalData) + object.announcements.push(announcement) + } + } + return object + } + case 'Announcement': { + let object = { + id: node.id, + type: node.type, + subType: node.subType, + name: node.name, + code: node.code, + savedPayload: getSavedPayload(node) + } + return object + } case 'Layer Manager': { let layerManager = { id: node.id, @@ -571,6 +647,7 @@ function newStringifyNode () { code: node.code, parameters: prepareForStringify(node.parameters, removePersonalData), layerManager: prepareForStringify(node.layerManager, removePersonalData), + socialBots: prepareForStringify(node.socialBots, removePersonalData), savedPayload: getSavedPayload(node) } return object @@ -584,6 +661,7 @@ function newStringifyNode () { code: node.code, parameters: prepareForStringify(node.parameters, removePersonalData), layerManager: prepareForStringify(node.layerManager, removePersonalData), + socialBots: prepareForStringify(node.socialBots, removePersonalData), savedPayload: getSavedPayload(node) } return object @@ -597,6 +675,7 @@ function newStringifyNode () { code: node.code, parameters: prepareForStringify(node.parameters, removePersonalData), layerManager: prepareForStringify(node.layerManager, removePersonalData), + socialBots: prepareForStringify(node.socialBots, removePersonalData), savedPayload: getSavedPayload(node) } return object @@ -610,6 +689,7 @@ function newStringifyNode () { code: node.code, parameters: prepareForStringify(node.parameters, removePersonalData), layerManager: prepareForStringify(node.layerManager, removePersonalData), + socialBots: prepareForStringify(node.socialBots, removePersonalData), savedPayload: getSavedPayload(node) } return object