Merge branch 'main' of github.com:cisagov/manage.get.gov into es/1378-availability-bugfix

src/registrar/assets/sass/_theme/_register-form.scss

@@ -78,3 +78,9 @@
   font-weight: font-weight('semibold');
   margin-bottom: units(0.5);
 }
+
+.review__step__subheading {
+  color: color('primary-dark');
+  font-weight: font-weight('semibold');
+  margin-bottom: units(0.5);
+}

src/registrar/management/commands/load_transition_domain.py

@@ -176,6 +176,7 @@ class Command(BaseCommand):
             "clienthold": TransitionDomain.StatusChoices.ON_HOLD,
             "created": TransitionDomain.StatusChoices.READY,
             "ok": TransitionDomain.StatusChoices.READY,
+            "unknown": TransitionDomain.StatusChoices.UNKNOWN,
         }
         mapped_status = status_maps.get(status_to_map)
         return mapped_status

src/registrar/migrations/0048_alter_transitiondomain_status.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.7 on 2023-12-01 17:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registrar", "0047_transitiondomain_address_line_transitiondomain_city_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="transitiondomain",
+            name="status",
+            field=models.CharField(
+                blank=True,
+                choices=[("ready", "Ready"), ("on hold", "On Hold"), ("unknown", "Unknown")],
+                default="ready",
+                help_text="domain status during the transfer",
+                max_length=255,
+                verbose_name="Status",
+            ),
+        ),
+    ]

src/registrar/models/transition_domain.py

@@ -5,6 +5,7 @@ from .utility.time_stamped_model import TimeStampedModel
 class StatusChoices(models.TextChoices):
     READY = "ready", "Ready"
     ON_HOLD = "on hold", "On Hold"
+    UNKNOWN = "unknown", "Unknown"
 
 
 class TransitionDomain(TimeStampedModel):

src/registrar/templates/application_review.html

@@ -99,6 +99,7 @@
           {% if step == Step.OTHER_CONTACTS %}
             {% for other in application.other_contacts.all %}
               <div class="margin-bottom-105">
+                <div class="review__step__subheading">Contact {{ forloop.counter }}</div>
                 {% include "includes/contact.html" with contact=other %}
               </div>
             {% empty %}

src/registrar/tests/data/test_domain_statuses.txt

@@ -2,4 +2,4 @@ Anomaly.gov|muahaha|
 TestDomain.gov|ok|
 FakeWebsite1.gov|serverHold|
 FakeWebsite2.gov|Hold|
-FakeWebsite3.gov|ok|
+FakeWebsite3.gov|unknown|

src/registrar/tests/test_transition_domain_migrations.py

@@ -193,6 +193,17 @@ class TestOrganizationMigration(TestCase):
 
         self.assertEqual(transition, expected_transition_domain)
 
+    def test_transition_domain_status_unknown(self):
+        """
+        Test that a domain in unknown status can be loaded
+        """  # noqa - E501 (harder to read)
+        # == First, parse all existing data == #
+        self.run_load_domains()
+        self.run_transfer_domains()
+
+        domain_object = Domain.objects.get(name="fakewebsite3.gov")
+        self.assertEqual(domain_object.state, Domain.State.UNKNOWN)
+
     def test_load_organization_data_domain_information(self):
         """
         This test verifies the functionality of the load_organization_data method.

src/requirements.txt

@@ -8,7 +8,7 @@ certifi==2023.7.22; python_version >= '3.6'
 cfenv==0.5.3
 cffi==1.16.0; python_version >= '3.8'
 charset-normalizer==3.3.2; python_full_version >= '3.7.0'
-cryptography==41.0.5; python_version >= '3.7'
+cryptography==41.0.6; python_version >= '3.7'
 defusedxml==0.7.1; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'
 dj-database-url==2.1.0
 dj-email-url==1.0.6