From d56c46967b7f8a68b81da2e50142acb9cdc99fb0 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 1 Sep 2023 12:51:56 +0200
Subject: [PATCH] changes to fix failed jobs

---
 rowers/tasks.py                       |   4 ++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 3999 bytes
 rowers/views/otherviews.py            |  14 ++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/rowers/tasks.py b/rowers/tasks.py
index a037a37d..c2d88579 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -1178,7 +1178,7 @@ def handle_check_race_course(self,
         return 1
 
     else:  # pragma: no cover
-        record = VirtualRaceResult.object.get(id=recordid)
+        record = VirtualRaceResult.objects.get(id=recordid)
         record.duration = totaltime_sec_to_string(0)
         record.distance = 0
         record.workoutid = workoutid
@@ -2648,7 +2648,7 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
             df = df.select_types(['number'])
             df = row.df.groupby(lambda x: x / bin).mean()
             row.df = df
-        except TypeError:
+        except:
             pass
     nr_rows = len(row.df)
     if (plotnr == 1):
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index a6ad89e0c831506c6f96950100605d0273d61695..431b772149565378620d9482e8c070215cc08324 100644
GIT binary patch
delta 257
zcmV+c0sj7=AD<rwABzYGjll7-2dNH!cJPA#Bq4(Dj{6@E7P|xP?9TM@H|EcmpH{o?
z4<1}3j%ODi_I=u=x98&Q?WSA5>`qR$Pb+;~t&d-JeV5ML?cT0L<<oHo_h0v~&MvOJ
zCil<JPgX}=pMLt~i*b4GuTGY}`}y_i<mKhh{XM;p>Ch_==fjpK-G9<0v$NoE>gTU_
zTdmV(FQ4|?Zn%83U!4EodAjMt-<BuKZnI1r@~01v?#g`~Jnq)Vj~*WW@-(yA{<+)!
zYkG^HzCL}iOm_zG1HkV8gT<9Ec29o$m=5o3QLonNIXp-xmlqGy(|D0CeR$`8+pG#0
H#DD<+vOJPy

delta 258
zcmV+d0sa1;AD|xxABzYGl+*072dNH!qI&`8kN%AC-Esfp!D4s7o!yx}{>J?I^3!Vf
z{lSBa#PRIn!@f_u^!8kwz1?){m)*(9_GzV$tM&2AuJ6)$yWQKBsC+u^;Qs6W)!D_B
z*W~{B`N`_2>(fuad@(N1{ng3RcR#;goxHsKxxc6PF&%p4;e6Qgr29|0WOf#DT>bp@
zZmV_L?B&yb+YOhG_KWi$JWn@$_}lVi*=?4IL;m#P(OtQ(gU8+a_|e0|U!G<*+dp^P
ze@$=k)7Pgjmg&v_egN40f3Udn#qP;(AJgHTE$Y=eJ%<Mg<?`ZTdKxd%r4R4?4{lFz
Iw#0w|0Bp^qAOHXW

diff --git a/rowers/views/otherviews.py b/rowers/views/otherviews.py
index bf567847..fb6d5f0a 100644
--- a/rowers/views/otherviews.py
+++ b/rowers/views/otherviews.py
@@ -104,10 +104,16 @@ def failed_job_view(request, id=0):  # pragma: no cover
     if not request.user.is_staff:
         raise PermissionDenied("Not Allowed")
 
-    q = Queue('failed', connection=Redis())
-    thejob = q.fetch_job(id)
-
-    thejob.delete()
+    for queuename in ['high','default','low']:
+        q = Queue(queuename, connection=Redis())
+        reqistry = q.failed_job_registry
+        for tid in registry.get_job_ids():
+            if tid == id:
+                try:
+                    job = Job.fetch(id, connection=Redis())
+                    registry.remove(id, delete_job=True)
+                except:
+                    pass
 
     return HttpResponseRedirect(reverse('failed_queue_view'))