attempt 1

rowers/tasks.py

@@ -1,3 +1,18 @@
+import os
+os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
+from YamJam import yamjam
+CFG = yamjam()['rowsandallapp']
+
+try:
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE",CFG['settings_name'])
+except KeyError:
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE","rowsandall_app.settings")
+
+from django.core.wsgi import get_wsgi_application
+
+application = get_wsgi_application()
+from rowers.models import *
+
 import math
 from rowers.courseutils import (
     coursetime_paths, coursetime_first, time_in_path,
@@ -16,8 +31,7 @@ import rowers.longtask as longtask
 import requests
 import rowers.datautils as datautils
 
-""" Background tasks done by Celery (develop) or QR (production) """
-import os
+""" Background tasks done by  QR (production) """
 import time
 import gc
 import gzip
@@ -61,13 +75,15 @@ import rowers.otw_power_calculator_pb2_grpc as calculator_pb2_grpc
 import rowers.rowing_workout_metrics_pb2 as metrics_pb2
 import rowers.rowing_workout_metrics_pb2_grpc as metrics_pb2_grpc
 
-from rowsandall_app.settings import SITE_URL
-from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
-from rowsandall_app.settings import PROGRESS_CACHE_SECRET
-from rowsandall_app.settings import SETTINGS_NAME
-from rowsandall_app.settings import workoutemailbox
-from rowsandall_app.settings import UPLOAD_SERVICE_SECRET, UPLOAD_SERVICE_URL
-from rowsandall_app.settings import NK_API_LOCATION
+from django.conf import settings
+SITE_URL = settings.SITE_URL
+SITE_URL_DEV = settings.SITE_URL
+PROGRESS_CACHE_SECRET = settings.PROGRESS_CACHE_SECRET
+SETTINGS_NAME = settings.SETTINGS_NAME
+
+UPLOAD_SERVICE_URL = settings.UPLOAD_SERVICE_URL
+UPLOAD_SERVICE_SECRET = settings.UPLOAD_SERVICE_SECRET
+NK_API_LOCATION = settings.NK_API_LOCATION
 
 from requests_oauthlib import OAuth1, OAuth1Session
 
@@ -83,16 +99,19 @@ from rowers.emails import htmlstrip
 from rowers import mytypes
 
 
-from rowers.dataprepnodjango import (
+from rowers.dataroutines import (
     getsmallrowdata_db, updatecpdata_sql, update_c2id_sql,
-    update_workout_field_sql,
+    #update_workout_field_sql,
     update_agegroup_db, update_strokedata,
     add_c2_stroke_data_db, totaltime_sec_to_string,
     create_c2_stroke_data_db, update_empower,
-    database_url_debug, database_url, dataprep,
+    # database_url_debug,
+    database_url, dataprep,
     #    create_strava_stroke_data_db
 )
 
+database_url_debug = database_url
+
 
 from rowers.opaque import encoder
 
@@ -297,10 +316,11 @@ def handle_c2_sync(workoutid, url, headers, data, debug=False, **kwargs):
     s = response.json()
     c2id = s['data']['id']
 
-    res = update_workout_field_sql(
-        workoutid, 'uploadedtoc2', c2id, debug=debug)
+    workout = Workout.objects.get(id=workoutid)
+    workout.uploadedtoc2 = c2id
+    workout.save()
 
-    return res
+    return 1
 
 
 @app.task
@@ -316,8 +336,10 @@ def handle_sporttracks_sync(workoutid, url, headers, data, debug=False, **kwargs
 
     id = int(m)
 
-    _ = update_workout_field_sql(
-        workoutid, 'uploadedtosporttracks', id, debug=debug)
+    workout = Workout.objects.get(id=workoutid)
+    workout.uploadedtosporttracks = id
+    workout.save()
+
 
     return 1
 
@@ -378,8 +400,9 @@ def handle_strava_sync(stravatoken, workoutid, filename, name, activity_type, de
         failed = True
 
     if not failed:
-        _ = update_workout_field_sql(
-            workoutid, 'uploadedtostrava', res.id, debug=debug)
+        workout = Workout.objects.get(id=workoutid)
+        workout.uploadedtostrava = res.id
+        workout.save()
         try:
             act = client.update_activity(res.id, activity_type=activity_type,
                                          description=description, device_name='Rowsandall.com')