Merge pull request #769 from uktrade/develop

Staging release
uktrade · Jan 29, 2020 · 007c1ac · 007c1ac
2 parents 4178490 + 8c5c0b1
commit 007c1ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Pre-release
 
+### Implemented enhancements
+- No ticket - Fix markets page draft results bug
+
 ## [2020.01.20](https://github.com/uktrade/directory-cms/releases/tag/2020.01.20)
 [Full Changelog](https://github.com/uktrade/directory-cms/compare/2020.01.09...2020.01.20)
 

diff --git a/export_readiness/views.py b/export_readiness/views.py
@@ -43,7 +43,7 @@ def cache_key(self):
         return f'countryguide_{industry}{region}'
 
     def get_queryset(self):
-        queryset = models.CountryGuidePage.objects.all()
+        queryset = models.CountryGuidePage.objects.filter(live=True)
         industry = self.request.query_params.get('industry')
         region = self.request.query_params.get('region')
         if not industry and not region:

diff --git a/tests/export_readiness/test_views.py b/tests/export_readiness/test_views.py
@@ -290,6 +290,9 @@ def test_lookup_market_guides_all_filters_no_cache(client):
     market1.tags = [tag]
     market1.save()
     factories.CountryGuidePageFactory(country=country)
+    market2 = factories.CountryGuidePageFactory(country=country, live=False)  # draft
+    market2.tags = [tag]
+    market2.save()
     url = reverse('api:lookup-country-guides-list-view')
 
     response = client.get(f'{url}?industry={tag.name}&region={region.name}')