Updating test for study with approvals

crc/services/workflow_service.py

@@ -384,7 +384,8 @@ class WorkflowService(object):
         except TypeError as te:
             raise ApiError.from_task(code="template_error", message="Error processing template for task %s: %s" %
                                                           (spiff_task.task_spec.name, str(te)), task=spiff_task)
-        # TODO:  Catch additional errors and report back.
+        except Exception as e:
+            app.logger.error(str(e), exc_info=True)
 
     @staticmethod
     def process_options(spiff_task, field):

tests/approval/test_approvals_api.py

@@ -217,27 +217,6 @@ class TestApprovals(BaseTest):
         total_counts = sum(counts[status] for status in statuses)
         self.assertEqual(total_counts, len(approvals), 'Total approval counts for user should match number of approvals for user')
 
-    def _create_study_workflow_approvals(self, user_uid, title, primary_investigator_id, approver_uids, statuses,
-                                         workflow_spec_name="random_fact"):
-        study = self.create_study(uid=user_uid, title=title, primary_investigator_id=primary_investigator_id)
-        workflow = self.create_workflow(workflow_name=workflow_spec_name, study=study)
-        approvals = []
-
-        for i in range(len(approver_uids)):
-            approvals.append(self.create_approval(
-                study=study,
-                workflow=workflow,
-                approver_uid=approver_uids[i],
-                status=statuses[i],
-                version=1
-            ))
-
-        return {
-            'study': study,
-            'workflow': workflow,
-            'approvals': approvals,
-        }
-
     def _add_lots_of_random_approvals(self, n=100, workflow_spec_name="random_fact"):
         num_studies_before = db.session.query(StudyModel).count()
         statuses = [name for name, value in ApprovalStatus.__members__.items()]

tests/base_test.py

@@ -240,6 +240,29 @@ class BaseTest(unittest.TestCase):
             db.session.commit()
         return study
 
+    def _create_study_workflow_approvals(self, user_uid, title, primary_investigator_id, approver_uids, statuses,
+                                         workflow_spec_name="random_fact"):
+        study = self.create_study(uid=user_uid, title=title, primary_investigator_id=primary_investigator_id)
+        workflow = self.create_workflow(workflow_name=workflow_spec_name, study=study)
+        approvals = []
+
+        for i in range(len(approver_uids)):
+            approvals.append(self.create_approval(
+                study=study,
+                workflow=workflow,
+                approver_uid=approver_uids[i],
+                status=statuses[i],
+                version=1
+            ))
+
+        full_study = {
+            'study': study,
+            'workflow': workflow,
+            'approvals': approvals,
+        }
+
+        return full_study
+
     def create_workflow(self, workflow_name, study=None, category_id=None):
         db.session.flush()
         spec = db.session.query(WorkflowSpecModel).filter(WorkflowSpecModel.name == workflow_name).first()

tests/study/test_study_api.py

@@ -7,6 +7,7 @@ from unittest.mock import patch
 from crc import session, app
 from crc.models.protocol_builder import ProtocolBuilderStatus, \
     ProtocolBuilderStudySchema
+from crc.models.approval import ApprovalStatus
 from crc.models.stats import TaskEventModel
 from crc.models.study import StudyModel, StudySchema
 from crc.models.workflow import WorkflowSpecModel, WorkflowModel
@@ -95,8 +96,21 @@ class TestStudyApi(BaseTest):
         # TODO: WRITE A TEST FOR STUDY FILES
 
     def test_get_study_has_details_about_approvals(self):
-        # TODO: WRITE A TEST FOR STUDY APPROVALS
-        pass
+        self.load_example_data()
+        full_study = self._create_study_workflow_approvals(
+            user_uid="dhf8r", title="first study", primary_investigator_id="lb3dp",
+            approver_uids=["lb3dp", "dhf8r"], statuses=[ApprovalStatus.PENDING.value, ApprovalStatus.PENDING.value]
+        )
+
+        api_response = self.app.get('/v1.0/study/%i' % full_study['study'].id,
+                                    headers=self.logged_in_headers(), content_type="application/json")
+        self.assert_success(api_response)
+        study = StudySchema().loads(api_response.get_data(as_text=True))
+
+        self.assertEqual(len(study.approvals), 2)
+
+        for approval in study.approvals:
+            self.assertEqual(full_study['study'].title, approval['title'])
 
     def test_add_study(self):
         self.load_example_data()