From 6fa76f3007c8cdcc9d7fed0926ecd8bcfccfbcf3 Mon Sep 17 00:00:00 2001 From: CocoByte Date: Mon, 10 Jun 2024 16:54:31 -0600 Subject: [PATCH] Merged main -> nl --- src/registrar/models/domain_information.py | 6 ++-- src/registrar/models/domain_request.py | 34 ++++++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index aacea53a3..f38d154a4 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -259,17 +259,17 @@ class DomainInformation(TimeStampedModel): """Some yes/no forms use a db field to track whether it was checked or not. We handle that here for def save(). """ - logger.debug("\033[96m .....syncing form (domain info)...... \033[0m") # TODO-nl: delete me! + logger.debug("\033[96m .....syncing form (domain info)...... \033[0m") # TODO-nl: delete me! # This ensures that if we have prefilled data, the form is prepopulated if self.cisa_representative_first_name is not None or self.cisa_representative_last_name is not None: - logger.debug("\033[96m --> NO NONES \033[0m") # TODO-nl: delete me! + logger.debug("\033[96m --> NO NONES \033[0m") # TODO-nl: delete me! self.has_cisa_representative = ( self.cisa_representative_first_name != "" and self.cisa_representative_last_name != "" ) # This check is required to ensure that the form doesn't start out checked if self.has_cisa_representative is not None: - logger.debug("\033[96m --> cisa_rep is not none \033[0m") # TODO-nl: delete me! + logger.debug("\033[96m --> cisa_rep is not none \033[0m") # TODO-nl: delete me! self.has_cisa_representative = ( self.cisa_representative_first_name != "" and self.cisa_representative_first_name is not None ) and (self.cisa_representative_last_name != "" and self.cisa_representative_last_name is not None) diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 04e292c43..155b905a4 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -554,24 +554,24 @@ class DomainRequest(TimeStampedModel): """Some yes/no forms use a db field to track whether it was checked or not. We handle that here for def save(). """ - logger.debug("\033[91m .....syncing form...... \033[0m") # TODO-nl: delete me! + logger.debug("\033[91m .....syncing form...... \033[0m") # TODO-nl: delete me! # This ensures that if we have prefilled data, the form is prepopulated if self.cisa_representative_first_name is not None or self.cisa_representative_last_name is not None: - logger.debug("\033[91m --> NO NONES \033[0m") # TODO-nl: delete me! + logger.debug("\033[91m --> NO NONES \033[0m") # TODO-nl: delete me! self.has_cisa_representative = ( self.cisa_representative_first_name != "" and self.cisa_representative_last_name != "" ) # This check is required to ensure that the form doesn't start out checked if self.has_cisa_representative is not None: - logger.debug("\033[91m --> cisa_rep is not none \033[0m") # TODO-nl: delete me! + logger.debug("\033[91m --> cisa_rep is not none \033[0m") # TODO-nl: delete me! self.has_cisa_representative = ( self.cisa_representative_first_name != "" and self.cisa_representative_first_name is not None ) and (self.cisa_representative_last_name != "" and self.cisa_representative_last_name is not None) - logger.debug("\033[91m") # TODO-nl: delete me! - logger.debug(f" --> has_cisa_rep is = {self.has_cisa_representative}!") # TODO-nl: delete me! - logger.debug("\033[0m") # TODO-nl: delete me! + logger.debug("\033[91m") # TODO-nl: delete me! + logger.debug(f" --> has_cisa_rep is = {self.has_cisa_representative}!") # TODO-nl: delete me! + logger.debug("\033[0m") # TODO-nl: delete me! # This ensures that if we have prefilled data, the form is prepopulated if self.anything_else is not None: self.has_anything_else_text = self.anything_else != "" @@ -932,13 +932,15 @@ class DomainRequest(TimeStampedModel): if self.has_anything_else_text is None or self.has_cisa_representative is None: has_details = False - logger.debug("\033[91m ******** Has additional ********") # TODO-nl: delete me! - logger.debug(f"""VALUE: {has_details} + logger.debug("\033[91m ******** Has additional ********") # TODO-nl: delete me! + logger.debug( + f"""VALUE: {has_details} DETAILS: has_anything_else_text = {self.has_anything_else_text} - has_cisa_representative = {self.has_cisa_representative}""") # TODO-nl: delete me! - logger.debug("\033[91m ****************") # TODO-nl: delete me! + has_cisa_representative = {self.has_cisa_representative}""" + ) # TODO-nl: delete me! + logger.debug("\033[91m ****************") # TODO-nl: delete me! return has_details @@ -1051,12 +1053,14 @@ class DomainRequest(TimeStampedModel): def _cisa_rep_check(self): # Either does not have a CISA rep, OR has a CISA rep + both first name # and last name are NOT empty and are NOT an empty string - logger.debug("\033[91m ******** CISA REP CHECK 2 ********") # TODO-nl: delete me! - logger.debug(F"""values: + logger.debug("\033[91m ******** CISA REP CHECK 2 ********") # TODO-nl: delete me! + logger.debug( + f"""values: has_cisa_representative = {self.has_cisa_representative} cisa_representative_first_name = {self.cisa_representative_first_name} - cisa_representative_last_name = {self.cisa_representative_last_name}""") # TODO-nl: delete me! - logger.debug("\033[0m") # TODO-nl: delete me! + cisa_representative_last_name = {self.cisa_representative_last_name}""" + ) # TODO-nl: delete me! + logger.debug("\033[0m") # TODO-nl: delete me! to_return = ( self.has_cisa_representative is True and self.cisa_representative_first_name is not None @@ -1065,7 +1069,7 @@ class DomainRequest(TimeStampedModel): and self.cisa_representative_last_name != "" ) or self.has_cisa_representative is False - logger.debug(f"RETURNING: {to_return}") # TODO-nl: delete me! + logger.debug(f"RETURNING: {to_return}") # TODO-nl: delete me! return to_return def _anything_else_radio_button_and_text_field_check(self):