#433: Add api functions for mandatory dynamic props on some classes

nfdi4plants · Sep 6, 2024 · 7d1e733 · 7d1e733
1 parent ac7e6d2
commit 7d1e733
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 37 deletions.
diff --git a/src/ROCrate/ISAProfile/Assay.fs b/src/ROCrate/ISAProfile/Assay.fs
@@ -6,8 +6,8 @@ open Fable.Core
 ///
 [<AttachMembers>]
 type Assay(
-    id,
-    identifier,
+    id: string,
+    identifier: string,
     ?about,
     ?comment,
     ?creator,
@@ -28,4 +28,7 @@ type Assay(
         DynObj.setValueOpt this (nameof comment) comment
         DynObj.setValueOpt this (nameof creator) creator
         DynObj.setValueOpt this (nameof hasPart) hasPart
-        DynObj.setValueOpt this (nameof url) url
+        DynObj.setValueOpt this (nameof url) url
+
+    member this.GetIdentifier() = DynObj.tryGetTypedValue<string> (nameof identifier) this |> Option.get
+    static member getIdentifier = fun (ass: Assay) -> ass.GetIdentifier()
diff --git a/src/ROCrate/ISAProfile/Investigation.fs b/src/ROCrate/ISAProfile/Investigation.fs
@@ -6,8 +6,8 @@ open Fable.Core
 ///
 [<AttachMembers>]
 type Investigation(
-    id,
-    identifier,
+    id: string,
+    identifier: string,
     ?citation,
     ?comment,
     ?creator,
@@ -35,3 +35,6 @@ type Investigation(
         DynObj.setValueOpt this (nameof mentions) mentions
         DynObj.setValueOpt this (nameof url) url
         DynObj.setValueOpt this (nameof description) description
+
+    member this.GetIdentifier() = DynObj.tryGetTypedValue<string> (nameof identifier) this |> Option.get
+    static member getIdentifier = fun (inv: Investigation) -> inv.GetIdentifier()
diff --git a/src/ROCrate/ISAProfile/LabProcess.fs b/src/ROCrate/ISAProfile/LabProcess.fs
@@ -6,7 +6,7 @@ open Fable.Core
 ///
 [<AttachMembers>]
 type LabProcess(
-    id,
+    id: string,
     name,
     agent,
     object,
@@ -27,4 +27,16 @@ type LabProcess(
         DynObj.setValueOpt this (nameof executesLabProtocol) executesLabProtocol
         DynObj.setValueOpt this (nameof parameterValue) parameterValue
         DynObj.setValueOpt this (nameof endTime) endTime
-        DynObj.setValueOpt this (nameof disambiguatingDescription) disambiguatingDescription
+        DynObj.setValueOpt this (nameof disambiguatingDescription) disambiguatingDescription
+
+    member this.GetName() = DynObj.tryGetValue this (nameof name)  |> Option.get
+    static member getName = fun (lp: LabProcess) -> lp.GetName()
+
+    member this.GetAgent() = DynObj.tryGetTypedValue<string> (nameof agent) this |> Option.get
+    static member getAgent = fun (lp: LabProcess) -> lp.GetAgent()
+
+    member this.GetObject() = DynObj.tryGetTypedValue<string> (nameof object) this |> Option.get
+    static member getObject = fun (lp: LabProcess) -> lp.GetObject()
+
+    member this.GetResult() = DynObj.tryGetTypedValue<string> (nameof result) this |> Option.get
+    static member getResult = fun (lp: LabProcess) -> lp.GetResult()
diff --git a/src/ROCrate/ISAProfile/Study.fs b/src/ROCrate/ISAProfile/Study.fs
@@ -6,8 +6,8 @@ open Fable.Core
 ///
 [<AttachMembers>]
 type Study(
-    id,
-    identifier,
+    id: string,
+    identifier: string,
     ?about,
     ?citation,
     ?comment,
@@ -36,3 +36,5 @@ type Study(
         DynObj.setValueOpt this (nameof headline) headline
         DynObj.setValueOpt this (nameof url) url
 
+    member this.GetIdentifier() = DynObj.tryGetTypedValue<string> (nameof identifier) this |> Option.get
+    static member getIdentifier = fun (inv: Investigation) -> inv.GetIdentifier()
diff --git a/src/ROCrate/ROCrateObject.fs b/src/ROCrate/ROCrateObject.fs
@@ -42,15 +42,14 @@ type ROCrateObject(id:string, schemaType: string, ?additionalType) =
     member this.SetContext (context: #DynamicObj) =
         this.SetValue("@context", context)
 
-    static member setContext (context: #DynamicObj) =
-        fun (roc: #ROCrateObject) -> roc.SetContext(context)
+    static member setContext (context: #DynamicObj) = fun (roc: #ROCrateObject) -> roc.SetContext(context)
 
     member this.TryGetContext() =
         DynObj.tryGetTypedValue<DynamicObj>("@context") this
 
-    static member tryGetContext (roc: #ROCrateObject) = roc.TryGetContext()
+    static member tryGetContext () = fun (roc: #ROCrateObject) -> roc.TryGetContext()
 
     member this.RemoveContext() =
         this.Remove("@context")
 
-    static member removeContext (roc: #ROCrateObject) = roc.RemoveContext()
+    static member removeContext () = fun (roc: #ROCrateObject) -> roc.RemoveContext()
diff --git a/tests/ROCrate/ISAProfile/Assay.Tests.fs b/tests/ROCrate/ISAProfile/Assay.Tests.fs
@@ -92,10 +92,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/Data.Tests.fs b/tests/ROCrate/ISAProfile/Data.Tests.fs
@@ -82,10 +82,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/Dataset.Tests.fs b/tests/ROCrate/ISAProfile/Dataset.Tests.fs
@@ -66,10 +66,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/Investigation.Tests.fs b/tests/ROCrate/ISAProfile/Investigation.Tests.fs
@@ -98,10 +98,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/LabProcess.tests.fs b/tests/ROCrate/ISAProfile/LabProcess.tests.fs
@@ -97,10 +97,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/LabProtocol.Tests.fs b/tests/ROCrate/ISAProfile/LabProtocol.Tests.fs
@@ -90,10 +90,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/Person.Tests.fs b/tests/ROCrate/ISAProfile/Person.Tests.fs
@@ -96,10 +96,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/PropertyValue.Tests.fs b/tests/ROCrate/ISAProfile/PropertyValue.Tests.fs
@@ -88,10 +88,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/Sample.tests.fs b/tests/ROCrate/ISAProfile/Sample.tests.fs
@@ -80,10 +80,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/ScholarlyArticle.Tests.fs b/tests/ROCrate/ISAProfile/ScholarlyArticle.Tests.fs
@@ -88,10 +88,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ISAProfile/Study.Tests.fs b/tests/ROCrate/ISAProfile/Study.Tests.fs
@@ -98,10 +98,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )

diff --git a/tests/ROCrate/ROCrateObject.Tests.fs b/tests/ROCrate/ROCrateObject.Tests.fs
@@ -66,10 +66,10 @@ let tests_static_methods = testSequenced (
             ROCrateObject.setContext context mandatory_properties
             Expect.ROCrateObjectHasDynamicProperty "@context" context mandatory_properties
         testCase "can get context" <| fun _ ->
-            let ctx = ROCrateObject.tryGetContext mandatory_properties
+            let ctx = ROCrateObject.tryGetContext() mandatory_properties
             Expect.equal ctx (Some context) "context was not set correctly"
         testCase "can remove context" <| fun _ ->
-            ROCrateObject.removeContext mandatory_properties
+            ROCrateObject.removeContext() mandatory_properties
             Expect.isNone (DynObj.tryGetTypedValue<DynamicObj> "@context" mandatory_properties) "context was not removed correctly"
     ]
 )