blockers through the db

rowers/integrations/nk.py

@@ -1,5 +1,6 @@
 from .integrations import SyncIntegration, NoTokenError
-from rowers.models import User, Rower, Workout, TombStone
+from rowers.models import User, Rower, Workout, TombStone, SyncRecord
+from django.db.utils import IntegrityError
 
 from rowers import mytypes
 from rowers.nkimportutils import *
@@ -88,6 +89,15 @@ class NKIntegration(SyncIntegration):
         _ = self.open()
         r = self.rower
 
+        record = SyncRecord(
+            rower = r,
+            nkid = id,
+        )
+        try:
+            record.save()
+        except IntegrityError:
+            return 0
+
         before = kwargs.get('before',0)
         after = kwargs.get('after',0)
         if not before:
@@ -181,25 +191,8 @@ class NKIntegration(SyncIntegration):
         # get NK IDs
         nkids = [item['id'] for item in jsondata]
         knownnkids = uniqify([
-            w.uploadedtonk for w in Workout.objects.filter(user=r)
+            record.nkid for record in SyncRecord.objects.filter(rower=r)
         ])
-        tombstones = [
-            t.uploadedtonk for t in TombStone.objects.filter(user=r)
-        ]
-        parkedids = []
-        try:
-            with open('nkblocked.json', 'r') as nkblocked:
-                try:
-                    jsondatal = json.load(nkblocked)
-                except:
-                    jsondatal = {
-                        'ids':[]
-                    }
-                    parkedids = jsondatal['ids']
-        except FileNotFoundError:  # pragma: no cover
-            pass
-
-        knownnkids = uniqify(knownnkids+tombstones+parkedids)
         workouts = []