Fix CGDFG data entries

Author: Affie

src/CloudGraphsDFG/services/CloudGraphsDFG.jl

@@ -239,9 +239,9 @@ function getVariable(dfg::CloudGraphsDFG, label::Union{Symbol, String})
     for solveKey in listVariableSolverData(dfg, label)
         variable.solverDataDict[solveKey] = getVariableSolverData(dfg, label, solveKey)
     end
-    dataDict = getDataEntries(dfg, label)
-    for (k,v) in dataDict
-        variable.dataDict[k] = v
+    dataSet = getDataEntries(dfg, label)
+    for v in dataSet
+        variable.dataDict[v.label] = v
     end
 
     return variable
@@ -258,7 +258,7 @@ function mergeVariableData!(dfg::CloudGraphsDFG, sourceVariable::DFGVariable; cu
         updateVariableSolverData!(dfg, getLabel(sourceVariable), v, currentTransaction=currentTransaction)
     end
     for (k,v) in sourceVariable.dataDict
-        updateDatEntry!(dfg, getLabel(sourceVariable), v, currentTransaction=currentTransaction)
+        updateDataEntry!(dfg, getLabel(sourceVariable), v, currentTransaction=currentTransaction)
     end
     return sourceVariable
 end
@@ -643,11 +643,9 @@ end
 function getDataEntries(dfg::CloudGraphsDFG, label::Symbol; currentTransaction::Union{Nothing, Neo4j.Transaction}=nothing)
     entries = Dict{Symbol, BlobStoreEntry}()
     # TODO: Optimize if necessary.
-    for key in listDataEntries(dfg, label, currentTransaction=currentTransaction)
-        entry = getDataEntry(dfg, label, key, currentTransaction=currentTransaction)
-        entries[entry.label] = entry
-    end
-    return entries
+    delist = listDataEntries(dfg, label, currentTransaction=currentTransaction)
+    return getDataEntry.(dfg, label, delist; currentTransaction)
+
 end
 
 function listDataEntries(dfg::CloudGraphsDFG, label::Symbol; currentTransaction::Union{Nothing, Neo4j.Transaction}=nothing)
@@ -665,6 +663,10 @@ function getDataEntry(dfg::CloudGraphsDFG, label::Symbol, key::Symbol; currentTr
         BlobStoreEntry, 
         key; 
         currentTransaction=currentTransaction)
+    
+    #FIXME
+    properties["createdTimestamp"] = DistributedFactorGraphs.getStandardZDTString(properties["createdTimestamp"])
+    
     return Unmarshal.unmarshal(
         BlobStoreEntry,
         properties)
@@ -681,6 +683,10 @@ function addDataEntry!(dfg::CloudGraphsDFG, label::Symbol, bde::BlobStoreEntry;
         bde,
         :DATA,
         currentTransaction=currentTransaction)
+    
+    #FIXME
+    packed["createdTimestamp"] = DistributedFactorGraphs.getStandardZDTString(packed["createdTimestamp"])
+
     return Unmarshal.unmarshal(
             BlobStoreEntry,
             packed)
@@ -697,6 +703,10 @@ function updateDataEntry!(dfg::CloudGraphsDFG, label::Symbol,  bde::BlobStoreEnt
         bde,
         :DATA,
         currentTransaction=currentTransaction)
+
+    #FIXME
+    packed["createdTimestamp"] = DistributedFactorGraphs.getStandardZDTString(packed["createdTimestamp"])
+
     return Unmarshal.unmarshal(
             BlobStoreEntry,
             packed)
@@ -710,6 +720,10 @@ function deleteDataEntry!(dfg::CloudGraphsDFG, label::Symbol, key::Symbol; curre
         _getLabelsForType(dfg, BlobStoreEntry, parentKey=label),
         key,
         currentTransaction=currentTransaction)
+    
+    #FIXME
+    props["createdTimestamp"] = DistributedFactorGraphs.getStandardZDTString(props["createdTimestamp"])
+
     return Unmarshal.unmarshal(
         BlobStoreEntry,
         props)

test/interfaceTests.jl

@@ -117,7 +117,7 @@ end
         DataEntriesTestBlock!(fg1, var2)
     end
     @testset "Data blob tests" begin
-        blobsStoresTestBlock!(fg1, var2)
+        blobsStoresTestBlock!(fg1)
     end
 end
 

test/testBlocks.jl

@@ -868,16 +868,11 @@ function  DataEntriesTestBlock!(fg, v2)
     deleteDataEntry!(fg, :b, :key2)
 end
 
-function blobsStoresTestBlock!(fg, v1)
+function blobsStoresTestBlock!(fg)
 
     de1 = BlobStoreEntry(:label1,uuid4(), :store1, "AAAA","origin1","description1","mimetype1",now(localzone()))
-    # TODO put this one in. It breaks current serialization.
-    @warn "FIXME ZonedDateTime tests for: 2020-08-12T12:00:00.000+00:00)"
-    @test_skip false 
-    #de2 = BlobStoreEntry(:label2,uuid4(), :store2, "FFFF","origin2","description2","mimetype2",ZonedDateTime("2020-08-12T12:00:00.000+00:00"))
-    de2 = BlobStoreEntry(:label2,uuid4(), :store2, "FFFF","origin2","description2","mimetype2",ZonedDateTime("2020-08-12T12:00:00.001+00:00"))
-    # de2_update = BlobStoreEntry(:label2,uuid4(), :store2, "0123","origin2","description2","mimetype2",ZonedDateTime("2020-08-12T12:00:01.000+00:00"))
-    de2_update = BlobStoreEntry(:label2,uuid4(), :store2, "0123","origin2","description2","mimetype2",ZonedDateTime("2020-08-12T12:00:01.001+00:00"))
+    de2 = BlobStoreEntry(:label2,uuid4(), :store2, "FFFF","origin2","description2","mimetype2",ZonedDateTime("2020-08-12T12:00:00.000+00:00"))
+    de2_update = BlobStoreEntry(:label2,uuid4(), :store2, "0123","origin2","description2","mimetype2",ZonedDateTime("2020-08-12T12:00:01.000+00:00"))
     @test getLabel(de1) == de1.label
     @test getId(de1) == de1.id
     @test getHash(de1) == hex2bytes(de1.hash)
@@ -886,9 +881,10 @@ function blobsStoresTestBlock!(fg, v1)
     #add
     var1 = getVariable(fg, :a)
     @test addDataEntry!(var1, de1) == de1
+    updateVariable!(fg, var1)
     @test addDataEntry!(fg, :a, de2) == de2
     @test_throws ErrorException addDataEntry!(var1, de1)
-    @test de2 in getDataEntries(var1)
+    @test de2 in getDataEntries(fg, var1.label)
 
     #get
     @test deepcopy(de1) == getDataEntry(var1, :label1)
@@ -911,10 +907,11 @@ function blobsStoresTestBlock!(fg, v1)
     @test listDataEntries(fg, :b) == Symbol[:label2]
 
     #delete
-    @test deleteDataEntry!(var1, de1) == de1
-    @test listDataEntries(var1) == Symbol[:label2]
+    @test deleteDataEntry!(fg, var1.label, de1.label) == de1
+    @test listDataEntries(fg, var1.label) == Symbol[:label2]
     #delete from dfg
     @test deleteDataEntry!(fg, :a, :label2) == de2_update
+    var1 = getVariable(fg, :a)
     @test listDataEntries(var1) == Symbol[]
 
     # Blobstore functions
@@ -939,19 +936,19 @@ function blobsStoresTestBlock!(fg, v1)
     # Data functions
     testData = rand(UInt8, 50)
     # Adding 
-    newData = addData!(fg, fs.key, getLabel(v1), :testing, testData)
+    newData = addData!(fg, fs.key, :a, :testing, testData)
     # Listing
-    @test :testing in listDataEntries(fg, getLabel(v1))
+    @test :testing in listDataEntries(fg, :a)
     # Getting
-    data = getData(fg, fs, getLabel(v1), :testing)
+    data = getData(fg, fs, :a, :testing)
     @test data[1].hash == newData[1].hash
     @test data[2] == newData[2]
     # Updating
-    updateData = updateData!(fg, fs, getLabel(v1), newData[1], rand(UInt8, 50))
+    updateData = updateData!(fg, fs, :a, newData[1], rand(UInt8, 50))
     @test updateData[1].hash != data[1].hash
     @test updateData[2] != data[2]
     # Deleting
-    retData = deleteData!(fg, getLabel(v1), :testing)
+    retData = deleteData!(fg, :a, :testing)
 
 end