add additional contracts to assay and study remove

nfdi4plants · Nov 20, 2023 · cb128d1 · cb128d1
1 parent 60e3fff
commit cb128d1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 16 deletions.
diff --git a/src/ARCtrl/ARC.fs b/src/ARCtrl/ARC.fs
@@ -72,22 +72,40 @@ type ARC(?isa : ISA.ArcInvestigation, ?cwl : CWL.CWL, ?fs : FileSystem.FileSyste
         and set(fs) = _fs <- fs
 
     member this.RemoveAssay(assayIdentifier: string) =
-        if this.ISA.IsNone then failwith "Cannot remove assay from null ISA value."
-        this.ISA.Value.RemoveAssay(assayIdentifier)
+        let isa = 
+            match this.ISA with
+            | Some i -> i
+            | None -> failwith "Cannot remove assay from null ISA value."
+        let assay = isa.GetAssay(assayIdentifier)
+        let studies = assay.StudiesRegisteredIn
+        isa.RemoveAssay(assayIdentifier)
         let paths = this.FileSystem.Tree.ToFilePaths()
         let assayFolderPath = Path.getAssayFolderPath(assayIdentifier)
         let filteredPaths = paths |> Array.filter (fun p -> p.StartsWith(assayFolderPath) |> not)
-        this.SetFilePaths(filteredPaths)
-        Contract.createDelete(assayFolderPath)
+        this.SetFilePaths(filteredPaths)      
+        [
+            assay.ToDeleteContract()
+            isa.ToUpdateContract()
+            for s in studies do
+                s.ToUpdateContract()
+        ]
+        |> ResizeArray
 
     member this.RemoveStudy(studyIdentifier: string) =
-        if this.ISA.IsNone then failwith "Cannot remove study from null ISA value."
+        let isa = 
+            match this.ISA with
+            | Some i -> i
+            | None -> failwith "Cannot remove study from null ISA value."
         this.ISA.Value.RemoveStudy(studyIdentifier)
         let paths = this.FileSystem.Tree.ToFilePaths()
         let studyFolderPath = Path.getStudyFolderPath(studyIdentifier)
         let filteredPaths = paths |> Array.filter (fun p -> p.StartsWith(studyFolderPath) |> not)
         this.SetFilePaths(filteredPaths)
-        Contract.createDelete(studyFolderPath)
+        [
+            Contract.createDelete(studyFolderPath)
+            isa.ToUpdateContract()
+        ]
+        |> ResizeArray
 
     //static member updateISA (isa : ISA.Investigation) (arc : ARC) : ARC =
     //    raise (System.NotImplementedException())

diff --git a/src/ARCtrl/Contracts/Contracts.ArcTypes.fs b/src/ARCtrl/Contracts/Contracts.ArcTypes.fs
@@ -1,5 +1,6 @@
 namespace ARCtrl.Contract
 
+open ARCtrl
 open ARCtrl.Path
 open ARCtrl.ISA.Spreadsheet
 open ARCtrl.ISA
@@ -42,15 +43,15 @@ module ArcTypeExtensions =
             let c = Contract.createUpdate(path, DTOType.ISA_Investigation, DTO.Spreadsheet (this |> ArcInvestigation.toFsWorkbook))
             c
 
-        member this.ToDeleteContract () =
-            let path = InvestigationFileName
-            let c = Contract.createDelete(path)
-            c
+        //member this.ToDeleteContract () =
+        //    let path = InvestigationFileName
+        //    let c = Contract.createDelete(path)
+        //    c
 
-        static member toDeleteContract () : Contract =
-            let path = InvestigationFileName
-            let c = Contract.createDelete(path)
-            c
+        //static member toDeleteContract () : Contract =
+        //    let path = InvestigationFileName
+        //    let c = Contract.createDelete(path)
+        //    c
 
         static member toCreateContract (inv: ArcInvestigation) : Contract =
             inv.ToCreateContract()
@@ -80,7 +81,7 @@ module ArcTypeExtensions =
             c
 
         member this.ToDeleteContract () =
-            let path = Identifier.Study.fileNameFromIdentifier this.Identifier
+            let path = Path.getStudyFolderPath(this.Identifier)
             let c = Contract.createDelete(path)
             c
 
@@ -114,7 +115,7 @@ module ArcTypeExtensions =
             c
 
         member this.ToDeleteContract () =
-            let path = Identifier.Assay.fileNameFromIdentifier this.Identifier
+            let path = Path.getAssayFolderPath(this.Identifier)
             let c = Contract.createDelete(path)
             c