Merge pull request #779 from uktrade/XOT-1275-expose-madb-link

Add MADB link field to country guide

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Pre-release
 
 ### Implemented enhancements
+- XOT-1275 - Add MADB link field to country guide
 
 ### Fixed bugs
 

export_readiness/migrations/0073_auto_20200203_1333.py

@@ -0,0 +1,50 @@
+# Generated by Django 2.2.6 on 2020-02-03 13:33
+
+import logging
+
+
+import core.model_fields
+from django.db import migrations, models
+
+import pycountry
+
+
+logger = logging.getLogger(__name__)
+
+
+def set_duties_and_custom_procedures_cta_link(apps, schema_editor):
+    url = 'https://www.check-duties-customs-exporting-goods.service.gov.uk/searchproduct?d='
+    CountryGuidePage = apps.get_model('export_readiness', 'CountryGuidePage')
+    for guide in CountryGuidePage.objects.all():
+        try:
+            matches = pycountry.countries.search_fuzzy(guide.country.name)
+        except LookupError:
+            logger.warn(f'no country match for {guide.country.name}')
+        else:
+            guide.duties_and_custom_procedures_cta_link = f'{url}{matches[0].alpha_2}'
+            guide.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('export_readiness', '0072_auto_20191212_1403'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='countryguidepage',
+            name='help_market_guide_cta_link',
+        ),
+        migrations.AddField(
+            model_name='countryguidepage',
+            name='duties_and_custom_procedures_cta_link',
+            field=models.URLField(blank=True, null=True, verbose_name='Check duties and customs procedures for exporting goods'),
+        ),
+        migrations.AlterField(
+            model_name='homepage',
+            name='madb_content',
+            field=core.model_fields.MarkdownField(blank=True, null=True, verbose_name='Content'),
+        ),
+        migrations.RunPython(set_duties_and_custom_procedures_cta_link, reverse_code=migrations.RunPython.noop)
+    ]

export_readiness/models.py

@@ -1020,8 +1020,9 @@ class Meta:
     )
 
     # need help
-    help_market_guide_cta_link = models.CharField(
-        max_length=255, blank=True, verbose_name='GOV.UK country guide URL')
+    duties_and_custom_procedures_cta_link = models.URLField(
+        blank=True, null=True, verbose_name='Check duties and customs procedures for exporting goods'
+    )
 
     # related pages
     related_page_one = models.ForeignKey(

export_readiness/panels.py

@@ -889,7 +889,7 @@ class CountryGuidePagePanels:
             heading='Need help',
             classname='collapsible',
             children=[
-                FieldPanel('help_market_guide_cta_link')
+                FieldPanel('duties_and_custom_procedures_cta_link')
             ]
         ),
         MultiFieldPanel(

export_readiness/serializers.py

@@ -419,7 +419,7 @@ class CountryGuidePageSerializer(PageWithRelatedPagesSerializer, HeroSerializer)
     accordions = serializers.SerializerMethodField()
     fact_sheet = serializers.SerializerMethodField()
 
-    help_market_guide_cta_link = serializers.CharField(max_length=255)
+    duties_and_custom_procedures_cta_link = serializers.CharField(max_length=255)
 
     tags = core_fields.TagsListField()
     region = serializers.CharField(allow_null=True, source='country.region.name')

requirements.in

@@ -33,3 +33,4 @@ w3lib>=1.19.0<2.0.0
 django-admin-ip-restrictor==2.1.0
 notifications-python-client==5.3.*
 pillow>=6.2.0  # for security fix. check compatibility on next wagtail upgrade
+pycountry==19.8.18

requirements.txt

@@ -56,6 +56,7 @@ notifications-python-client==5.3.0
 oauthlib==3.1.0           # via requests-oauthlib
 pillow==6.2.1
 psycopg2==2.7.3.2
+pycountry==19.8.18
 pyjwt==1.7.1              # via notifications-python-client
 pyrsistent==0.15.6        # via jsonschema
 python-dateutil==2.6.1    # via botocore

requirements_test.txt

@@ -71,6 +71,7 @@ pluggy==0.12.0            # via pytest
 psycopg2==2.7.3.2
 py==1.7.0                 # via pytest
 pycodestyle==2.4.0        # via flake8
+pycountry==19.8.18
 pyflakes==2.0.0           # via flake8
 pyjwt==1.7.1              # via notifications-python-client
 pyparsing==2.3.0          # via packaging

tests/export_readiness/factories.py

@@ -326,7 +326,7 @@ class Meta:
     fact_sheet_column_2_teaser = factory.fuzzy.FuzzyText(length=10)
     fact_sheet_column_2_body = factory.fuzzy.FuzzyText(length=10)
 
-    help_market_guide_cta_link = factory.fuzzy.FuzzyText(length=10)
+    duties_and_custom_procedures_cta_link = 'http://www.example.com'
 
     related_page_one = factory.SubFactory(ArticlePageFactory)
     related_page_two = factory.SubFactory(CampaignPageFactory)