Depluralised buffer_tokens

This commit is contained in:
Mark 2015-05-27 21:24:35 +01:00
parent f080a5dc88
commit cbef20d205
4 changed files with 12 additions and 7 deletions

View file

@ -31,7 +31,7 @@ class BufferThread(Thread):
def post(item, author, **kwargs): def post(item, author, **kwargs):
try: try:
token = author.buffer_tokens.get() token = author.buffer_token
except BufferToken.DoesNotExist: except BufferToken.DoesNotExist:
return return

View file

@ -57,7 +57,7 @@ class Migration(migrations.Migration):
fields=[ fields=[
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
('token', models.CharField(max_length=36)), ('token', models.CharField(max_length=36)),
('user', models.OneToOneField(related_name='buffer_tokens', to=settings.AUTH_USER_MODEL)), ('user', models.OneToOneField(related_name='buffer_token', to=settings.AUTH_USER_MODEL)),
], ],
options={ options={
'db_table': 'buffer_token', 'db_table': 'buffer_token',

View file

@ -6,7 +6,7 @@ from bambu_buffer.receivers import *
import requests, json import requests, json
class BufferToken(models.Model): class BufferToken(models.Model):
user = models.OneToOneField('auth.User', related_name = 'buffer_tokens') user = models.OneToOneField('auth.User', related_name = 'buffer_token')
token = models.CharField(max_length = 36) token = models.CharField(max_length = 36)
def __unicode__(self): def __unicode__(self):

View file

@ -59,8 +59,13 @@ def callback(request):
token = data.get('access_token') token = data.get('access_token')
with transaction.atomic(): with transaction.atomic():
request.user.buffer_tokens.all().delete() try:
request.user.buffer_tokens.create( request.user.buffer_token.delete()
except BufferToken.DoesNotExist:
pass
BufferToken.objects.create(
user = user,
token = token token = token
) )
@ -76,7 +81,7 @@ def callback(request):
@login_required @login_required
def profiles(request): def profiles(request):
try: try:
token = request.user.buffer_tokens.get() token = request.user.buffer_token
except BufferToken.DoesNotExist: except BufferToken.DoesNotExist:
return HttpResponseRedirect( return HttpResponseRedirect(
reverse('buffer_auth') reverse('buffer_auth')
@ -120,7 +125,7 @@ def profiles(request):
@login_required @login_required
def refresh(request): def refresh(request):
try: try:
token = request.user.buffer_tokens.get() token = request.user.buffer_token
except BufferToken.DoesNotExist: except BufferToken.DoesNotExist:
return HttpResponseRedirect( return HttpResponseRedirect(
reverse('buffer_auth') reverse('buffer_auth')