sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

removes temporary records in powertimefitnessmetric

Browse Source
This commit is contained in:
Sander Roosendaal
2018-01-19 08:34:58 +01:00
parent eea9efce2b
commit 8e6460eb06
3 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprepnodjango.py
View File

@@ -495,7 +495,8 @@ def getsmallrowdata_db(columns,ids=[],debug=False):
return data return data
def fitnessmetric_to_sql(m,table='powertimefitnessmetric',debug=False): def fitnessmetric_to_sql(m,table='powertimefitnessmetric',debug=False,
doclean=False):
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
else: else:
@@ -508,10 +509,13 @@ def fitnessmetric_to_sql(m,table='powertimefitnessmetric',debug=False):
placeholders = ", ".join(["%s"] * len(m)) placeholders = ", ".join(["%s"] * len(m))
query = "INSERT into %s ( %s ) Values (%s)" % (table, columns, placeholders) query = "INSERT into %s ( %s ) Values (%s)" % (table, columns, placeholders)
query2 = "DELETE FROM %s WHERE PowerFourMin < 0 and PowerOneHour < 0 and PowerTwoK < 0 and user_id = %s " % (table,m['user_id'])
values = tuple(m[key] for key in m.keys()) values = tuple(m[key] for key in m.keys())
with engine.connect() as conn, conn.begin(): with engine.connect() as conn, conn.begin():
result = conn.execute(query,values) result = conn.execute(query,values)
if doclean:
result2 = conn.execute(query2)
conn.close() conn.close()
engine.dispose() engine.dispose()

5
rowers/middleware.py
View File

@@ -32,7 +32,9 @@ def do_update(user,mode='rower',days=42):
else: else:
max_workout_id = max([m.last_workout for m in ms]) max_workout_id = max([m.last_workout for m in ms])
last_update_date = max([m.date.strftime('%Y-%m-%d') for m in ms]) last_update_date = max([m.date.strftime('%Y-%m-%d') for m in ms])
if mode == 'rower': if mode == 'rower':
workouts = Workout.objects.filter( workouts = Workout.objects.filter(
user=r, user=r,
@@ -50,6 +52,7 @@ def do_update(user,mode='rower',days=42):
except ValueError: except ValueError:
max_id = 0 max_id = 0
if last_update_date < now_date and max_workout_id < max_id: if last_update_date < now_date and max_workout_id < max_id:
job = myqueue(queue, job = myqueue(queue,
handle_updatefitnessmetric, handle_updatefitnessmetric,

4
rowers/tasks.py
View File

@@ -631,7 +631,7 @@ def handle_updatefitnessmetric(user_id,mode,workoutids,debug=False,
'date': timezone.now().strftime('%Y-%m-%d'), 'date': timezone.now().strftime('%Y-%m-%d'),
} }
result = fitnessmetric_to_sql(mdict,debug=debug) result = fitnessmetric_to_sql(mdict,debug=debug,doclean=False)
columns = ['power','workoutid','time'] columns = ['power','workoutid','time']
df = getsmallrowdata_db(columns,ids=workoutids,debug=debug) df = getsmallrowdata_db(columns,ids=workoutids,debug=debug)
@@ -702,7 +702,7 @@ def handle_updatefitnessmetric(user_id,mode,workoutids,debug=False,
'date': timezone.now().strftime('%Y-%m-%d'), 'date': timezone.now().strftime('%Y-%m-%d'),
} }
result = fitnessmetric_to_sql(mdict,debug=debug) result = fitnessmetric_to_sql(mdict,debug=debug,doclean=True)
return result return result