blockers through the db

rowers/tasks.py

@@ -15,7 +15,7 @@ application = get_wsgi_application()
 from rowers.models import (
     Workout, GeoPolygon, GeoPoint, GeoCourse,
     VirtualRaceResult, CourseTestResult, Rower,
-    GraphImage,
+    GraphImage, SyncRecord
     )
 
 import math
@@ -84,6 +84,7 @@ import rowers.rowing_workout_metrics_pb2 as metrics_pb2
 import rowers.rowing_workout_metrics_pb2_grpc as metrics_pb2_grpc
 
 from django.conf import settings
+from django.db.utils import IntegrityError
 
 # extra read of config
 
@@ -522,6 +523,9 @@ def handle_c2_sync(workoutid, url, headers, data, debug=False, **kwargs):
     workout.uploadedtoc2 = c2id
     workout.save()
 
+    record = SyncRecord(workout=workout,c2id=c2id)
+    record.save()
+
     return 1
 
 def splitstdata(lijst):
@@ -3402,24 +3406,20 @@ def handle_nk_async_workout(alldata, userid, nktoken, nkid, delaysec, defaulttim
     # dologging('nklog.log','NK Workout ID {id}'.format(id=workoutid))
     workout = Workout.objects.get(id=workoutid)
     newnkid = workout.uploadedtonk
+    sr = SyncRecord.objects.filter(nkid=newnkid)
+    if len(sr):
+        sr[0].workout = workout
+        try:
+            sr[0].save()
+        except IntegrityError:
+            pass
+    else:
+        sr = SyncRecord(workout=workout,nkid=newnkid)
+        try:
+            sr.save()
+        except IntegrityError:
+            pass
 
-    parkedids = []
-    try:
-        with open('nkblocked.json', 'r') as nkblocked:
-            jsondata = json.load(nkblocked)
-            parkedids = jsondata['ids']
-    except FileNotFoundError:  # pragma: no cover
-        pass
-
-    newparkedids = [id for id in parkedids if id != newnkid]
-    with open('nkblocked.json', 'wt') as nkblocked:
-        tdata = {'ids': newparkedids}
-        nkblocked.seek(0)
-        json.dump(tdata, nkblocked)
-
-    # evt update workout summary
-
-    # return
     return workoutid
 
 
@@ -3693,20 +3693,8 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
     workout = Workout.objects.get(id=workoutid)
     newc2id = workout.uploadedtoc2
 
-    parkedids = []
-    with open('c2blocked.json', 'a+') as c2blocked:
-        try:
-            jsondata = json.load(c2blocked)
-            parkedids = jsondata['ids']
-        except JSONDecodeError:  # pragma: no cover
-            parkedids = []
-        
+    record = SyncRecord(workout=workout,c2id=newc2id)
 
-    newparkedids = [id for id in parkedids if id != newc2id]
-    with open('c2blocked.json', 'wt') as c2blocked:
-        tdata = {'ids': newparkedids}
-        c2blocked.seek(0)
-        json.dump(tdata, c2blocked)
 
     # set distance, time
     workout = Workout.objects.get(id=workoutid)