Skip to content

Commit aecb24f

Browse files
committed
CGStructure updates
1 parent 0fda37d commit aecb24f

File tree

2 files changed

+40
-6
lines changed

2 files changed

+40
-6
lines changed

src/CloudGraphsDFG/entities/CGStructure.jl

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,34 @@ mutable struct User <: AbstractCGNode
1010
id::Symbol
1111
name::String
1212
description::String
13-
# labels::Vector{Symbol}
1413
data::Dict{Symbol, String}
14+
createdTimestamp::String
15+
lastUpdatedTimestamp::String
16+
User(id::Symbol,
17+
name::String,
18+
description::String,
19+
data::Dict{Symbol, String},
20+
createdTimestamp::String=string(now(UTC)),
21+
lastUpdatedTimestamp::String=string(now(UTC))) =
22+
new(id, name, description, data, createdTimestamp, lastUpdatedTimestamp)
1523
end
1624

1725
mutable struct Robot <: AbstractCGNode
1826
id::Symbol
1927
userId::Symbol
2028
name::String
2129
description::String
22-
# labels::Vector{Symbol}
2330
data::Dict{Symbol, String}
31+
createdTimestamp::String
32+
lastUpdatedTimestamp::String
33+
Robot(id::Symbol,
34+
userId::Symbol,
35+
name::String,
36+
description::String,
37+
data::Dict{Symbol, String},
38+
createdTimestamp::String=string(now(UTC)),
39+
lastUpdatedTimestamp::String=string(now(UTC))) =
40+
new(id, userId, name, description, data, createdTimestamp, lastUpdatedTimestamp)
2441
end
2542

2643
mutable struct Session <: AbstractCGNode
@@ -29,6 +46,17 @@ mutable struct Session <: AbstractCGNode
2946
userId::Symbol
3047
name::String
3148
description::String
32-
# labels::Vector{Symbol}
3349
data::Dict{Symbol, String}
50+
createdTimestamp::String
51+
lastUpdatedTimestamp::String
52+
Session(id::Symbol,
53+
robotId::Symbol,
54+
userId::Symbol,
55+
name::String,
56+
description::String,
57+
data::Dict{Symbol, String},
58+
createdTimestamp::String=string(now(UTC)),
59+
lastUpdatedTimestamp::String=string(now(UTC))) =
60+
new(id, robotId,userId, name, description, data, createdTimestamp, lastUpdatedTimestamp)
61+
3462
end

src/CloudGraphsDFG/services/CGStructure.jl

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ function _convertDictToSession(dict::Dict{String, Any})::Session
3232
Symbol(dict["userId"]),
3333
dict["name"],
3434
dict["description"],
35-
data)
35+
data,
36+
dict["createdTimestamp"],
37+
dict["lastUpdatedTimestamp"])
3638
return session
3739
end
3840
#TODO: Refactor, #HACK :D (but it works!)
@@ -43,7 +45,9 @@ function _convertDictToRobot(dict::Dict{String, Any})::Robot
4345
Symbol(dict["userId"]),
4446
dict["name"],
4547
dict["description"],
46-
data)
48+
data,
49+
dict["createdTimestamp"],
50+
dict["lastUpdatedTimestamp"])
4751
return robot
4852
end
4953
#TODO: Refactor, #HACK :D (but it works!)
@@ -53,7 +57,9 @@ function _convertDictToUser(dict::Dict{String, Any})::User
5357
Symbol(dict["id"]),
5458
dict["name"],
5559
dict["description"],
56-
data)
60+
data,
61+
dict["createdTimestamp"],
62+
dict["lastUpdatedTimestamp"])
5763
return user
5864
end
5965

0 commit comments

Comments
 (0)