update theme check to return correct version (bug 880490)

Author: ngokevin

apps/addons/models.py

@@ -796,6 +796,13 @@ def compatible_version(self, app_id, app_version=None, platform=None,
 
         return version
 
+    def increment_version(self):
+        """Increment version number by 1."""
+        version = self.latest_version or self.current_version
+        version.version = str(float(version.version) + 1)
+        # Set the current version.
+        self.update(_current_version=version.save())
+
     def invalidate_d2c_versions(self):
         """Invalidates the cache of compatible versions.
 

apps/addons/tests/test_theme_update.py

@@ -11,6 +11,7 @@
 
 import amo.tests
 from addons.models import Addon
+from versions.models import Version
 from services import theme_update
 
 
@@ -79,7 +80,7 @@ def setUp(self):
             'author': 'persona_author',
             'updateURL': (settings.VAMO_URL +
                           '/en-US/themes/update-check/15663'),
-            'version': '1.1',
+            'version': '0',
             'footerURL': '/15663/BCBG_Persona_footer2.png'
         }
 
@@ -118,7 +119,9 @@ def test_get_json_good_ids(self):
 
         self.addon = Addon.objects.get()
         self.addon.summary = 'yolo'
+        self.addon.current_version = Version.objects.get()
         self.addon.save()
+        self.addon.increment_version()
 
         # Testing `addon_id` from AMO.
         self.check_good(
@@ -128,7 +131,8 @@ def test_get_json_good_ids(self):
         self.good.update({
             'id': '813',
             'updateURL': (settings.VAMO_URL +
-                          '/en-US/themes/update-check/813?src=gp')
+                          '/en-US/themes/update-check/813?src=gp'),
+            'version': '1'
         })
 
         self.check_good(

mkt/reviewers/tasks.py

@@ -38,7 +38,6 @@ def send_mail(cleaned_data, theme_lock):
     if action == rvw.ACTION_APPROVE:
         subject = _('Thanks for submitting your Theme')
         template = 'reviewers/themes/emails/approve.html'
-        theme.addon.update(status=amo.STATUS_PUBLIC)
 
     elif action == rvw.ACTION_REJECT:
         subject = _('A problem with your Theme submission')
@@ -87,6 +86,8 @@ def approve_rereview(theme):
         set_modified_on=[reupload.theme.addon])
     rereview.delete()
 
+    theme.addon.increment_version()
+
 
 @task
 def reject_rereview(theme):

mkt/reviewers/tests/test_views_themes.py

@@ -108,13 +108,15 @@ def test_basic_queue(self):
                 len(expected))
 
     @mock.patch.object(settings, 'LOCAL_MIRROR_URL', '')
+    @mock.patch('addons.tasks.version_changed')
     @mock.patch('mkt.reviewers.tasks.send_mail_jinja')
     @mock.patch('mkt.reviewers.tasks.create_persona_preview_images')
     @mock.patch('amo.storage_utils.copy_stored_file')
     def test_commit(self, copy_file_mock, create_preview_mock,
-                    send_mail_jinja_mock):
+                    send_mail_jinja_mock, version_changed_mock):
         if self.flagged:
             return
+
         themes = []
         for x in range(5):
             themes.append(self.theme_factory().persona)
@@ -143,6 +145,8 @@ def test_commit(self, copy_file_mock, create_preview_mock,
             form_data['form-%s-comment' % index] = comment
             form_data['form-%s-reject_reason' % index] = reject_reason
 
+        old_version = themes[4].addon.current_version.version
+
         # Commit.
         res = self.client.post(reverse('reviewers.themes.commit'), form_data)
         self.assert3xx(res, reverse('reviewers.themes.queue_themes'))
@@ -168,12 +172,16 @@ def test_commit(self, copy_file_mock, create_preview_mock,
             # leaving only 2 RQT objects. Can't flag a rereview theme yet, and
             # moreinfo does nothing but email the artist.
             eq_(RereviewQueueTheme.objects.count(), 2)
+
+            # Test version incremented.
+            eq_(themes[4].addon.reload().current_version.version,
+                str(float(old_version) + 1))
         else:
             eq_(themes[0].addon.status, amo.STATUS_REVIEW_PENDING)
             eq_(themes[1].addon.status, amo.STATUS_REVIEW_PENDING)
             eq_(themes[2].addon.status, amo.STATUS_REJECTED)
             eq_(themes[3].addon.status, amo.STATUS_REJECTED)
-        eq_(themes[4].addon.status, amo.STATUS_PUBLIC)
+        eq_(themes[4].addon.reload().status, amo.STATUS_PUBLIC)
         eq_(ActivityLog.objects.count(), 4 if self.rereview else 5)
 
         expected_calls = [

services/theme_update.py

@@ -75,14 +75,15 @@ def get_update(self):
         """
 
         sql = """
-        SELECT p.persona_id, a.id, a.slug,
+        SELECT p.persona_id, a.id, a.slug, v.version,
             t_name.localized_string AS name,
             t_desc.localized_string AS description,
             p.display_username, p.header,
             p.footer, p.accentcolor, p.textcolor,
             UNIX_TIMESTAMP(a.modified) AS modified
         FROM addons AS a
         LEFT JOIN personas AS p ON p.addon_id=a.id
+        LEFT JOIN versions AS v ON a.current_version=v.id
         LEFT JOIN translations AS t_name
             ON t_name.id=a.name AND t_name.locale=%(locale)s
         LEFT JOIN translations AS t_desc
@@ -95,9 +96,9 @@ def get_update(self):
         row = self.cursor.fetchone()
 
         row_to_dict = lambda row: dict(zip((
-            'persona_id', 'addon_id', 'slug', 'name', 'description',
-            'username', 'header', 'footer', 'accentcolor', 'textcolor',
-            'modified'),
+            'persona_id', 'addon_id', 'slug', 'current_version', 'name',
+            'description', 'username', 'header', 'footer', 'accentcolor',
+            'textcolor', 'modified'),
             list(row)))
 
         if row:
@@ -147,9 +148,8 @@ def get_json(self):
             'textcolor': '#%s' % text if text else None,
             'updateURL': self.locale_url(settings.VAMO_URL,
                                          '/themes/update-check/' + id_),
-            # TODO: Change this when we add versions (bug 851881).
             # 04-25-2013: Bumped for GP migration so we get new `updateURL`s.
-            'version': '1.1'
+            'version': row.get('current_version', 0)
         }
 
         # If this theme was originally installed from getpersonas.com,