Merge pull request #1104 from uktrade/develop

UAT / Prod PR
uktrade · Jun 21, 2023 · 3ef1a50 · 3ef1a50
2 parents 591774a + a5d5cad
commit 3ef1a50
Show file tree

Hide file tree

Showing 120 changed files with 30 additions and 6,523 deletions.
diff --git a/conf/env/dev b/conf/env/dev
@@ -17,7 +17,6 @@ DB_USER=debug
 DB_PASSWORD=debug
 DATABASE_URL=postgres://debug:debug@localhost:5432/directory_cms_debug
 CSRF_COOKIE_SECURE=false
-APP_URL_EXPORT_READINESS=http://exred.trade.great:8007
 APP_URL_GREAT_INTERNATIONAL=http://international.trade.great:8012/international/
 COPY_DESTINATION_URLS=https://dev.cms.directory.uktrade.io,https://stage.cms.directory.uktrade.io,http://cms.trade.great:8010
 EMAIL_BACKEND_CLASS_NAME=console

diff --git a/conf/settings.py b/conf/settings.py
@@ -87,7 +87,6 @@
     'wagtailmedia',
     'great_international.apps.GreatInternationalConfig',
     'components.apps.ComponentsConfig',
-    'export_readiness.apps.GreatDomesticConfig',
     'django_filters',
     'authbroker_client',
     'django_celery_beat',
@@ -348,7 +347,6 @@
 BASE_URL = env.str('BASE_URL')
 WAGTAILADMIN_BASE_URL = env.str('BASE_URL')
 
-APP_URL_EXPORT_READINESS = env.str('APP_URL_EXPORT_READINESS')
 APP_URL_GREAT_INTERNATIONAL = env.str('APP_URL_GREAT_INTERNATIONAL')
 APP_URL_COMPONENTS = ''
 COPY_DESTINATION_URLS = env.list('COPY_DESTINATION_URLS')

diff --git a/core/constants.py b/core/constants.py
@@ -3,7 +3,6 @@
 from directory_constants import cms
 
 APP_URLS = {
-    cms.EXPORT_READINESS: settings.APP_URL_EXPORT_READINESS,
     cms.COMPONENTS: settings.APP_URL_COMPONENTS,
     cms.GREAT_INTERNATIONAL: settings.APP_URL_GREAT_INTERNATIONAL
 }

diff --git a/core/migrations/0013_auto_20180821_1637.py b/core/migrations/0013_auto_20180821_1637.py
@@ -9,7 +9,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('core', '0012_auto_20180821_1634'),
-        ('export_readiness', '0012_auto_20180821_0810'),
     ]
 
     operations = [

diff --git a/core/migrations/0015_auto_20180822_1456.py b/core/migrations/0015_auto_20180822_1456.py
@@ -10,7 +10,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('core', '0014_auto_20180822_0915'),
-        ('export_readiness', '0013_exportreadinessapp_service_name'),
     ]
 
     operations = [

diff --git a/core/migrations/0017_auto_20180823_1545.py b/core/migrations/0017_auto_20180823_1545.py
diff --git a/core/migrations/0018_auto_20180824_1622.py b/core/migrations/0018_auto_20180824_1622.py
@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0017_auto_20180823_1545'),
+        ('core', '0016_auto_20180823_2014'),
     ]
 
     operations = [

diff --git a/core/migrations/0018_merge_20180829_0828.py b/core/migrations/0018_merge_20180829_0828.py
@@ -9,7 +9,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('core', '0015_auto_20180822_1456'),
-        ('core', '0017_auto_20180823_1545'),
     ]
 
     operations = [

diff --git a/core/migrations/0023_auto_20180912_0758.py b/core/migrations/0023_auto_20180912_0758.py
diff --git a/core/migrations/0024_auto_20180913_1321.py b/core/migrations/0024_auto_20180913_1321.py
@@ -9,7 +9,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('core', '0023_auto_20180912_0758'),
+        ('core', '0022_auto_20180906_1344'),
     ]
 
     operations = [

diff --git a/core/migrations/0032_auto_20230614_0954.py b/core/migrations/0032_auto_20230614_0954.py
@@ -3,41 +3,15 @@
 from django.db import migrations
 
 
+"""
+effectively removing this migration
+"""
 class Migration(migrations.Migration):
 
     dependencies = [
         ('core', '0031_region_tag_industrytag_country'),
     ]
 
-    def copy_export_readiness_data(apps, schema_editor):
-        ExportReadinessTag = apps.get_model("export_readiness", "Tag")
-        ExportReadinessIndustryTag = apps.get_model("export_readiness", "IndustryTag")
-        ExportReadinessRegion = apps.get_model("export_readiness", "Region")
-        ExportReadinessCountry = apps.get_model("export_readiness", "Country")
-
-        CoreTag = apps.get_model("core", "Tag")
-        CoreIndustryTag = apps.get_model("core", "IndustryTag")
-        CoreRegion = apps.get_model("core", "Region")
-        CoreCountry = apps.get_model("core", "Country")
-
-        CoreRegion.objects.bulk_create(ExportReadinessRegion.objects.all())
-        CoreTag.objects.bulk_create(ExportReadinessTag.objects.all())
-        CoreCountry.objects.bulk_create(ExportReadinessCountry.objects.all())
-        CoreIndustryTag.objects.bulk_create(ExportReadinessIndustryTag.objects.all())
-
-
-    def delete_export_readiness_data(apps, schema_editor):
-        Tag = apps.get_model("core", "Tag")
-        IndustryTag = apps.get_model("core", "IndustryTag")
-        Region = apps.get_model("core", "Region")
-        Country = apps.get_model("core", "Country")
-
-        Country.objects.all().delete()
-        IndustryTag.objects.all().delete()
-        Region.objects.all().delete()
-        Tag.objects.all().delete()
-
-
     operations = [
-        migrations.RunPython(copy_export_readiness_data, delete_export_readiness_data),
+        migrations.RunPython(migrations.RunPython.noop, migrations.RunPython.noop),
     ]
diff --git a/export_readiness/__init__.py b/export_readiness/__init__.py
diff --git a/export_readiness/apps.py b/export_readiness/apps.py
diff --git a/export_readiness/blocks.py b/export_readiness/blocks.py
diff --git a/export_readiness/blocks_serializers.py b/export_readiness/blocks_serializers.py
diff --git a/export_readiness/migrations/0001_squashed_0009_performancedashboardpage_guidance_notes.py b/export_readiness/migrations/0001_squashed_0009_performancedashboardpage_guidance_notes.py
diff --git a/export_readiness/migrations/0010_performancedashboardnotespage.py b/export_readiness/migrations/0010_performancedashboardnotespage.py
diff --git a/export_readiness/migrations/0011_auto_20180817_1630.py b/export_readiness/migrations/0011_auto_20180817_1630.py