Merge pull request #584 from ayobi/claim_received_samples

allow users to claim received samples

Author: cassidysymons

microsetta_private_api/api/tests/test_api.py

@@ -2319,6 +2319,7 @@ def test_associate_sample_locked(self):
 
         base_url = '/api/accounts/{0}/sources/{1}/samples'.format(
             dummy_acct_id, dummy_source_id)
+        sample_url = "{0}/{1}".format(base_url, MOCK_SAMPLE_ID)
 
         # "scan" the sample in
         _ = create_dummy_acct(create_dummy_1=True,
@@ -2333,7 +2334,8 @@ def test_associate_sample_locked(self):
                                      headers=make_headers(FAKE_TOKEN_ADMIN))
         self.assertEqual(201, post_resp.status_code)
 
-        # attempt to associate as a regular user
+        # allow users to claim samples not
+        # currently associated with a source
         post_resp = self.client.post(
             '%s?%s' % (base_url, self.default_lang_querystring),
             content_type='application/json',
@@ -2345,7 +2347,15 @@ def test_associate_sample_locked(self):
         )
 
         # check response code
-        self.assertEqual(422, post_resp.status_code)
+        self.assertEqual(201, post_resp.status_code)
+
+        # delete as admin so that tearDown doesn't require admin
+        delete_resp = self.client.delete(
+            '%s?%s' % (sample_url, self.default_lang_querystring),
+            headers=make_headers(FAKE_TOKEN_ADMIN))
+
+        # verify the delete was successful
+        self.assertEqual(204, delete_resp.status_code)
 
         # associate as admin user
         post_resp = self.client.post(
@@ -2361,6 +2371,21 @@ def test_associate_sample_locked(self):
         # check response code
         self.assertEqual(201, post_resp.status_code)
 
+        # attempt to associate as a regular user
+        # where the sample does have associated source id
+        post_resp = self.client.post(
+            '%s?%s' % (base_url, self.default_lang_querystring),
+            content_type='application/json',
+            data=json.dumps(
+                {
+                    'sample_id': MOCK_SAMPLE_ID,
+                }),
+            headers=self.dummy_auth
+        )
+
+        # check response code
+        self.assertEqual(422, post_resp.status_code)
+
     def test_edit_sample_locked(self):
         dummy_acct_id, dummy_source_id = create_dummy_source(
             "Bo", Source.SOURCE_TYPE_HUMAN, DUMMY_HUMAN_SOURCE,

microsetta_private_api/repo/sample_repo.py

@@ -106,7 +106,10 @@ def _update_sample_association(self, sample_id, source_id,
                                    override_locked=False):
         with self._transaction.cursor() as cur:
             existing_sample = self._get_sample_by_id(sample_id)
-            if existing_sample.remove_locked and not override_locked:
+            # if the sample is not associated with a source, then
+            # we can skip the lock checks
+            if existing_sample.source_id is not None \
+                    and existing_sample.remove_locked and not override_locked:
                 raise RepoException(
                     "Sample association locked: Sample already received")