Release Candidate - Huff and Puff

.circleci/config.yml

@@ -12,7 +12,7 @@ jobs:
     docker:
       # specify the version you desire here
       # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
-      - image: circleci/python:3.8
+      - image: circleci/python:3.9
 
       # Specify service dependencies here if necessary
       # CircleCI maintains a library of pre-built images
@@ -149,7 +149,7 @@ jobs:
 
   format_and_secrets_checks:
     docker:
-      - image: circleci/python:3.8
+      - image: circleci/python:3.9
     working_directory: ~/market-access-api
     steps:
       - checkout
@@ -168,7 +168,7 @@ jobs:
 
   pep8:
     docker:
-      - image: circleci/python:3.8
+      - image: circleci/python:3.9
 
     working_directory: ~/market-access-api
     steps:

.github/workflows/recreate-poetry-requirements.yml

@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
-        - name: Set up Python 3.8
+        - name: Set up Python 3.9
           uses: actions/setup-python@v4
           with:
-            python-version: '3.8.x'
+            python-version: '3.9.x'
 
         - name: Install Poetry
           uses: snok/install-poetry@v1

README.md

@@ -51,7 +51,7 @@ To list all available commands with help text type `make help` in terminal and h
 
 Dependencies:
 
--   Python 3.8
+-   Python 3.9
 -   PostgreSQL 10
 -   redis 3.2
 
@@ -62,14 +62,14 @@ Dependencies:
     cd market-access-api
     ```
 
-2.  Install Python 3.8
+2.  Install Python 3.9
 
     [See this guide](https://docs.python-guide.org/starting/installation/) for detailed instructions for different platforms.
 
 3.  Create and activate the virtualenv:
 
     ```shell
-    python3.8 -m venv env
+    python3.9 -m venv env
     source env/bin/activate
     pip install -U pip
     ```

api/barriers/migrations/0160_alter_barrier_options.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.10 on 2024-03-22 13:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("barriers", "0159_backfill_barrier_changed_since_published"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="barrier",
+            options={
+                "ordering": ["-reported_on"],
+                "permissions": [
+                    (
+                        "change_barrier_public_eligibility",
+                        "Can change barrier public eligibility",
+                    )
+                ],
+            },
+        ),
+    ]

api/barriers/models.py

@@ -554,7 +554,6 @@ class Meta:
                 "change_barrier_public_eligibility",
                 "Can change barrier public eligibility",
             ),
-            ("download_barriers", "Can download barriers"),
         ]
 
     @classmethod

api/user/migrations/0035_delete_download_approval_permission.py

@@ -0,0 +1,46 @@
+from django.db import migrations
+
+
+def delete_download_approval_permission_and_group(apps, schema_editor):
+    Group = apps.get_model("auth", "Group")
+    Group.objects.filter(name="Download approved user").delete()
+
+    # remove "download_barriers" Permission
+    Permission = apps.get_model("auth", "Permission")
+    permission = Permission.objects.get(codename="download_barriers")
+    permission.delete()
+
+
+# Re-add the permission and group. Users will have to be re-added to group
+def undo_download_approval_deletion(apps, schema_editor):
+    Group = apps.get_model("auth", "Group")
+    Group.objects.create(name="Download approved user")
+
+    # create a "download_barrier" Permission and add it to the group
+    Permission = apps.get_model("auth", "Permission")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    Barrier = apps.get_model("barriers", "Barrier")
+    barrier_content_type = ContentType.objects.get_for_model(Barrier)
+    download_barriers_permission, created = Permission.objects.get_or_create(
+        codename="download_barriers",
+        defaults={
+            "name": "Can download barriers",
+            "content_type": barrier_content_type,
+        },
+    )
+    group = Group.objects.get(name="Download approved user")
+    group.permissions.add(download_barriers_permission)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("user", "0034_related_barrier_feature_flag"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            delete_download_approval_permission_and_group,
+            undo_download_approval_deletion,
+        ),
+    ]

api/user/serializers.py

@@ -1,6 +1,5 @@
 from logging import getLogger
 
-from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group, Permission
 from django.db.models import Q
@@ -28,7 +27,6 @@ class WhoAmISerializer(serializers.ModelSerializer):
     user_profile = serializers.SerializerMethodField()
     permitted_applications = serializers.SerializerMethodField()
     permissions = serializers.SerializerMethodField()
-    has_approved_digital_trade_email = serializers.SerializerMethodField()
 
     class Meta:
         model = UserModel
@@ -43,7 +41,6 @@ class Meta:
             "internal",
             "user_profile",
             "permitted_applications",
-            "has_approved_digital_trade_email",
             "permissions",
             "is_active",
             "is_superuser",
@@ -109,10 +106,6 @@ def get_permitted_applications(self, obj):
             return sso_me.get("permitted_applications", None)
         return None
 
-    def get_has_approved_digital_trade_email(self, obj):
-        email_domain = obj.email.split("@")[-1].lower()
-        return email_domain in settings.APPROVED_DIGITAL_TRADE_EMAIL_DOMAINS
-
     def get_permissions(self, obj):
         return (
             Permission.objects.filter(Q(user=obj) | Q(group__user=obj))

config/settings/base.py

@@ -459,10 +459,6 @@
 
 DEFAULT_EXPORT_DATE_FORMAT = "%Y-%m-%d"
 
-APPROVED_DIGITAL_TRADE_EMAIL_DOMAINS = env.list(
-    "APPROVED_DIGITAL_TRADE_EMAIL_DOMAINS", default=[]
-)
-
 SEARCH_DOWNLOAD_APPROVAL_REQUEST_EMAILS = env.list(
     "SEARCH_DOWNLOAD_APPROVAL_REQUEST_EMAILS", default=[]
 )

docker-compose.local-template.env

@@ -95,8 +95,6 @@ COMTRADE_DB_USER=not-set
 COMTRADE_DB_PWORD=not-set
 COMTRADE_DB_OPTIONS=not-set
 
-APPROVED_DIGITAL_TRADE_EMAIL_DOMAINS=example.org,example.com
-
 # Sentry
 # ========================
 SENTRY_DSN=<<CHECK_VAULT>>

docker-compose.yml

@@ -33,7 +33,7 @@ services:
       - .:/usr/src/app:delegated
     env_file: docker-compose.env
     # Running the main service directly within the contain is helpful
-    command: python3.8 ./manage.py runserver 0:8000
+    command: python3.9 ./manage.py runserver 0:8000
     ports:
       - "8880:8000"
       - "8882:22"

docker/local/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.8
+FROM python:3.9
 
 RUN apt-get -y update \
     && apt-get -y install \