From 95c915a434d4a049215f698e00de859be07d10d4 Mon Sep 17 00:00:00 2001
From: mike cullerton <michaelc@cullerton.com>
Date: Thu, 26 May 2022 13:35:30 -0400
Subject: [PATCH] Remove code that doesn't let master workflow set state and
 state_message for admin sandbox workflows Remove test for this feature

---
 crc/services/workflow_service.py |  9 ++-------
 tests/study/test_study_api.py    | 18 ------------------
 2 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/crc/services/workflow_service.py b/crc/services/workflow_service.py
index e78e2ff1..b077edcd 100755
--- a/crc/services/workflow_service.py
+++ b/crc/services/workflow_service.py
@@ -1148,13 +1148,8 @@ class WorkflowService(object):
                 if WorkflowState.has_value(workflow_state):
                     # Get the workflow from our dictionary and set the state
                     workflow = wf_by_workflow_spec_id[workflow_spec_id]
-                    # Don't let the master workflow change the state for admin workflows
-                    if WorkflowService.is_admin_workflow(workflow_spec_id):
-                        workflow.state = 'optional'
-                        workflow.state_message = 'This is an Admin workflow'
-                    else:
-                        workflow.state = workflow_state
-                        workflow.state_message = workflow_state_message
+                    workflow.state = workflow_state
+                    workflow.state_message = workflow_state_message
                     session.add(workflow)
 
         session.commit()
diff --git a/tests/study/test_study_api.py b/tests/study/test_study_api.py
index 4d6cdaf8..b95254ec 100644
--- a/tests/study/test_study_api.py
+++ b/tests/study/test_study_api.py
@@ -102,24 +102,6 @@ class TestStudyApi(BaseTest):
         self.assertEqual('Completion of this workflow is required.', workflows[0].state_message)
         self.assertEqual('This workflow is locked', workflows[1].state_message)
 
-    def test_admin_workflows_not_locked(self):
-        """Admin category workflows should not be locked by the master workflow"""
-        # Add an admin category
-        self.assure_category_exists('test_admin_category', admin=True)
-        # Add a workflow to the admin category
-        self.load_test_spec('empty_workflow', category_id='test_admin_category')
-        # Add a master workflow that tries to lock the workflow
-        self.load_test_spec('test_master_workflow', master_spec=True)
-
-        study = self.add_test_study()
-        study_model = session.query(StudyModel).filter_by(id=study["id"]).first()
-        self.run_master_spec(study_model)
-
-        workflows = session.query(WorkflowModel).all()
-        self.assertEqual(1, len(workflows))
-        # The master workflow tries to lock this, but we don't lock if Admin category
-        self.assertEqual('optional', workflows[0].state)
-
     def test_get_study_has_details_about_files(self):
 
         # Set up the study and attach a file to it.