From e4c83751bfbc7cc0d2f0fc508f225104ffba4dd3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:23:02 -0600
Subject: [PATCH 01/14] Fix bug

---
 src/registrar/forms/domain.py                 | 25 +++++++++++++++++--
 src/registrar/forms/domain_request_wizard.py  | 24 ++++++++++++++++++
 .../templates/includes/input_with_errors.html |  2 +-
 3 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 0bfd9b667..0130bd3fd 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -15,7 +15,7 @@ from registrar.utility.errors import (
     SecurityEmailError,
     SecurityEmailErrorCodes,
 )
-
+from django.core.validators import RegexValidator, MaxLengthValidator
 from ..models import Contact, DomainInformation, Domain
 from .common import (
     ALGORITHM_CHOICES,
@@ -31,7 +31,18 @@ logger = logging.getLogger(__name__)
 class DomainAddUserForm(forms.Form):
     """Form for adding a user to a domain."""
 
-    email = forms.EmailField(label="Email")
+    email = forms.EmailField(
+        label="Email",
+        max_length=254,
+        error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
+        # This validator should exist in the event that a preexisting field is of invalid length
+        validators=[
+            MaxLengthValidator(
+                254,
+                message="Response must be less than 254 characters.",
+            )
+        ],
+    )
 
     def clean(self):
         """clean form data by lowercasing email"""
@@ -193,6 +204,8 @@ class ContactForm(forms.ModelForm):
         # take off maxlength attribute for the phone number field
         # which interferes with out input_with_errors template tag
         self.fields["phone"].widget.attrs.pop("maxlength", None)
+        max = self.fields["email"].widget.attrs["maxlength"]
+        print(f"what is the max? {max}")
 
         for field_name in self.required:
             self.fields[field_name].required = True
@@ -291,10 +304,18 @@ class DomainSecurityEmailForm(forms.Form):
 
     security_email = forms.EmailField(
         label="Security email (optional)",
+        max_length=254,
         required=False,
         error_messages={
             "invalid": str(SecurityEmailError(code=SecurityEmailErrorCodes.BAD_DATA)),
         },
+        # This validator should exist in the event that a preexisting field is of invalid length
+        validators=[
+            MaxLengthValidator(
+                254,
+                message="Response must be less than 254 characters.",
+            )
+        ],
     )
 
 
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 1efc028f6..8ef0f6e33 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -369,7 +369,15 @@ class AuthorizingOfficialForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
+        max_length=254,
         error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
+        # This validator should exist in the event that a preexisting field is of invalid length
+        validators=[
+            MaxLengthValidator(
+                254,
+                message="Response must be less than 254 characters.",
+            )
+        ],
     )
 
 
@@ -566,7 +574,15 @@ class YourContactForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
+        max_length=254,
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
+        # This validator should exist in the event that a preexisting field is of invalid length
+        validators=[
+            MaxLengthValidator(
+                254,
+                message="Response must be less than 254 characters.",
+            )
+        ],
     )
     phone = PhoneNumberField(
         label="Phone",
@@ -621,10 +637,18 @@ class OtherContactsForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
+        max_length=254,
         error_messages={
             "required": ("Enter an email address in the required format, like name@example.com."),
             "invalid": ("Enter an email address in the required format, like name@example.com."),
         },
+        # This validator should exist in the event that a preexisting field is of invalid length
+        validators=[
+            MaxLengthValidator(
+                254,
+                message="Response must be less than 254 characters.",
+            )
+        ],
     )
     phone = PhoneNumberField(
         label="Phone",
diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index 56bd0b111..24308741d 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -76,7 +76,7 @@ error messages, if necessary.
   </div>
 {% endif %}
 
-{% if widget.attrs.maxlength %}
+{% if widget.attrs.maxlength and show_max_length %}
   <span
     id="{{ widget.attrs.id }}__message"
     class="usa-character-count__message"

From 3e24166cfb8969b40fdf7bacbf8c4deabc45a696 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:26:05 -0600
Subject: [PATCH 02/14] Cleanup

---
 src/registrar/forms/domain.py                        |  6 ++----
 .../templates/includes/input_with_errors.html        | 12 ------------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 0130bd3fd..1a6a8778e 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -2,7 +2,7 @@
 
 import logging
 from django import forms
-from django.core.validators import MinValueValidator, MaxValueValidator, RegexValidator
+from django.core.validators import MinValueValidator, MaxValueValidator, RegexValidator, MaxLengthValidator
 from django.forms import formset_factory
 from registrar.models import DomainRequest
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
@@ -15,7 +15,7 @@ from registrar.utility.errors import (
     SecurityEmailError,
     SecurityEmailErrorCodes,
 )
-from django.core.validators import RegexValidator, MaxLengthValidator
+
 from ..models import Contact, DomainInformation, Domain
 from .common import (
     ALGORITHM_CHOICES,
@@ -204,8 +204,6 @@ class ContactForm(forms.ModelForm):
         # take off maxlength attribute for the phone number field
         # which interferes with out input_with_errors template tag
         self.fields["phone"].widget.attrs.pop("maxlength", None)
-        max = self.fields["email"].widget.attrs["maxlength"]
-        print(f"what is the max? {max}")
 
         for field_name in self.required:
             self.fields[field_name].required = True
diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index 24308741d..b6c24ba3e 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -75,15 +75,3 @@ error messages, if necessary.
 {% else %}
   </div>
 {% endif %}
-
-{% if widget.attrs.maxlength and show_max_length %}
-  <span
-    id="{{ widget.attrs.id }}__message"
-    class="usa-character-count__message"
-    aria-live="polite"
-  >
-    You can enter up to {{ widget.attrs.maxlength }} characters
-  </span>
-
-</div>
-{% endif %}

From d8777c5dae698d808acab0ca7596f4dd70933020 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 3 Apr 2024 15:44:57 -0600
Subject: [PATCH 03/14] Fix javascript errors

---
 .../templates/includes/input_with_errors.html | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index b6c24ba3e..e189f8d85 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -75,3 +75,25 @@ error messages, if necessary.
 {% else %}
   </div>
 {% endif %}
+
+{% if widget.attrs.maxlength %}
+  <span
+    id="{{ widget.attrs.id }}__message"
+    {% comment %}
+    Many USWDS scripts actually rely on this field existing when using maxlength (even when implied).
+    Without it, our javascript breaks as the base script they are using has poor error handling.
+    To maintain consistency and to avoid doing massive overrides, we can just simply hide this field.
+
+    This is a workaround but I would argue the tradeoff here makes sense.
+    {% endcomment %}
+    {% if not show_max_length %}
+    aria-hidden="true"
+    {% endif %}
+    class="usa-character-count__message {% if not show_max_length %} display-none {% endif %}"
+    aria-live="polite"
+  >
+    You can enter up to {{ widget.attrs.maxlength }} characters
+  </span>
+
+</div>
+{% endif %}

From df3e628e613ed885fb382c0bac176b1c646b2d62 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 4 Apr 2024 08:33:18 -0600
Subject: [PATCH 04/14] Remove max length

---
 src/registrar/forms/domain.py                | 4 ----
 src/registrar/forms/domain_request_wizard.py | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 1a6a8778e..0d135c58b 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -33,9 +33,7 @@ class DomainAddUserForm(forms.Form):
 
     email = forms.EmailField(
         label="Email",
-        max_length=254,
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
-        # This validator should exist in the event that a preexisting field is of invalid length
         validators=[
             MaxLengthValidator(
                 254,
@@ -302,12 +300,10 @@ class DomainSecurityEmailForm(forms.Form):
 
     security_email = forms.EmailField(
         label="Security email (optional)",
-        max_length=254,
         required=False,
         error_messages={
             "invalid": str(SecurityEmailError(code=SecurityEmailErrorCodes.BAD_DATA)),
         },
-        # This validator should exist in the event that a preexisting field is of invalid length
         validators=[
             MaxLengthValidator(
                 254,
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 8ef0f6e33..9ac17b145 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -369,9 +369,7 @@ class AuthorizingOfficialForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
-        max_length=254,
         error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
-        # This validator should exist in the event that a preexisting field is of invalid length
         validators=[
             MaxLengthValidator(
                 254,
@@ -574,9 +572,7 @@ class YourContactForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
-        max_length=254,
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
-        # This validator should exist in the event that a preexisting field is of invalid length
         validators=[
             MaxLengthValidator(
                 254,
@@ -637,12 +633,10 @@ class OtherContactsForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
-        max_length=254,
         error_messages={
             "required": ("Enter an email address in the required format, like name@example.com."),
             "invalid": ("Enter an email address in the required format, like name@example.com."),
         },
-        # This validator should exist in the event that a preexisting field is of invalid length
         validators=[
             MaxLengthValidator(
                 254,

From 1e4be56e8ebb62d6bb1fa5b363b11ef28577de5e Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 4 Apr 2024 08:40:40 -0600
Subject: [PATCH 05/14] 254 -> 320 characters

---
 src/registrar/forms/domain.py                |  8 ++++----
 src/registrar/forms/domain_request_wizard.py | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 0d135c58b..12417c0d2 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -36,8 +36,8 @@ class DomainAddUserForm(forms.Form):
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
-                254,
-                message="Response must be less than 254 characters.",
+                320,
+                message="Response must be less than 320 characters.",
             )
         ],
     )
@@ -306,8 +306,8 @@ class DomainSecurityEmailForm(forms.Form):
         },
         validators=[
             MaxLengthValidator(
-                254,
-                message="Response must be less than 254 characters.",
+                320,
+                message="Response must be less than 320 characters.",
             )
         ],
     )
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 9ac17b145..1e8034fe2 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -372,8 +372,8 @@ class AuthorizingOfficialForm(RegistrarForm):
         error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
-                254,
-                message="Response must be less than 254 characters.",
+                320,
+                message="Response must be less than 320 characters.",
             )
         ],
     )
@@ -575,8 +575,8 @@ class YourContactForm(RegistrarForm):
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
-                254,
-                message="Response must be less than 254 characters.",
+                320,
+                message="Response must be less than 320 characters.",
             )
         ],
     )
@@ -639,8 +639,8 @@ class OtherContactsForm(RegistrarForm):
         },
         validators=[
             MaxLengthValidator(
-                254,
-                message="Response must be less than 254 characters.",
+                320,
+                message="Response must be less than 320 characters.",
             )
         ],
     )

From 6728826c0b69e84cbe53025572d8ae5eb45f735c Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 4 Apr 2024 13:37:36 -0600
Subject: [PATCH 06/14] Fix max length bug

---
 src/registrar/forms/domain.py                        |  2 ++
 src/registrar/forms/domain_request_wizard.py         |  3 +++
 .../templates/includes/input_with_errors.html        | 12 +-----------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 12417c0d2..faf21e12e 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -33,6 +33,7 @@ class DomainAddUserForm(forms.Form):
 
     email = forms.EmailField(
         label="Email",
+        max_length=None,
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
@@ -300,6 +301,7 @@ class DomainSecurityEmailForm(forms.Form):
 
     security_email = forms.EmailField(
         label="Security email (optional)",
+        max_length=None,
         required=False,
         error_messages={
             "invalid": str(SecurityEmailError(code=SecurityEmailErrorCodes.BAD_DATA)),
diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py
index 1e8034fe2..c3ac3b4c2 100644
--- a/src/registrar/forms/domain_request_wizard.py
+++ b/src/registrar/forms/domain_request_wizard.py
@@ -369,6 +369,7 @@ class AuthorizingOfficialForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
+        max_length=None,
         error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
@@ -572,6 +573,7 @@ class YourContactForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
+        max_length=None,
         error_messages={"invalid": ("Enter your email address in the required format, like name@example.com.")},
         validators=[
             MaxLengthValidator(
@@ -633,6 +635,7 @@ class OtherContactsForm(RegistrarForm):
     )
     email = forms.EmailField(
         label="Email",
+        max_length=None,
         error_messages={
             "required": ("Enter an email address in the required format, like name@example.com."),
             "invalid": ("Enter an email address in the required format, like name@example.com."),
diff --git a/src/registrar/templates/includes/input_with_errors.html b/src/registrar/templates/includes/input_with_errors.html
index e189f8d85..56bd0b111 100644
--- a/src/registrar/templates/includes/input_with_errors.html
+++ b/src/registrar/templates/includes/input_with_errors.html
@@ -79,17 +79,7 @@ error messages, if necessary.
 {% if widget.attrs.maxlength %}
   <span
     id="{{ widget.attrs.id }}__message"
-    {% comment %}
-    Many USWDS scripts actually rely on this field existing when using maxlength (even when implied).
-    Without it, our javascript breaks as the base script they are using has poor error handling.
-    To maintain consistency and to avoid doing massive overrides, we can just simply hide this field.
-
-    This is a workaround but I would argue the tradeoff here makes sense.
-    {% endcomment %}
-    {% if not show_max_length %}
-    aria-hidden="true"
-    {% endif %}
-    class="usa-character-count__message {% if not show_max_length %} display-none {% endif %}"
+    class="usa-character-count__message"
     aria-live="polite"
   >
     You can enter up to {{ widget.attrs.maxlength }} characters

From ab2c0974416100fd9d9e3f3c39635c52e3d2afdd Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Mon, 8 Apr 2024 09:18:57 -0600
Subject: [PATCH 07/14] fix bug

---
 src/registrar/forms/domain.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index faf21e12e..ee1362415 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -181,6 +181,7 @@ NameserverFormset = formset_factory(
 class ContactForm(forms.ModelForm):
     """Form for updating contacts."""
 
+    email = forms.EmailField(max_length=None)
     class Meta:
         model = Contact
         fields = ["first_name", "middle_name", "last_name", "title", "email", "phone"]
@@ -204,6 +205,10 @@ class ContactForm(forms.ModelForm):
         # which interferes with out input_with_errors template tag
         self.fields["phone"].widget.attrs.pop("maxlength", None)
 
+        # Define a custom validator for the email field with a custom error message
+        email_max_length_validator = MaxLengthValidator(320, message="Response must be less than 320 characters.")
+        self.fields["email"].validators.append(email_max_length_validator)
+
         for field_name in self.required:
             self.fields[field_name].required = True
 

From 2b2d71847b741297521fa20c75ba37b160f6d374 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 08:17:09 -0600
Subject: [PATCH 08/14] Update domain.py

---
 src/registrar/forms/domain.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index ee1362415..7b0ac2956 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -182,6 +182,7 @@ class ContactForm(forms.ModelForm):
     """Form for updating contacts."""
 
     email = forms.EmailField(max_length=None)
+
     class Meta:
         model = Contact
         fields = ["first_name", "middle_name", "last_name", "title", "email", "phone"]

From 7443703ddad64b68b968fe82e6fbcd3c711744b6 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 08:44:44 -0600
Subject: [PATCH 09/14] Fix max length

---
 .../migrations/0082_alter_contact_email.py     | 18 ++++++++++++++++++
 src/registrar/models/contact.py                |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 src/registrar/migrations/0082_alter_contact_email.py

diff --git a/src/registrar/migrations/0082_alter_contact_email.py b/src/registrar/migrations/0082_alter_contact_email.py
new file mode 100644
index 000000000..866fbc266
--- /dev/null
+++ b/src/registrar/migrations/0082_alter_contact_email.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.10 on 2024-04-09 14:44
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0081_create_groups_v10"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contact",
+            name="email",
+            field=models.EmailField(blank=True, db_index=True, max_length=320, null=True),
+        ),
+    ]
diff --git a/src/registrar/models/contact.py b/src/registrar/models/contact.py
index d3de5a293..6bc20ebeb 100644
--- a/src/registrar/models/contact.py
+++ b/src/registrar/models/contact.py
@@ -40,6 +40,7 @@ class Contact(TimeStampedModel):
         null=True,
         blank=True,
         db_index=True,
+        max_length=320,
     )
     phone = PhoneNumberField(
         null=True,

From 25e737821a213d9b04ca90e5182750dd93c4402d Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:10:11 -0600
Subject: [PATCH 10/14] Update domain.py

---
 src/registrar/forms/domain.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 7b0ac2956..e2f9b4eb9 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -314,8 +314,8 @@ class DomainSecurityEmailForm(forms.Form):
         },
         validators=[
             MaxLengthValidator(
-                320,
-                message="Response must be less than 320 characters.",
+                254,
+                message="Response must be less than 254 characters.",
             )
         ],
     )

From ec371f1844c8ed1deef7388656ff935bcbfd529e Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:13:27 -0600
Subject: [PATCH 11/14] Fix max length

---
 src/registrar/forms/domain.py                  |  4 ++--
 .../migrations/0082_alter_contact_email.py     | 18 ------------------
 src/registrar/models/public_contact.py         |  6 +++++-
 3 files changed, 7 insertions(+), 21 deletions(-)
 delete mode 100644 src/registrar/migrations/0082_alter_contact_email.py

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index e2f9b4eb9..7b0ac2956 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -314,8 +314,8 @@ class DomainSecurityEmailForm(forms.Form):
         },
         validators=[
             MaxLengthValidator(
-                254,
-                message="Response must be less than 254 characters.",
+                320,
+                message="Response must be less than 320 characters.",
             )
         ],
     )
diff --git a/src/registrar/migrations/0082_alter_contact_email.py b/src/registrar/migrations/0082_alter_contact_email.py
deleted file mode 100644
index 866fbc266..000000000
--- a/src/registrar/migrations/0082_alter_contact_email.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-04-09 14:44
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0081_create_groups_v10"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="contact",
-            name="email",
-            field=models.EmailField(blank=True, db_index=True, max_length=320, null=True),
-        ),
-    ]
diff --git a/src/registrar/models/public_contact.py b/src/registrar/models/public_contact.py
index f9dea3f02..42266bf4c 100644
--- a/src/registrar/models/public_contact.py
+++ b/src/registrar/models/public_contact.py
@@ -69,7 +69,11 @@ class PublicContact(TimeStampedModel):
     pc = models.CharField(null=False, help_text="Contact's postal code")
     cc = models.CharField(null=False, help_text="Contact's country code")
     email = models.EmailField(null=False, help_text="Contact's email address")
-    voice = models.CharField(null=False, help_text="Contact's phone number. Must be in ITU.E164.2005 format")
+    voice = models.CharField(
+        null=False, 
+        help_text="Contact's phone number. Must be in ITU.E164.2005 format",
+        max_length=320,
+    )
     fax = models.CharField(
         null=True,
         blank=True,

From 82c31616464fe1e72e5d6a40d124c489fe7de908 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 10:22:41 -0600
Subject: [PATCH 12/14] Typo

---
 ...contact_email_alter_publiccontact_email.py | 23 +++++++++++++++++++
 src/registrar/models/public_contact.py        |  8 +++----
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py

diff --git a/src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py b/src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py
new file mode 100644
index 000000000..fb0740e9f
--- /dev/null
+++ b/src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.10 on 2024-04-09 16:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registrar", "0081_create_groups_v10"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="contact",
+            name="email",
+            field=models.EmailField(blank=True, db_index=True, max_length=320, null=True),
+        ),
+        migrations.AlterField(
+            model_name="publiccontact",
+            name="email",
+            field=models.EmailField(help_text="Contact's email address", max_length=320),
+        ),
+    ]
diff --git a/src/registrar/models/public_contact.py b/src/registrar/models/public_contact.py
index 42266bf4c..6b91ea7cb 100644
--- a/src/registrar/models/public_contact.py
+++ b/src/registrar/models/public_contact.py
@@ -68,12 +68,12 @@ class PublicContact(TimeStampedModel):
     sp = models.CharField(null=False, help_text="Contact's state or province")
     pc = models.CharField(null=False, help_text="Contact's postal code")
     cc = models.CharField(null=False, help_text="Contact's country code")
-    email = models.EmailField(null=False, help_text="Contact's email address")
-    voice = models.CharField(
+    email = models.EmailField(
         null=False, 
-        help_text="Contact's phone number. Must be in ITU.E164.2005 format",
-        max_length=320,
+        help_text="Contact's email address", 
+        max_length=320
     )
+    voice = models.CharField(null=False, help_text="Contact's phone number. Must be in ITU.E164.2005 format")
     fax = models.CharField(
         null=True,
         blank=True,

From 940234b0c9b856cd5642cebd99469ac08ff121ab Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:38:00 -0600
Subject: [PATCH 13/14] linting

---
 src/registrar/models/public_contact.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/registrar/models/public_contact.py b/src/registrar/models/public_contact.py
index 6b91ea7cb..00d065404 100644
--- a/src/registrar/models/public_contact.py
+++ b/src/registrar/models/public_contact.py
@@ -68,11 +68,7 @@ class PublicContact(TimeStampedModel):
     sp = models.CharField(null=False, help_text="Contact's state or province")
     pc = models.CharField(null=False, help_text="Contact's postal code")
     cc = models.CharField(null=False, help_text="Contact's country code")
-    email = models.EmailField(
-        null=False, 
-        help_text="Contact's email address", 
-        max_length=320
-    )
+    email = models.EmailField(null=False, help_text="Contact's email address", max_length=320)
     voice = models.CharField(null=False, help_text="Contact's phone number. Must be in ITU.E164.2005 format")
     fax = models.CharField(
         null=True,

From 23ac0d14924d42775b247bd18a05a68d83a376d1 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 9 Apr 2024 14:43:52 -0600
Subject: [PATCH 14/14] Fix migration after merge

---
 ...py => 0083_alter_contact_email_alter_publiccontact_email.py} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/registrar/migrations/{0082_alter_contact_email_alter_publiccontact_email.py => 0083_alter_contact_email_alter_publiccontact_email.py} (88%)

diff --git a/src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py b/src/registrar/migrations/0083_alter_contact_email_alter_publiccontact_email.py
similarity index 88%
rename from src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py
rename to src/registrar/migrations/0083_alter_contact_email_alter_publiccontact_email.py
index fb0740e9f..c58c09656 100644
--- a/src/registrar/migrations/0082_alter_contact_email_alter_publiccontact_email.py
+++ b/src/registrar/migrations/0083_alter_contact_email_alter_publiccontact_email.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("registrar", "0081_create_groups_v10"),
+        ("registrar", "0082_domaininformation_organization_type_and_more"),
     ]
 
     operations = [