Add new organisation type for custom domain pharmacy

Author: spatel033

app/main/forms.py

@@ -1305,7 +1305,7 @@ class CreateServiceForm(StripWhitespaceForm):
 class CreateNhsServiceForm(CreateServiceForm):
     organisation_type = OrganisationTypeField(
         "Who runs this service?",
-        include_only={"nhs_central", "nhs_local", "nhs_gp"},
+        include_only={"nhs_central", "nhs_local", "nhs_gp", "private_pharmacy"},
     )
 
 

app/main/views/add_service.py

@@ -70,8 +70,8 @@ def add_service():
 
         new_service = Service.from_id(service_id)
 
-        # GPs have a zero message limit (to prevent them sending messages while in trial mode)
-        if form.organisation_type.data == Organisation.TYPE_NHS_GP:
+        # GPs and private pharmacies have a zero message limit (to prevent them sending messages while in trial mode)
+        if form.organisation_type.data in Organisation.ZERO_TEXT_LIMIT_ORGANISATION_TYPES:
             new_service.update(sms_message_limit=0)
 
         # show the tour if the user doesn't have any other services. Never show for NHS GPs

app/main/views/agreement.py

@@ -25,6 +25,7 @@ def service_agreement(service_id):
     if current_service.organisation.agreement_signed:
         return render_template("views/agreement/service-agreement-signed.html")
     return render_template("views/agreement/service-agreement.html")
+    # TODO: private pharmacies agrrement not implemented yet, so we don't show the agreement page for them.
 
 
 @main.route("/services/<uuid:service_id>/agreement.pdf")

app/main/views/organisations/index.py

@@ -79,7 +79,9 @@ def add_organisation():
 @main.route("/services/<uuid:service_id>/add-gp-organisation", methods=["GET", "POST"])
 @user_has_permissions("manage_service")
 def add_organisation_from_gp_service(service_id):
-    if (not current_service.organisation_type == Organisation.TYPE_NHS_GP) or current_service.organisation:
+    if (
+        current_service.organisation_type not in Organisation.ZERO_TEXT_LIMIT_ORGANISATION_TYPES
+    ) or current_service.organisation:
         abort(403)
 
     form = AddGPOrganisationForm(service_name=current_service.name)

app/models/organisation.py

@@ -21,6 +21,7 @@ class Organisation(JSONModel):
     TYPE_NHS_CENTRAL = "nhs_central"
     TYPE_NHS_LOCAL = "nhs_local"
     TYPE_NHS_GP = "nhs_gp"
+    TYPE_PRIVATE_PHARMACY = "private_pharmacy"
     TYPE_EMERGENCY_SERVICE = "emergency_service"
     TYPE_SCHOOL_OR_COLLEGE = "school_or_college"
     TYPE_OTHER = "other"
@@ -29,6 +30,7 @@ class Organisation(JSONModel):
         TYPE_NHS_CENTRAL,
         TYPE_NHS_LOCAL,
         TYPE_NHS_GP,
+        TYPE_PRIVATE_PHARMACY,
     )
 
     TYPE_LABELS = {
@@ -39,9 +41,15 @@ class Organisation(JSONModel):
         TYPE_NHS_GP: "GP surgery",
         TYPE_EMERGENCY_SERVICE: "Emergency service",
         TYPE_SCHOOL_OR_COLLEGE: "School or college",
+        TYPE_PRIVATE_PHARMACY: "Private pharmacy",
         TYPE_OTHER: "Other",
     }
 
+    ZERO_TEXT_LIMIT_ORGANISATION_TYPES = (
+        TYPE_NHS_GP,
+        TYPE_PRIVATE_PHARMACY,
+    )
+
     id: Any
     name: str
     active: bool

tests/app/main/views/organisations/test_organisations.py

@@ -85,6 +85,7 @@ def test_page_to_create_new_organisation(
         ("radio", "organisation_type", "nhs_gp"),
         ("radio", "organisation_type", "emergency_service"),
         ("radio", "organisation_type", "school_or_college"),
+        ("radio", "organisation_type", "private_pharmacy"),
         ("radio", "organisation_type", "other"),
         ("radio", "crown_status", "crown"),
         ("radio", "crown_status", "non-crown"),
@@ -1345,6 +1346,7 @@ def test_archive_organisation_does_not_allow_orgs_with_team_members_or_services_
                 {"value": "nhs_gp", "label": "GP surgery"},
                 {"value": "emergency_service", "label": "Emergency service"},
                 {"value": "school_or_college", "label": "School or college"},
+                {"value": "private_pharmacy", "label": "Private pharmacy"},
                 {"value": "other", "label": "Other"},
             ),
             "central",

tests/app/main/views/test_add_service.py

@@ -48,6 +48,7 @@ def test_get_should_render_add_service_template(
         "GP surgery",
         "Emergency service",
         "School or college",
+        "Private pharmacy",
         "Other",
     ]
     assert [radio["value"] for radio in page.select(".govuk-radios__item input")] == [
@@ -58,6 +59,7 @@ def test_get_should_render_add_service_template(
         "nhs_gp",
         "emergency_service",
         "school_or_college",
+        "private_pharmacy",
         "other",
     ]
 
@@ -224,12 +226,7 @@ def test_add_service_has_to_choose_org_type(
 
 @pytest.mark.parametrize(
     "email_address",
-    (
-        "test@nhs.net",
-        "test@nhs.uk",
-        "test@example.NhS.uK",
-        "test@EXAMPLE.NHS.NET",
-    ),
+    ("test@nhs.net", "test@nhs.uk", "test@example.NhS.uK", "test@EXAMPLE.NHS.NET"),
 )
 def test_get_should_only_show_nhs_org_types_radios_if_user_has_nhs_email(
     client_request,
@@ -250,11 +247,13 @@ def test_get_should_only_show_nhs_org_types_radios_if_user_has_nhs_email(
         "NHS – central government agency or public body",
         "NHS Trust or Integrated Care Board",
         "GP surgery",
+        "Private pharmacy",
     ]
     assert [radio["value"] for radio in page.select(".govuk-radios__item input")] == [
         "nhs_central",
         "nhs_local",
         "nhs_gp",
+        "private_pharmacy",
     ]
 
 
@@ -268,6 +267,7 @@ def test_get_should_only_show_nhs_org_types_radios_if_user_has_nhs_email(
         "nhs_gp",
         "school_or_college",
         "emergency_service",
+        "private_pharmacy",
         "other",
     ],
 )