From 25957136f783a0104c7f6706f14e4343249d7221 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Stefan=20K=C3=B6gl?= <stefan@skoegl.net>
Date: Thu, 24 Jul 2014 18:42:16 +0200
Subject: [PATCH] [Migration] move update_flattr_settings to view

---
 mygpo/db/couchdb/user.py    | 22 ----------------------
 mygpo/web/views/settings.py | 17 ++++++++++++-----
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/mygpo/db/couchdb/user.py b/mygpo/db/couchdb/user.py
index 1f19f1aa..58b15e64 100644
--- a/mygpo/db/couchdb/user.py
+++ b/mygpo/db/couchdb/user.py
@@ -9,8 +9,6 @@ from mygpo.cache import cache_result
 from mygpo.decorators import repeat_on_conflict
 from mygpo.db.couchdb import get_userdata_database, \
     get_single_result, get_suggestions_database
-from mygpo.users.settings import FLATTR_TOKEN, FLATTR_AUTO, FLATTR_MYGPO, \
-         FLATTR_USERNAME
 from mygpo.db import QueryParameterMissing
 
 
@@ -207,26 +205,6 @@ def device_history(user, device, start, length):
     return map(_wrap_historyentry, res)
 
 
-@repeat_on_conflict(['user'])
-def update_flattr_settings(user, token, enabled=None, flattr_mygpo=False,
-        username=None):
-    """ Updates the Flattr settings of a user """
-
-    if enabled is not None:
-        user.settings[FLATTR_AUTO.name] = enabled
-
-    if token is not None:
-        user.settings[FLATTR_TOKEN.name] = token
-
-    if flattr_mygpo is not None:
-        user.settings[FLATTR_MYGPO.name] = flattr_mygpo
-
-    if username is not None:
-        user.settings[FLATTR_USERNAME.name] = username
-
-    user.save()
-
-
 def _wrap_historyentry(action):
     from mygpo.users.models import HistoryEntry
     return HistoryEntry.from_action_dict(action['value'])
diff --git a/mygpo/web/views/settings.py b/mygpo/web/views/settings.py
index b85b0d87..803a22a2 100644
--- a/mygpo/web/views/settings.py
+++ b/mygpo/web/views/settings.py
@@ -40,8 +40,7 @@ from mygpo.users.settings import PUBLIC_SUB_USER, \
          FLATTR_TOKEN, FLATTR_AUTO, FLATTR_MYGPO, FLATTR_USERNAME
 from mygpo.db.couchdb.podcast_state import podcast_state_for_user_podcast, \
          subscriptions_by_user, set_podcast_privacy_settings
-from mygpo.db.couchdb.user import update_flattr_settings, \
-         set_users_google_email
+from mygpo.db.couchdb.user import set_users_google_email
 
 
 
@@ -147,7 +146,11 @@ class FlattrSettingsView(View):
         auto_flattr = form.cleaned_data.get('enable', False)
         flattr_mygpo = form.cleaned_data.get('flattr_mygpo', False)
         username = form.cleaned_data.get('username', '')
-        update_flattr_settings(user, None, auto_flattr, flattr_mygpo, username)
+
+        user.settings[FLATTR_AUTO.name] = auto_flattr
+        user.settings[FLATTR_MYGPO.name] = flattr_mygpo
+        user.settings[FLATTR_USERNAME.name] = username
+        user.save()
 
         return HttpResponseRedirect(reverse('account') + '#flattr')
 
@@ -157,7 +160,10 @@ class FlattrLogout(View):
 
     def get(self, request):
         user = request.user
-        update_flattr_settings(user, False, False, False)
+        user.settings[FLATTR_AUTO.name] = False
+        user.settings[FLATTR_TOKEN.name] = False
+        user.settings[FLATTR_MYGPO.name] = False
+        user.save()
         return HttpResponseRedirect(reverse('account') + '#flattr')
 
 
@@ -176,7 +182,8 @@ class FlattrTokenView(View):
         token = flattr.process_retrieved_code(url)
         if token:
             messages.success(request, _('Authentication successful'))
-            update_flattr_settings(user, token)
+            user.settings[FLATTR_TOKEN.name] = token
+            user.save()
 
         else:
             messages.error(request, _('Authentication failed. Try again later'))
-- 
2.11.4.GIT