Add parsing of submission if present (#741)

Co-authored-by: Jaymee Hyppolite <[email protected]>
pulibrary · May 29, 2024 · a3b5b9c · a3b5b9c
1 parent 192aa88
commit a3b5b9c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/app/models/mediaflux/http/asset_metadata_request.rb b/app/models/mediaflux/http/asset_metadata_request.rb
@@ -75,9 +75,30 @@ def parse(asset)
             path: asset.xpath("./path").text,
             type: asset.xpath("./type").text,
             namespace: asset.xpath("./namespace").text,
-            accumulators: asset.xpath("./collection/accumulator/value"), # list of accumulator values in xml format. Can parse further through xpath
-            project_id: asset.xpath("//tigerdata:project/ProjectID", "tigerdata" => "tigerdata").text,
-            project_directory: asset.xpath("//tigerdata:project/ProjectDirectory", "tigerdata" => "tigerdata").text
+            accumulators: asset.xpath("./collection/accumulator/value") # list of accumulator values in xml format. Can parse further through xpath
+          }.merge(parse_project(asset))
+        end
+
+        def parse_project(asset)
+          project = asset.xpath("//tigerdata:project", "tigerdata" => "tigerdata").first
+          if project.present?
+            {
+              project_id: project.xpath("./ProjectID").text,
+              project_directory: project.xpath("./ProjectDirectory").text,
+              submission: parse_submission(project)
+            }
+          else
+            {}
+          end
+        end
+
+        def parse_submission(project)
+          submission = project.xpath("./Submission")
+          {
+            requested_by: submission.xpath("./RequestedBy").text,
+            requested_on: submission.xpath("./RequestDateTime").text,
+            approved_by: submission.xpath("./ApprovedBy").text,
+            approved_on: submission.xpath("./ApprovalDateTime").text
           }
         end
     end

diff --git a/spec/models/mediaflux/http/asset_metadata_request_spec.rb b/spec/models/mediaflux/http/asset_metadata_request_spec.rb
@@ -48,6 +48,10 @@
         expect(metadata[:quota_allocation]).to eq("300 GB")
         expect(metadata[:project_directory]).to eq("accum-07576")
         expect(metadata[:project_id]).to eq("doi-not-generated")
+        expect(metadata[:submission]).to eq({ approved_by: "",
+                                              approved_on: "",
+                                              requested_by: "cac9",
+                                              requested_on: "06-May-2024 14:04:49" })
         expect(WebMock).to have_requested(:post, mediflux_url)
       end
     end