Cleanup and optimizing functions

Author: GearsAD

src/CloudGraphsDFG/entities/CloudGraphsDFG.jl

@@ -7,19 +7,55 @@ end
 
 mutable struct CloudGraphsDFG{T <: AbstractParams} <: AbstractDFG
     neo4jInstance::Neo4jInstance
-    description::String
     userId::String
     robotId::String
     sessionId::String
     encodePackedTypeFunc
     getPackedTypeFunc
     decodePackedTypeFunc
     rebuildFactorMetadata!
-    labelDict::Dict{Symbol, Int64}
-    addHistory::Vector{Symbol} #TODO: Discuss more - is this an audit trail?
+    addHistory::Vector{Symbol}
     solverParams::T # Solver parameters
 end
 
+"""
+    $(SIGNATURES)
+Create a new CloudGraphs-based DFG factor graph using a Neo4j.Connection.
+"""
+function CloudGraphsDFG{T}(neo4jConnection::Neo4j.Connection,
+                            userId::String,
+                            robotId::String,
+                            sessionId::String,
+                            encodePackedTypeFunc,
+                            getPackedTypeFunc,
+                            decodePackedTypeFunc,
+                            rebuildFactorMetadata!;
+                            solverParams::T=NoSolverParams()) where T <: AbstractParams
+    graph = Neo4j.getgraph(neo4jConnection)
+    neo4jInstance = Neo4jInstance(neo4jConnection, graph)
+    return CloudGraphsDFG{T}(neo4jInstance, userId, robotId, sessionId, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!, Symbol[], solverParams)
+end
+"""
+    $(SIGNATURES)
+Create a new CloudGraphs-based DFG factor graph by specifying the Neo4j connection information.
+"""
+function CloudGraphsDFG{T}(host::String,
+                            port::Int,
+                            dbUser::String,
+                            dbPassword::String,
+                            userId::String,
+                            robotId::String,
+                            sessionId::String,
+                            encodePackedTypeFunc,
+                            getPackedTypeFunc,
+                            decodePackedTypeFunc,
+                            rebuildFactorMetadata!;
+                            solverParams::T=NoSolverParams()) where T <: AbstractParams
+    neo4jConnection = Neo4j.Connection(host, port=port, user=dbUser, password=dbPassword);
+    return CloudGraphsDFG{T}(neo4jConnection, userId, robotId, sessionId, encodePackedTypeFunc, getPackedTypeFunc, decodePackedTypeFunc, rebuildFactorMetadata!, solverParams=solverParams)
+end
+
+
 function show(io::IO, c::CloudGraphsDFG)
     println(io, "CloudGraphsDFG:")
     println(io, " - Neo4J instance: $(c.neo4jInstance.connection.host)")

src/CloudGraphsDFG/services/CGStructure.jl

@@ -235,7 +235,6 @@ function clearSession!!(dfg::CloudGraphsDFG)::Nothing
 
     # Clearing history
     dfg.addHistory = Symbol[]
-    empty!(dfg.labelDict)
     return nothing
 end
 
@@ -249,7 +248,6 @@ function clearRobot!!(dfg::CloudGraphsDFG)::Nothing
 
     # Clearing history
     dfg.addHistory = Symbol[]
-    empty!(dfg.labelDict)
     return nothing
 end
 
@@ -263,7 +261,6 @@ function clearUser!!(dfg::CloudGraphsDFG)::Nothing
 
     # Clearing history
     dfg.addHistory = Symbol[]
-    empty!(dfg.labelDict)
     return nothing
 end
 
@@ -284,29 +281,3 @@ end
 DANGER: Copies the source to a new unique destination.
 """
 copySession!(sourceDFG::CloudGraphsDFG)::CloudGraphsDFG = copySession!(sourceDFG, nothing)
-
-
-function getUserData(dfg::CloudGraphsDFG)::Dict{Symbol, String}
-    propVal = _getNodeProperty(dfg.neo4jInstance, [dfg.userId, "USER"], "data")
-    return JSON2.read(String(base64decode(propVal)), Dict{Symbol, String})
-end
-function setUserData!(dfg::CloudGraphsDFG, data::Dict{Symbol, String})::Bool
-    count = _setNodeProperty(dfg.neo4jInstance, [dfg.userId, "USER"], "data", base64encode(JSON2.write(data)))
-    return count == 1
-end
-function getRobotData(dfg::CloudGraphsDFG)::Dict{Symbol, String}
-    propVal = _getNodeProperty(dfg.neo4jInstance, [dfg.userId, dfg.robotId, "ROBOT"], "data")
-    return JSON2.read(String(base64decode(propVal)), Dict{Symbol, String})
-end
-function setRobotData!(dfg::CloudGraphsDFG, data::Dict{Symbol, String})::Bool
-    count = _setNodeProperty(dfg.neo4jInstance, [dfg.userId, dfg.robotId, "ROBOT"], "data", base64encode(JSON2.write(data)))
-    return count == 1
-end
-function getSessionData(dfg::CloudGraphsDFG)::Dict{Symbol, String}
-    propVal = _getNodeProperty(dfg.neo4jInstance, [dfg.userId, dfg.robotId, dfg.sessionId, "SESSION"], "data")
-    return JSON2.read(String(base64decode(propVal)), Dict{Symbol, String})
-end
-function setSessionData!(dfg::CloudGraphsDFG, data::Dict{Symbol, String})::Bool
-    count = _setNodeProperty(dfg.neo4jInstance, [dfg.userId, dfg.robotId, dfg.sessionId, "SESSION"], "data", base64encode(JSON2.write(data)))
-    return count == 1
-end