From 43b6d1e380dc1b93145b6e6aef7d8c809ed61cae Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Thu, 19 Oct 2023 17:26:26 -0400
Subject: [PATCH] form level error handling at the field level

---
 src/registrar/forms/domain.py  | 16 ++++++++++++----
 src/registrar/models/domain.py |  3 ---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 1a85cb373..303c43690 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -5,7 +5,10 @@ from django.core.validators import MinValueValidator, MaxValueValidator, RegexVa
 from django.forms import formset_factory
 
 from phonenumber_field.widgets import RegionalPhoneNumberWidget
-from registrar.utility.errors import NameserverError
+from registrar.utility.errors import (
+    NameserverError,
+    NameserverErrorCodes as nsErrorCodes
+)
 
 from ..models import Contact, DomainInformation, Domain
 from .common import (
@@ -70,9 +73,9 @@ class DomainNameserverForm(forms.Form):
         # make sure there's a nameserver if an ip is passed
         if ip:
             ip_list = [ip.strip() for ip in ip.split(",")]
-            if len(server) < len(ip_list):
+            if not server and len(ip_list) > 0:
                 # If 'server' is empty, disallow 'ip' input
-                raise forms.ValidationError("Name server must be provided to enter IP address.")
+                self.add_error('server', "Nameserver must be provided to enter IP address.")
         
         # if there's a nameserver and an ip, validate nameserver/ip combo
         
@@ -84,7 +87,12 @@ class DomainNameserverForm(forms.Form):
             try:
                 Domain.checkHostIPCombo(domain, server, ip_list)
             except NameserverError as e:
-                raise forms.ValidationError(str(e))
+                if e.code == nsErrorCodes.GLUE_RECORD_NOT_ALLOWED:
+                    self.add_error('server', "Name server address does not match domain name")
+                elif e.code == nsErrorCodes.MISSING_IP:
+                    self.add_error('ip', "Subdomains require an IP address")
+                else:
+                    self.add_error('ip', str(e))
 
         return cleaned_data
 
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 978e442e3..933ae63be 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -314,7 +314,6 @@ class Domain(TimeStampedModel, DomainHelper):
             NameserverError (if exception hit)
         Returns:
             None"""
-        logger.info("checkHostIPCombo is called on %s, %s", name, nameserver)
         if cls.isSubdomain(name, nameserver) and (ip is None or ip == [] or ip == ['']):
 
             raise NameserverError(code=nsErrorCodes.MISSING_IP, nameserver=nameserver)
@@ -330,7 +329,6 @@ class Domain(TimeStampedModel, DomainHelper):
                     raise NameserverError(
                         code=nsErrorCodes.INVALID_IP, nameserver=nameserver, ip=ip
                     )
-        logger.info("got no errors")
         return None
 
     @classmethod
@@ -340,7 +338,6 @@ class Domain(TimeStampedModel, DomainHelper):
         returns:
             isValid (boolean)-True for valid ip address"""
         try:
-            logger.info(f"in valid_ip_addr: {ipToTest}")
             ip = ipaddress.ip_address(ipToTest)
             logger.info(ip.version)
             return ip.version == 6 or ip.version == 4