Merge pull request #688 from antgonza/actual-fix-to-download-permissions

actual fix

Author: ElDeveloper

qiita_db/meta_util.py

@@ -91,11 +91,12 @@ def get_accessible_filepath_ids(user_id):
             for pt_id in RawData(rdid).prep_templates:
                 for _id, _ in PrepTemplate(pt_id).get_filepaths():
                     prep_fp_ids.append(_id)
-
         filepath_ids.update(prep_fp_ids)
-        sample_fp_ids = [_id for _id, _
-                         in SampleTemplate(study_id).get_filepaths()]
-        filepath_ids.update(sample_fp_ids)
+
+        if SampleTemplate.exists(study_id):
+            sample_fp_ids = [_id for _id, _
+                             in SampleTemplate(study_id).get_filepaths()]
+            filepath_ids.update(sample_fp_ids)
 
     # Next, analyses
     # Same as before, ther eare public, private, and shared

qiita_db/test/test_meta_util.py

@@ -10,6 +10,8 @@
 
 from qiita_core.util import qiita_test_checker
 from qiita_db.meta_util import get_accessible_filepath_ids
+from qiita_db.study import Study
+from qiita_db.user import User
 
 
 @qiita_test_checker()
@@ -40,5 +42,29 @@ def test_get_accessible_filepath_ids(self):
         obs = get_accessible_filepath_ids('[email protected]')
         self.assertEqual(obs, set())
 
+        # Test that it doesn't brake if the SampleTemplate hasn't been added
+        exp = set([1, 2, 3, 4, 5, 6, 7, 11, 14, 15, 16])
+        obs = get_accessible_filepath_ids('[email protected]')
+        self.assertEqual(obs, exp)
+
+        info = {
+            "timeseries_type_id": 1,
+            "metadata_complete": True,
+            "mixs_compliant": True,
+            "number_samples_collected": 4,
+            "number_samples_promised": 4,
+            "portal_type_id": 3,
+            "study_alias": "TestStudy",
+            "study_description": "Description of a test study",
+            "study_abstract": "No abstract right now...",
+            "emp_person_id": 1,
+            "principal_investigator_id": 1,
+            "lab_person_id": 1
+        }
+        Study.create(User('[email protected]'), "Test study", [1], info)
+        obs = get_accessible_filepath_ids('[email protected]')
+        self.assertEqual(obs, exp)
+
+
 if __name__ == '__main__':
     main()