more refactorgoodies
This commit is contained in:
@@ -3632,12 +3632,6 @@ class SyncRecord(models.Model):
|
||||
return super(SyncRecord, self).save(*args, **kwargs)
|
||||
|
||||
def create_or_update_syncrecord(rower, workout, **kwargs):
|
||||
records = SyncRecord.objects.filter(workout=workout,rower=rower)
|
||||
if records.count():
|
||||
record = records[0]
|
||||
else:
|
||||
record = SyncRecord(workout=workout, rower=rower)
|
||||
|
||||
try:
|
||||
kwargs.pop('rower')
|
||||
except KeyError:
|
||||
@@ -3648,14 +3642,36 @@ def create_or_update_syncrecord(rower, workout, **kwargs):
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
if workout:
|
||||
records = SyncRecord.objects.filter(workout=workout,rower=rower)
|
||||
if records.count():
|
||||
record = records[0]
|
||||
else:
|
||||
records = SyncRecord.objects.filter(**kwargs,rower=rower)
|
||||
if records.count():
|
||||
record = records[0]
|
||||
record.workout = workout
|
||||
else:
|
||||
record = SyncRecord(rower=rower, workout=workout)
|
||||
|
||||
else: # not workout
|
||||
records = SyncRecord.objects.filter(**kwargs, rower=rower)
|
||||
if records.count():
|
||||
record = records[0]
|
||||
else:
|
||||
record = SyncRecord(rower=rower)
|
||||
|
||||
|
||||
for field in record._meta.fields:
|
||||
value = kwargs.get(field.name, None)
|
||||
if value:
|
||||
print(field.name, value)
|
||||
setattr(record, field.name, value)
|
||||
|
||||
try:
|
||||
record.save()
|
||||
except IntegrityError:
|
||||
print('err')
|
||||
pass
|
||||
|
||||
return record
|
||||
|
||||
Reference in New Issue
Block a user