From 29621a6184bc5b5cd5cd7f24c6d42a0bb4605ab3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Wed, 24 Jan 2024 15:38:08 -0700
Subject: [PATCH] Add notes to DomainInformation

---
 src/registrar/admin.py                                   | 2 +-
 ...064_domain_notes_domainapplication_notes_and_more.py} | 9 +++++++--
 src/registrar/models/domain_application.py               | 4 ++--
 src/registrar/models/domain_information.py               | 6 ++++++
 src/registrar/tests/test_admin.py                        | 1 +
 5 files changed, 17 insertions(+), 5 deletions(-)
 rename src/registrar/migrations/{0064_domain_notes_domainapplication_notes.py => 0064_domain_notes_domainapplication_notes_and_more.py} (65%)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 67a2b9ed2..dc2741c49 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -570,7 +570,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
     search_help_text = "Search by domain."
 
     fieldsets = [
-        (None, {"fields": ["creator", "domain_application"]}),
+        (None, {"fields": ["creator", "domain_application", "notes"]}),
         (
             "Type of organization",
             {
diff --git a/src/registrar/migrations/0064_domain_notes_domainapplication_notes.py b/src/registrar/migrations/0064_domain_notes_domainapplication_notes_and_more.py
similarity index 65%
rename from src/registrar/migrations/0064_domain_notes_domainapplication_notes.py
rename to src/registrar/migrations/0064_domain_notes_domainapplication_notes_and_more.py
index 24dfaf4e3..0ec824233 100644
--- a/src/registrar/migrations/0064_domain_notes_domainapplication_notes.py
+++ b/src/registrar/migrations/0064_domain_notes_domainapplication_notes_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.2.7 on 2024-01-24 20:34
+# Generated by Django 4.2.7 on 2024-01-24 22:28
 
 from django.db import migrations, models
 
@@ -17,6 +17,11 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="domainapplication",
             name="notes",
-            field=models.TextField(blank=True, help_text="Notes about this application", null=True),
+            field=models.TextField(blank=True, help_text="Notes about this request", null=True),
+        ),
+        migrations.AddField(
+            model_name="domaininformation",
+            name="notes",
+            field=models.TextField(blank=True, help_text="Notes about the request", null=True),
         ),
     ]
diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py
index 301d1b42b..dc2dc80c7 100644
--- a/src/registrar/models/domain_application.py
+++ b/src/registrar/models/domain_application.py
@@ -559,7 +559,7 @@ class DomainApplication(TimeStampedModel):
     notes = models.TextField(
         null=True,
         blank=True,
-        help_text="Notes about this application",
+        help_text="Notes about this request",
     )
 
     def __str__(self):
@@ -711,7 +711,7 @@ class DomainApplication(TimeStampedModel):
 
         # copy the information from domainapplication into domaininformation
         DomainInformation = apps.get_model("registrar.DomainInformation")
-        DomainInformation.create_from_da(self, domain=created_domain)
+        DomainInformation.create_from_da(domain_application=self, domain=created_domain)
 
         # create the permission for the user
         UserDomainRole = apps.get_model("registrar.UserDomainRole")
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 3531c6426..680a3c155 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -203,6 +203,12 @@ class DomainInformation(TimeStampedModel):
         help_text="Acknowledged .gov acceptable use policy",
     )
 
+    notes = models.TextField(
+        null=True,
+        blank=True,
+        help_text="Notes about the request",
+    )
+
     def __str__(self):
         try:
             if self.domain and self.domain.name:
diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 7c9aa8fe4..b02abf0d4 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -624,6 +624,7 @@ class TestDomainApplicationAdmin(MockEppLib):
             "anything_else",
             "is_policy_acknowledged",
             "submission_date",
+            "notes",
             "current_websites",
             "other_contacts",
             "alternative_domains",