Add models

Makefile

@@ -10,8 +10,14 @@ down:
 build:
 	docker compose build
 
+shell:
+	docker compose exec web bash
+
 collectstatic:
-		docker compose -f docker-compose.yml -f docker-compose-local.yml run --rm --service-ports --entrypoint "python manage.py collectstatic --noinput" web
+	docker compose -f docker-compose.yml -f docker-compose-local.yml run --rm --service-ports --entrypoint "python manage.py collectstatic --noinput" web
+
+makemigrations:
+	docker compose run --entrypoint "python manage.py makemigrations" web
 
 migrate-devserver:
 	docker exec -it domains-register-a-govuk-domain-web-1 ./manage.py migrate

pyproject.toml

@@ -15,6 +15,8 @@ psycopg2-binary = "^2.9.9"
 whitenoise = "^6.6.0"
 govuk-frontend-django = "^0.4.0"
 crispy-forms-gds = "^0.3.0"
+django-phonenumber-field = {extras = ["phonenumberslite"], version = "^7.3.0"}
+django-simple-history = "^3.5.0"
 
 
 [tool.poetry.group.dev.dependencies]

request_a_govuk_domain/request/forms.py

@@ -16,6 +16,7 @@
 )
 
 from .utils import organisations_list
+from .models.organisation import RegistrantTypeChoices
 
 
 class NameForm(forms.Form):
@@ -203,27 +204,14 @@ def __init__(self, *args, **kwargs):
 
 
 class RegistrantTypeForm(forms.Form):
-    REGISTRANT_TYPES = (
-        Choice("central_gov", "Central government department or agency"),
-        Choice("alb", "Non-departmental body - also known as an arm's length body"),
-        Choice("fire_service", "Fire service"),
-        Choice("county_council", "County, borough, metropolitan or district council"),
-        Choice("parish_council", "Parish, town or community council"),
-        Choice("village_council", "Neighbourhood or village council"),
-        Choice("combined_authority", "Combined or unitary authority"),
-        Choice("pcc", "Police and crime commissioner"),
-        Choice("joint_authority", "Joint authority"),
-        Choice("joint_committee", "Joint committee"),
-        Choice(
-            "representing_public_sector",
-            "Representing public sector bodies",
-            divider="Or",
-        ),
-        Choice("none", "None of the above"),
-    )
+    registrant_types = [
+        Choice(*item) for item in RegistrantTypeChoices.__members__.items()
+    ]
+    registrant_types[-1].divider = "Or"
+    registrant_types.append(Choice("none", "None of the above"))
 
     registrant_type = forms.ChoiceField(
-        choices=REGISTRANT_TYPES,
+        choices=registrant_types,
         widget=forms.RadioSelect,
         label="Your registrant must be from an eligible organisation to get a .gov.uk domain name.",
         error_messages={"required": "Please select from one of the choices"},