fix DataServiceModel and add test (#82)

DARPA-ASKEM · Jul 17, 2023 · df4909a · df4909a
1 parent a97e389
commit df4909a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 3 deletions.
diff --git a/src/SimulationService.jl b/src/SimulationService.jl
@@ -217,10 +217,11 @@ Base.@kwdef mutable struct DataServiceModel
     execution_payload::Config = Config()    # untouched JSON from request sent by HMI
     workflow_id::String = "IGNORED"         # (ignore)
     # Optional
-    description::String = ""                                # (ignore)
-    timestamp::Union{Nothing, DateTime} = nothing             # (ignore?)
+    name::Union{Nothing, String} = nothing                  # (ignore)
+    description::Union{Nothing, String} = nothing           # (ignore)
+    timestamp::Union{Nothing, DateTime} = nothing           # (ignore?)
     result_files::Union{Nothing, Vector{String}} = nothing  # URLs of result files in S3
-    status::Union{Nothing, String} = "queued"                # queued|running|complete|error|cancelled|failed"
+    status::Union{Nothing, String} = "queued"               # queued|running|complete|error|cancelled|failed"
     reason::Union{Nothing, String} = nothing                # why simulation failed (returned junk results)
     start_time::Union{Nothing, DateTime} = nothing          # when job started
     completed_time::Union{Nothing, DateTime} = nothing      # when job completed

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -67,6 +67,38 @@ end
 
 #-----------------------------------------------------------# DataServiceModel and OperationRequest
 @testset "DataServiceModel and OperationRequest" begin
+    @testset "DataServiceModel" begin
+        example = """{
+            "id": "sciml-dfca06dd-b044-436f-a744-0d0a30cc130f",
+            "name": null,
+            "description": null,
+            "timestamp": "2023-07-16T21:00:47",
+            "engine": "sciml",
+            "type": "simulation",
+            "status": "queued",
+            "execution_payload": {
+              "engine": "sciml",
+              "model_config_id": "84d0b51d-7d4c-497f-98fa-a00e31c344db",
+              "timespan": {
+                "start": 1,
+                "end": 100
+              },
+              "num_samples": null,
+              "extra": {},
+              "interventions": null
+            },
+            "start_time": null,
+            "completed_time": null,
+            "workflow_id": "dummy",
+            "user_id": 0,
+            "project_id": 0,
+            "result_files": []
+        }"""
+        @test JSON3.read(example, DataServiceModel) isa DataServiceModel
+
+    end
+
+
     m = DataServiceModel()
     @test m.engine == "sciml"
     @test m.id == ""