Merge lp:~abentley/charmworld/use-latest-charm into lp:~juju-jitsu/charmworld/trunk

[Aaron Bentley]

Ensure latest version of charm is shown.

On API 2, on the old JSON API and on charm pages, the latest version of the charm was not being selected. (Bugs 1219061, 1219062, 1219064). This branch fixes it by sorting by revision.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'charmworld/testing/factory.py'
--- charmworld/testing/factory.py	2013-08-27 14:39:13 +0000
+++ charmworld/testing/factory.py	2013-09-03 13:32:38 +0000
@@ -146,7 +146,7 @@
 
 def add_store_data(charm, promulgated=False, charm_error=False, revision=1):
     address = get_address(charm, promulgated)
-    charm["store_url"] = make_store_url(1, address)
+    charm["store_url"] = make_store_url(revision, address)
     store_data = {
         "store_checked": "Thu Dec  6 17:42:05 2012"
     }
 
=== modified file 'charmworld/views/api.py'
--- charmworld/views/api.py	2013-08-29 18:42:06 +0000
+++ charmworld/views/api.py	2013-09-03 13:32:38 +0000
@@ -591,13 +591,13 @@
                     'promulgated': True,
                     'series': series,
                     'name': name,
-                })
+                }, sort=[('store_data.revision', pymongo.DESCENDING)])
             else:
                 charm = self.request.db.charms.find_one({
                     'owner': owner,
                     'series': series,
                     'name': name,
-                })
+                }, sort=[('store_data.revision', pymongo.DESCENDING)])
         if charm is not None:
             api_id = self._get_api_id(Charm(charm))
             # Charm ID should match up to, but not including the revision.
 
=== modified file 'charmworld/views/charms.py'
--- charmworld/views/charms.py	2013-08-28 21:53:44 +0000
+++ charmworld/views/charms.py	2013-09-03 13:32:38 +0000
@@ -287,7 +287,8 @@
         spec["promulgated"] = True
     else:
         spec["owner"] = request.matchdict['owner']
-    charm_data = found(request.db.charms.find_one(spec))
+    charm_data = found(request.db.charms.find_one(
+        spec, sort=[('store_data.revision', pymongo.DESCENDING)]))
     # We are phasing out is_featured from the charm data, so remove it if this
     # is an old charm record that still has it.
     charm_data.pop('is_featured', None)
 
=== modified file 'charmworld/views/tests/test_api.py'
--- charmworld/views/tests/test_api.py	2013-08-30 13:29:38 +0000
+++ charmworld/views/tests/test_api.py	2013-09-03 13:32:38 +0000
@@ -1553,6 +1553,26 @@
         self.assertEqual(200, response.status_code)
         self.assertEqual(charm, response.json_body)
 
+    def test_latest_revision_unpromulgated(self):
+        # API2 should always return the latest revision, even if the charm_id
+        # specifies a newer one.
+        kwargs = dict(owner='foo', series='bar', name='baz', promulgated=False)
+        self.use_index_client()
+        old_id, old_charm = self.make_charm(store_revision=1, **kwargs)
+        new_id, new_charm = self.make_charm(store_revision=2, **kwargs)
+        response = self.get_response('charm', remainder=old_id)
+        self.assertEqual(response.json['charm']['id'], new_id)
+
+    def test_latest_revision_promulgated(self):
+        # API2 should always return the latest revision, even if the charm_id
+        # specifies a newer one.
+        kwargs = dict(owner='foo', series='bar', name='baz', promulgated=True)
+        self.use_index_client()
+        old_id, old_charm = self.make_charm(store_revision=1, **kwargs)
+        new_id, new_charm = self.make_charm(store_revision=2, **kwargs)
+        response = self.get_response('charm', remainder=old_id)
+        self.assertEqual(response.json['charm']['id'], new_id)
+
     def test_charms_interesting_only_contain_charms(self):
         self.use_index_client()
         bundle = self.make_indexed_bundle()
 
=== modified file 'charmworld/views/tests/test_charms.py'
--- charmworld/views/tests/test_charms.py	2013-08-29 18:36:12 +0000
+++ charmworld/views/tests/test_charms.py	2013-09-03 13:32:38 +0000
@@ -33,6 +33,7 @@
     config,
     distro_charm,
     distro_charm_json,
+    find_charm,
     found_charm_collection,
     hook,
     interface,
@@ -476,6 +477,21 @@
         self.assertEqual(expect, response['icon_path'])
 
 
+class TestFindCharm(ViewTestBase):
+
+    def test_find_charm_selects_latest_revision(self):
+        kwargs = dict(owner='foo', series='bar', name='baz')
+        old_id, old_charm = factory.makeCharm(self.db, store_revision=1,
+                                              **kwargs)
+        new_id, new_charm = factory.makeCharm(self.db, store_revision=2,
+                                              **kwargs)
+        request = self.getRequest()
+        request.matchdict.update(kwargs)
+        request.matchdict['charm'] = kwargs['name']
+        charm_data = find_charm(request)
+        self.assertEqual(new_id, charm_data['_id'])
+
+
 class CharmsViewHelpersTestCase(ViewTestBase):
 
     def test_reconcile_revision_with_dashed_name(self):