Improve directory filtering to exclude archived providers

ansible/deploy.yml

@@ -5,7 +5,9 @@
     # - app2.thegreenwebfoundation.org
     # - app3.thegreenwebfoundation.org
     # - app4.thegreenwebfoundation.org
-    - app_servers
+    # - app5.thegreenwebfoundation.org
+
+    # - app_servers
     # api servers are app1, app2, and app4, mainly serving API traffic
     # - api_servers
     # admin server is app3, mainly serving member portal traffic

ansible/see_command_output.yml

@@ -6,10 +6,11 @@
 
   hosts:
     # - all
-    - app1.thegreenwebfoundation.org
-    - app2.thegreenwebfoundation.org
-    - app3.thegreenwebfoundation.org
-    - app4.thegreenwebfoundation.org
+    # - app1.thegreenwebfoundation.org
+    # - app2.thegreenwebfoundation.org
+    # - app3.thegreenwebfoundation.org
+    # - app4.thegreenwebfoundation.org
+    # - app5.thegreenwebfoundation.org
 
   remote_user: deploy
   vars:

apps/accounts/admin_site.py

@@ -12,8 +12,7 @@
 from django.shortcuts import render
 from django.urls import path, reverse
 from django.views.generic.edit import FormView
-from waffle import flag_is_active
-from waffle.mixins import WaffleFlagMixin
+
 
 from apps.greencheck.views import GreenUrlsView
 
@@ -89,11 +88,10 @@ def clean(self):
                     )
 
 
-class CarbonTxtCheckView(LoginRequiredMixin, WaffleFlagMixin, FormView):
+class CarbonTxtCheckView(LoginRequiredMixin, FormView):
     template_name = "carbon_txt_preview.html"
     form_class = CarbonTxtForm
     success_url = "/admin/carbon-txt-preview"
-    waffle_flag = "carbon_txt_preview"
 
     def form_valid(self, form):
         """Show the valid"""
@@ -240,21 +238,21 @@ def get_app_list(self, request, app_label=None):
         if app_label:
             return app_list
 
-        if flag_is_active(request, "provider_request"):
-            verification_request_item = {
-                "name": "New provider portal",
-                "app_label": "greencheck",
-                "app_url": reverse("provider_portal_home"),
-                "models": [
-                    {
-                        "name": "Move to a new version of provider portal",
-                        "object_name": "greencheck_url",
-                        "admin_url": reverse("provider_portal_home"),
-                        "view_only": True,
-                    }
-                ],
-            }
-            app_list.insert(0, verification_request_item)
+
+        verification_request_item = {
+            "name": "New provider portal",
+            "app_label": "greencheck",
+            "app_url": reverse("provider_portal_home"),
+            "models": [
+                {
+                    "name": "Move to a new version of provider portal",
+                    "object_name": "greencheck_url",
+                    "admin_url": reverse("provider_portal_home"),
+                    "view_only": True,
+                }
+            ],
+        }
+        app_list.insert(0, verification_request_item)
 
         app_list += [
             {

apps/accounts/templates/emails/verification-request-notify.html

@@ -19,15 +19,15 @@
 </p>
 <h4>What happens next?</h4>
 <p>
-    We aim to review every
+    We review
     {% if provider %}
         {% comment %} If it's an update to an existing provider. {% endcomment %}
-        update
+        provider updates
     {% else %}
         {% comment %} If it's a new provider request. {% endcomment %}
-        new verification request
+        new verification requests
     {% endif %}
-    within 3 working days. Once we have reviewed the verification request, we will contact you by email to let you know that it is approved, or that we need more information from you.
+    on Tuesday each week. Once we have reviewed the request, we will contact you by email to let you know that it is approved, or that we need more information from you.
 </p>
 <p>
     If you have further questions, or need to edit your verification request,  please contact <a href="mailto:[email protected]">[email protected]</a>.

apps/accounts/templates/emails/verification-request-notify.txt

@@ -9,7 +9,7 @@ Thank you for taking the time to {% if provider %}update the listing for {{ prov
 {% endif %}
 {{ link_to_verification_request }}
 What happens next?
-We aim to review every {% if provider %}update{% else %} new verification request{% endif %} within 3 working days. Once we have reviewed the verification request, we will contact you by email to let you know that it is approved, or that we need more information from you.
+We review {% if provider %}provider updates{% else %}new verification requests{% endif %} on Tuesday each week. Once we have reviewed the request, we will contact you by email to let you know that it is approved, or that we need more information from you.
 If you have further questions, or need to edit your verification request,  please contact [email protected].
 Many thanks,
 Green Web Foundation

apps/accounts/templates/provider_portal/before_starting.html

@@ -1,6 +1,6 @@
 {% extends 'base.html' %}
 
-{% load i18n static humanize widget_tweaks tailwind_filters waffle_tags %}
+{% load i18n static humanize widget_tweaks tailwind_filters %}
 
 {% block content %}
 
@@ -38,4 +38,4 @@ <h3 class="font-bold text-xl uppercase mt-12">Ready?</h3>
 
 	</div>
 
-{% endblock %}
+{% endblock %}

apps/accounts/templates/provider_portal/request_detail.html

@@ -29,7 +29,8 @@ <h1 class="text-6xl mb-0"><span class="uppercase">Summary of request</h1>
         {% endif %}
 
         {% if object.status|lower == "pending review" %}
-          We are currently reviewing this request. If you want to update the information relating to this provider, please get in touch using <a target="_blank" rel="noopener noreferrer" href="https://www.thegreenwebfoundation.org/support-form/">our support form</a>.
+          We are currently reviewing this request. All verification requests and updates are reviewed by a member of our team on Tuesday each week. <br/>
+          If you want to update the information relating to this provider, please get in touch using <a target="_blank" rel="noopener noreferrer" href="https://www.thegreenwebfoundation.org/support-form/">our support form</a>.
         {% endif %}
 
 

apps/accounts/tests/test_provider_portal.py

@@ -3,13 +3,12 @@
 from ..factories import ProviderRequestFactory, ProviderRequestLocationFactory
 from django.test import RequestFactory
 from django.urls import reverse
-from waffle.testutils import override_flag
+
 
 import pytest
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_portal_home_view_displays_only_authored_requests(client):
     # given: 3 provider requests exist, created by different users
     pr1 = ProviderRequestFactory.create()
@@ -30,7 +29,6 @@ def test_provider_portal_home_view_displays_only_authored_requests(client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_portal_home_view_returns_only_unapproved_requests(client):
     # given: 1 pending verification request
     pr1 = ProviderRequestFactory.create(status=ProviderRequestStatus.PENDING_REVIEW)
@@ -56,7 +54,6 @@ def test_provider_portal_home_view_returns_only_unapproved_requests(client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_portal_home_view_filters_out_removed_requests(client):
     # given: 1 removed verification request
     removed_request = ProviderRequestFactory.create(
@@ -84,7 +81,6 @@ def test_provider_portal_home_view_filters_out_removed_requests(client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_portal_home_view_items_sorted_by_name(client):
     # given: 3 pending verification requests
     pr1 = ProviderRequestFactory.create(status=ProviderRequestStatus.PENDING_REVIEW)

apps/accounts/tests/test_provider_request.py

@@ -254,7 +254,6 @@ def test_staff_can_access_admin(greenweb_staff_user, client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_detail_view_accessible_by_creator(client):
     # given: provider request exists
     pr = ProviderRequestFactory.create()
@@ -269,7 +268,6 @@ def test_detail_view_accessible_by_creator(client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_detail_view_accessible_by_admin(client, greenweb_staff_user):
     # given: provider request exists
     pr = ProviderRequestFactory.create()
@@ -284,7 +282,6 @@ def test_detail_view_accessible_by_admin(client, greenweb_staff_user):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_detail_view_forbidden_for_others(client, user):
     # given: provider request exists
     pr = ProviderRequestFactory.create()
@@ -298,7 +295,6 @@ def test_detail_view_forbidden_for_others(client, user):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_wizard_view_happy_path(
     user,
     client,
@@ -364,7 +360,6 @@ def _create_provider_request(client, form_data) -> HttpResponse:
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_wizard_sends_email_on_submission(
     user,
     client,
@@ -940,7 +935,6 @@ def test_approve_skips_duplicate_evidence_when_existing_evidence_updated(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_wizard_view_with_just_network_explanation(
     user,
     client,
@@ -983,7 +977,6 @@ def test_wizard_view_with_just_network_explanation(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_wizard_records_if_location_import_needed(
     user,
     client,
@@ -1025,7 +1018,6 @@ def test_wizard_records_if_location_import_needed(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_new_submission_doesnt_modify_available_services(
     user,
     client,
@@ -1065,7 +1057,6 @@ def test_new_submission_doesnt_modify_available_services(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_edit_view_accessible_by_creator(client):
     # given: an open provider request
     pr = ProviderRequestFactory.create()
@@ -1079,7 +1070,6 @@ def test_edit_view_accessible_by_creator(client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_edit_view_accessible_by_admin(client, greenweb_staff_user):
     # given: an open provider request
     pr = ProviderRequestFactory.create()
@@ -1093,7 +1083,6 @@ def test_edit_view_accessible_by_admin(client, greenweb_staff_user):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_edit_view_inaccessible_by_other_users(client, user):
     # given: an open provider request
     pr = ProviderRequestFactory.create()
@@ -1107,7 +1096,6 @@ def test_edit_view_inaccessible_by_other_users(client, user):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 @pytest.mark.parametrize(
     "request_status,status_code",
     [
@@ -1130,7 +1118,6 @@ def test_edit_view_accessible_for_given_status(client, request_status, status_co
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_edit_view_displays_form_with_prepopulated_data(client):
     # given: an open provider request
     pr = ProviderRequestFactory.create()
@@ -1154,7 +1141,6 @@ def test_edit_view_displays_form_with_prepopulated_data(client):
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_editing_pr_updates_original_submission(
     client,
     wizard_form_org_details_data,
@@ -1339,7 +1325,6 @@ def test_editing_pr_updates_original_submission(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_edit_view_accessible_by_user_with_required_perms(
     client, hosting_provider_with_sample_user, sample_hoster_user
 ):
@@ -1355,7 +1340,6 @@ def test_provider_edit_view_accessible_by_user_with_required_perms(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_edit_view_accessible_by_admins(
     client, hosting_provider_with_sample_user, greenweb_staff_user
 ):
@@ -1371,7 +1355,6 @@ def test_provider_edit_view_accessible_by_admins(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_provider_edit_view_inaccessible_by_unauthorized_users(
     client, hosting_provider_with_sample_user
 ):
@@ -1390,7 +1373,6 @@ def test_provider_edit_view_inaccessible_by_unauthorized_users(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_edit_view_inaccessible_for_nonexistent_provider(client, greenweb_staff_user):
     client.force_login(greenweb_staff_user)
     response = client.get(urls.reverse("provider_edit", args=[str(123456)]))
@@ -1400,7 +1382,6 @@ def test_edit_view_inaccessible_for_nonexistent_provider(client, greenweb_staff_
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_editing_hp_creates_new_verification_request(
     client,
     hosting_provider_with_sample_user,
@@ -1578,7 +1559,6 @@ def test_editing_hp_creates_new_verification_request(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_saving_changes_to_verification_request_from_hp_via_wizard(
     client,
     hosting_provider_with_sample_user,
@@ -1795,7 +1775,6 @@ def test_saving_changes_to_verification_request_from_hp_via_wizard(
 
 
 @pytest.mark.django_db
-@override_flag("provider_request", active=True)
 def test_saving_changes_to_hp_with_new_verification_request(
     client,
     hosting_provider_with_sample_user,
@@ -2090,7 +2069,6 @@ def test_request_from_host_provider_finishes_in_sensible_time():
         ),
     ),
 )
-@override_flag("provider_request", active=True)
 def test_email_sent_on_approval(
     hosting_provider_with_sample_user,
     greenweb_staff_user,
@@ -2175,7 +2153,6 @@ def test_email_sent_on_approval(
         ),
     ),
 )
-@override_flag("provider_request", active=True)
 def test_email_request_email_confirmation_is_sent(
     hosting_provider_with_sample_user,
     greenweb_staff_user,
@@ -2252,7 +2229,6 @@ def test_email_request_email_confirmation_is_sent(
         ("open", "Changes Requested"),
     ),
 )
-@override_flag("provider_request", active=True)
 def test_staff_review_is_logged(
     hosting_provider_with_sample_user,
     greenweb_staff_user,