point to new updateURL for themes on AMO (bug 641640)

Author: cvan

apps/addons/models.py

@@ -1683,29 +1683,36 @@ def footer_url(self):
 
     @amo.cached_property
     def update_url(self):
-        return settings.PERSONAS_UPDATE_URL % self.persona_id
+        locale = settings.LANGUAGE_URL_MAP.get(translation.get_language())
+        return settings.NEW_PERSONAS_UPDATE_URL % {
+            'locale': locale or settings.LANGUAGE_CODE,
+            'id': self.addon.id
+        }
 
     @amo.cached_property
     def theme_data(self):
         """Theme JSON Data for Browser/extension preview."""
         hexcolor = lambda color: '#%s' % color
         addon = self.addon
         return {
-            'id': unicode(self.persona_id),  # Personas dislikes ints
-            'name': addon.name,
+            'id': unicode(self.addon.id),  # Personas dislikes ints
+            'name': unicode(addon.name),
             'accentcolor': hexcolor(self.accentcolor),
             'textcolor': hexcolor(self.textcolor),
             'category': (addon.all_categories[0].name if
                          addon.all_categories else ''),
-            'author': self.author,
-            'description': addon.description,
+            # TODO: Change this to be `addons_users.user.display_name`.
+            'author': self.display_username,
+            'description': unicode(addon.description),
             'header': self.header_url,
             'footer': self.footer_url,
             'headerURL': self.header_url,
             'footerURL': self.footer_url,
             'previewURL': self.thumb_url,
             'iconURL': self.icon_url,
             'updateURL': self.update_url,
+            'detailURL': self.addon.get_url_path(),
+            'version': '1.0'
         }
 
     @property

apps/addons/tests/test_models.py

@@ -1465,7 +1465,9 @@ def test_old_image_urls(self):
             self.persona.footer_url)
 
     def test_update_url(self):
-        ok_(self.persona.update_url.endswith(str(self.persona.persona_id)))
+        with self.settings(LANGUAGE_CODE='en-US'):
+            url_ = self.persona.update_url
+            ok_(url_.endswith('/en-US/themes/update-check/15663'), url_)
 
 
 class TestPreviewModel(amo.tests.TestCase):

lib/settings_base.py

@@ -972,6 +972,7 @@ def JINJA_CONFIG():
                           '%(tens)d/%(units)d/%(id)d/%(file)s')
 PERSONAS_USER_ROOT = 'http://www.getpersonas.com/gallery/designer/%s'
 PERSONAS_UPDATE_URL = 'https://www.getpersonas.com/update_check/%d'
+NEW_PERSONAS_UPDATE_URL = SERVICES_URL + '/%(locale)s/themes/update-check/%(id)d'
 
 # Outgoing URL bouncer
 REDIRECT_URL = 'http://outgoing.mozilla.org/v1/'

sites/dev/settings_addons.py

@@ -27,6 +27,7 @@
 PREVIEW_FULL_URL = (STATIC_URL +
         'img/uploads/previews/full/%s/%d.png?modified=%d')
 NEW_PERSONAS_IMAGE_URL = STATIC_URL + 'img/uploads/themes/%(id)d/%(file)s'
+NEW_PERSONAS_UPDATE_URL = SERVICES_URL + '/%(locale)s/themes/update-check/%(id)d'
 
 # paths for uploaded extensions
 FILES_URL = STATIC_URL + "%s/%s/downloads/file/%d/%s?src=%s"

sites/prod/settings_addons.py

@@ -36,6 +36,7 @@
 COLLECTION_ICON_URL = STATIC_URL + 'img/uploads/collection_icons/%s/%s.png?m=%s'
 
 NEW_PERSONAS_IMAGE_URL = STATIC_URL + 'img/uploads/themes/%(id)d/%(file)s'
+NEW_PERSONAS_UPDATE_URL = SERVICES_URL + '/%(locale)s/themes/update-check/%(id)d'
 
 MEDIA_URL = "%smedia/" % STATIC_URL
 ADDON_ICONS_DEFAULT_URL = MEDIA_URL + '/img/addon-icons'