Updating data entries to latest data structure

Author: GearsAD

src/DataBlobs/entities/AbstractDataEntries.jl

@@ -8,7 +8,7 @@
 getLabel(entry::AbstractDataEntry) = entry.label
 getId(entry::AbstractDataEntry) = entry.id
 getHash(entry::AbstractDataEntry) = hex2bytes(entry.hash)
-getCreatedTimestamp(entry::AbstractDataEntry) = entry.createdTimestamp
+getTimestamp(entry::AbstractDataEntry) = entry.timestamp
 
 
 ##==============================================================================
@@ -18,43 +18,44 @@ export BlobStoreEntry
 
 """
     $(TYPEDEF)
-Genaral Data Store Entry.
+General Data Store Entry.
 """
-struct BlobStoreEntry <: AbstractDataEntry
+@Base.kwdef struct BlobStoreEntry <: AbstractDataEntry
+    id::Union{UUID, Nothing}
     label::Symbol
-    id::UUID
     blobstore::Symbol
     hash::String # Probably https://docs.julialang.org/en/v1/stdlib/SHA
     origin::String # E.g. user|robot|session|varlabel
     description::String
     mimeType::String
-    createdTimestamp::ZonedDateTime # of when the entry was created
+    metadata::String
+    timestamp::ZonedDateTime = now(localzone())
 end
 
 _fixtimezone(cts::NamedTuple) = ZonedDateTime(cts.utc_datetime*"+00")
 
 # needed for deserialization from JSON during DFG v0.19 transition, see #867
 function BlobStoreEntry(;
-    label,
     id,
+    label,
     blobstore,
     hash,
     origin,
     description,
     mimeType,
-    createdTimestamp,
+    timestamp,
     kwargs... # drop excessive fields
 )
     #
     BlobStoreEntry(
-        Symbol(label),
         UUID(id),
+        Symbol(label),
         Symbol(blobstore),
         hash,
         origin,
         description,
         mimeType,
-        _fixtimezone(createdTimestamp),
+        _fixtimezone(timestamp),
     )
 end
 

src/DataBlobs/services/BlobStores.jl

@@ -103,9 +103,9 @@ end
 
 function updateData!(dfg::AbstractDFG, blobstore::AbstractBlobStore, label::Symbol,  entry::AbstractDataEntry, blob::Vector{UInt8}; hashfunction = sha256)
     # Recalculate the hash - NOTE Assuming that this is going to be a BlobStoreEntry. TBD.
-    newEntry = BlobStoreEntry(entry.label, entry.id, blobstore.key, bytes2hex(hashfunction(blob)),
+    newEntry = BlobStoreEntry(entry.id, entry.label, blobstore.key, bytes2hex(hashfunction(blob)),
         buildSourceString(dfg, label),
-        entry.description, entry.mimeType, entry.createdTimestamp)
+        entry.description, entry.mimeType, entry.metadata, entry.timestamp)
 
     de = updateDataEntry!(dfg, label, newEntry)
     db = updateDataBlob!(blobstore, de, blob)
@@ -136,9 +136,9 @@ function addData!(dfg::AbstractDFG, blobstore::AbstractBlobStore, label::Symbol,
                   blob::Vector{UInt8}, timestamp=now(localzone()); description="", mimeType = "application/octet-stream", id::UUID = uuid4(), hashfunction = sha256)
 
 
-    entry = BlobStoreEntry(key, id, blobstore.key, bytes2hex(hashfunction(blob)),
+    entry = BlobStoreEntry(id, key, blobstore.key, bytes2hex(hashfunction(blob)),
                            buildSourceString(dfg, label),
-                           description, mimeType, timestamp)
+                           description, mimeType, "", timestamp)
 
     addData!(dfg, blobstore, label, entry, blob; hashfunction)
 end

test/testBlocks.jl

@@ -850,11 +850,11 @@ function  DataEntriesTestBlock!(fg, v2)
     # listDataEntries
     # emptyDataEntries
     # mergeDataEntries
-    storeEntry = BlobStoreEntry(:a,uuid4(), :b, "","","","",now(localzone()))
+    storeEntry = BlobStoreEntry(uuid4(), :a, :b, "","","","", "", now(localzone()))
     @test getLabel(storeEntry) == storeEntry.label
     @test getId(storeEntry) == storeEntry.id
     @test getHash(storeEntry) == hex2bytes(storeEntry.hash)
-    @test getCreatedTimestamp(storeEntry) == storeEntry.createdTimestamp
+    @test getTimestamp(storeEntry) == storeEntry.timestamp
 
     oid = zeros(UInt8,12); oid[12] = 0x01
     de1 = MongodbDataEntry(:key1, uuid4(), NTuple{12,UInt8}(oid), "", now(localzone()))
@@ -903,13 +903,13 @@ end
 
 function blobsStoresTestBlock!(fg)
 
-    de1 = BlobStoreEntry(:label1,uuid4(), :store1, "AAAA","origin1","description1","mimetype1",now(localzone()))
-    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"))
+    de1 = BlobStoreEntry(uuid4(),:label1, :store1, "AAAA","origin1","description1","mimetype1","", now(localzone()))
+    de2 = BlobStoreEntry(uuid4(),:label2, :store2, "FFFF","origin2","description2","mimetype2","", ZonedDateTime("2020-08-12T12:00:00.000+00:00"))
+    de2_update = BlobStoreEntry(uuid4(),:label2, :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)
-    @test getCreatedTimestamp(de1) == de1.createdTimestamp
+    @test getTimestamp(de1) == de1.timestamp
 
     #add
     var1 = getVariable(fg, :a)