Merge pull request #1581 from xmera-circle/feature/add-current-workfl…

…ow-state-to-dmsf-files-show-api Feature/add current workflow state to dmsf files show api
danmunn · Jan 21, 2025 · 6d1437f · 6d1437f
2 parents 73d3afa + 1d9f244
commit 6d1437f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/views/dmsf_files/show.api.rsb b/app/views/dmsf_files/show.api.rsb
@@ -34,6 +34,7 @@ api.dmsf_file do
         api.dmsf_workflow_assigned_at r.dmsf_workflow_assigned_at
         api.dmsf_workflow_started_by_user_id r.dmsf_workflow_started_by_user_id
         api.dmsf_workflow_started_at r.dmsf_workflow_started_at
+        api.dmsf_worklfow_state r.workflow_str(false)
         api.digest r.digest
         render_api_custom_values r.visible_custom_field_values, api
       end

diff --git a/test/integration/rest_api/dmsf_file_api_test.rb b/test/integration/rest_api/dmsf_file_api_test.rb
@@ -65,6 +65,7 @@ def test_get_document
     #       <dmsf_workflow_assigned_at/>
     #       <dmsf_workflow_started_by_user_id/>
     #       <dmsf_workflow_started_at/>
+    #       <dmsf_worklfow_state>Waiting for Approval</dmsf_workflow_state>
     #       <digest></digest>
     #     </dmsf_file_revision>
     #     <dmsf_file_revision>
@@ -87,6 +88,7 @@ def test_get_document
     #       <dmsf_workflow_assigned_at/>
     #       <dmsf_workflow_started_by_user_id>1</dmsf_workflow_started_by_user_id>
     #       <dmsf_workflow_started_at/>
+    #       <dmsf_worklfow_state>Waiting for Approval</dmsf_workflow_state>
     #       <digest>81dc9bdb52d04dc20036dbd8313ed055</digest>
     #       <custom_fields>
     #         <custom_field>
@@ -103,6 +105,8 @@ def test_get_document
     assert_select 'dmsf_file > content_url', text: "http://www.example.com/dmsf/files/#{@file1.id}/download"
     assert_select 'dmsf_file > dmsf_file_revisions > dmsf_file_revision', @file1.dmsf_file_revisions.all.size
     assert_select 'dmsf_file > dmsf_file_revisions > dmsf_file_revision > custom_fields > custom_field'
+    assert_select 'dmsf_file > dmsf_file_revisions > dmsf_file_revision > dmsf_worklfow_state',
+                  text: 'Waiting for Approval'
     # curl -v -H "Content-Type: application/octet-stream" -X GET -u ${1}:${2}
     #   http://localhost:3000/dmsf/files/41532/download > file.txt
     get "/dmsf/files/#{@file1.id}/download.xml?key=#{@token.value}"