Merge pull request #2119 from broadinstitute/jb-anndata-parse-email-b…

…ugfix Ignore differential expression jobs when computing ingestSummary event (SCP-5778)
broadinstitute · Sep 3, 2024 · a0ceb25 · a0ceb25
2 parents 20fdea2 + 71015e4
commit a0ceb25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/models/delete_queue_job.rb b/app/models/delete_queue_job.rb
@@ -88,6 +88,7 @@ def perform
           delete_user_annotations(study:, study_file: object)
           delete_parsed_data(object.id, study.id, ClusterGroup, CellMetadatum, Gene, DataArray)
           delete_fragment_files(study:, study_file: object)
+          delete_differential_expression_results(study:, study_file: object)
           # reset default options/counts
           study.reload
           study.cell_count = study.all_cells_array.size
@@ -225,7 +226,7 @@ def delete_differential_expression_results(study:, study_file:)
     when 'Cluster'
       cluster = ClusterGroup.find_by(study:, study_file: study_file)
       results = DifferentialExpressionResult.where(study:, cluster_group: cluster)
-    when 'Expression Matrix', 'MM Coordinate Matrix'
+    when 'Expression Matrix', 'MM Coordinate Matrix', 'AnnData'
       results = DifferentialExpressionResult.where(study:, matrix_file_id: study_file.id)
     when 'Differential Expression'
       results = DifferentialExpressionResult.where(study_file: object)

diff --git a/app/models/ingest_job.rb b/app/models/ingest_job.rb
@@ -1010,7 +1010,7 @@ def report_anndata_summary
     # discard the job that corresponds with this ingest process
     still_processing = remaining_jobs.reject do |job|
       ingest_job = DelayedJobAccessor.dump_job_handler(job).object
-      ingest_job.params_object.associated_file == fragment
+      ingest_job.params_object.is_a?(AnnDataIngestParameters) && ingest_job.params_object.associated_file == fragment
     end.any?
 
     # only continue if there are no more jobs and a summary has not been sent yet