Skip to content

fix #3122 #3136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 24, 2021
Merged

fix #3122 #3136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
01f20ee
fix #3122
antgonza Aug 23, 2021
86b5b30
fix #3122
antgonza Aug 23, 2021
f536764
fix #3124
antgonza Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion qiita_db/test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,7 +763,7 @@ def test_generate_analysis_list(self):
obs = qdb.util.generate_analysis_list([1, 2, 3, 5])
exp = [{'mapping_files': [
(16, qdb.util.get_filepath_information(16)['fullpath'])],
'description': 'A test analysis', 'artifacts': [9], 'name':
'description': 'A test analysis', 'artifacts': [8, 9], 'name':
'SomeAnalysis', 'analysis_id': 1, 'visibility': 'private'},
{'mapping_files': [], 'description': 'Another test analysis',
'artifacts': [], 'name': 'SomeSecondAnalysis',
Expand Down
3 changes: 1 addition & 2 deletions qiita_db/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1942,8 +1942,7 @@ def generate_analysis_list(analysis_ids, public_only=False):

sql = """
SELECT analysis_id, a.name, a.description, a.timestamp,
array_agg(DISTINCT CASE WHEN command_id IS NOT NULL
THEN artifact_id END),
array_agg(DISTINCT artifact_id),
array_agg(DISTINCT visibility),
array_agg(DISTINCT CASE WHEN filepath_type = 'plain_text'
THEN filepath_id END)
Expand Down
9 changes: 5 additions & 4 deletions qiita_ware/private_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,11 @@ def delete_study(job):
_delete_analysis_artifacts(analysis)

for pt in study.prep_templates():
to_delete = list(pt.artifact.descendants.nodes())
to_delete.reverse()
for td in to_delete:
qdb.artifact.Artifact.delete(td.id)
if pt.artifact:
to_delete = list(pt.artifact.descendants.nodes())
to_delete.reverse()
for td in to_delete:
qdb.artifact.Artifact.delete(td.id)
MT.prep_template.PrepTemplate.delete(pt.id)

if MT.sample_template.SampleTemplate.exists(study_id):
Expand Down
20 changes: 20 additions & 0 deletions qiita_ware/test/test_private_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,26 @@ def test_delete_study_empty_study(self):
"lab_person_id": StudyPerson(1)}
new_study = Study.create(User('test@foo.bar'),
"Fried Chicken Microbiome %s" % time(), info)
# creating a sample information file
metadata = pd.DataFrame.from_dict({
'Sample1': {'physical_specimen_location': 'location1',
'taxon_id': '9606',
'scientific_name': 'homo sapiens'},
'Sample2': {'physical_specimen_location': 'location1',
'taxon_id': '9606',
'scientific_name': 'homo sapiens'},
'Sample3': {'physical_specimen_location': 'location1',
'taxon_id': '9606',
'scientific_name': 'homo sapiens'}}, orient='index')
SampleTemplate.create(metadata, new_study)
# creating a preparation information file
metadata = pd.DataFrame.from_dict(
{'Sample1': {'center_name': 'ANL',
'target_subfragment': 'V4',
'center_project_name': 'Test Project'}},
orient='index', dtype=str)
PrepTemplate.create(metadata, new_study, '16S')

job = self._create_job('delete_study', {'study': new_study.id})
private_task(job.id)
self.assertEqual(job.status, 'success')
Expand Down