From c55baebccea5c7b64ec4a55d4b205afdc809032f Mon Sep 17 00:00:00 2001
From: Remi Planel <rplanel@pasteur.fr>
Date: Mon, 4 Oct 2021 18:24:10 +0200
Subject: [PATCH] add third tuple element when loading analysis result
 individually

---
 server/api/views.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/api/views.py b/server/api/views.py
index 7b225dc0..57752c85 100644
--- a/server/api/views.py
+++ b/server/api/views.py
@@ -597,7 +597,7 @@ class PeakViewSet(viewsets.ReadOnlyModelViewSet):
         if queryset.count() == 0:
             analysis_db = Analysis.objects.get(id=analysis_pk)
             load_refine_peaks.apply_async(
-                args=[(analysis_pk, analysis_db.galaxy_history_id)]
+                args=[(analysis_pk, analysis_db.galaxy_history_id, None)]
             ).get()
             queryset = Peak.objects.filter(
                 analysis__project=project_pk, analysis=analysis_pk
@@ -620,7 +620,7 @@ class PeakViewSet(viewsets.ReadOnlyModelViewSet):
 
         if queryset.count() == 0:
             analysis_db = Analysis.objects.get(id=analysis_pk)
-            ids = (analysis_pk, analysis_db.galaxy_history_id)
+            ids = (analysis_pk, analysis_db.galaxy_history_id, None)
 
             load_coefficient.apply_async(args=[ids]).get()
             queryset = Coefficient.objects.filter(peak=pk)
@@ -634,7 +634,7 @@ class PeakViewSet(viewsets.ReadOnlyModelViewSet):
         queryset = SnpsAssociation.objects.filter(peak=pk)
         if queryset.count() == 0:
             analysis_db = Analysis.objects.get(id=analysis_pk)
-            ids = (analysis_pk, analysis_db.galaxy_history_id)
+            ids = (analysis_pk, analysis_db.galaxy_history_id, None)
             load_snps_association.apply_async(args=[ids]).get()
             queryset = SnpsAssociation.objects.filter(peak=pk)
         snps = SnpsAssociationSerializer(queryset.first())
@@ -646,7 +646,7 @@ class PeakViewSet(viewsets.ReadOnlyModelViewSet):
 
         if queryset.count() == 0:
             analysis_db = Analysis.objects.get(id=analysis_pk)
-            ids = (analysis_pk, analysis_db.galaxy_history_id)
+            ids = (analysis_pk, analysis_db.galaxy_history_id, None)
             load_top_snps.apply_async(args=[ids]).get()
             queryset = TopSnps.objects.filter(peak=pk)
 
@@ -660,7 +660,7 @@ class PeakViewSet(viewsets.ReadOnlyModelViewSet):
 
         if queryset.count() == 0:
             analysis_db = Analysis.objects.get(id=analysis_pk)
-            ids = (analysis_pk, analysis_db.galaxy_history_id)
+            ids = (analysis_pk, analysis_db.galaxy_history_id, None)
             load_haplotypes.apply_async(args=[ids]).get()
             queryset = Haplotypes.objects.filter(peak=pk)
 
@@ -749,7 +749,7 @@ class ProjectAnalysisViewSet(viewsets.ModelViewSet):
         # Missing data, try to get it from galaxy
         else:
             analysis_db = Analysis.objects.get(id=pk)
-            ids = (pk, analysis_db.galaxy_history_id)
+            ids = (pk, analysis_db.galaxy_history_id, None)
             load_lodscores_results(ids)
             lodscores = LodScoreSerializer(LodScore.objects.filter(analysis=pk).first())
 
@@ -771,7 +771,7 @@ class ProjectAnalysisViewSet(viewsets.ModelViewSet):
         )
         if thresholds.count() == 0:
             analysis_db = Analysis.objects.get(id=pk)
-            ids = (pk, analysis_db.galaxy_history_id)
+            ids = (pk, analysis_db.galaxy_history_id, None)
             load_significance_threshold.apply_async(args=[ids]).get()
             thresholds = LodScoreSignificanceThreshold.objects.filter(
                 analysis=pk
-- 
GitLab