From 8d476d5a80ef3fa8e93a1653b21cda5fd2a76723 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Tue, 6 Feb 2024 12:58:44 -0700
Subject: [PATCH] Better logging

---
 src/registrar/admin.py         | 8 +++-----
 src/registrar/models/domain.py | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 74424b56a..7c164ae27 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1147,15 +1147,12 @@ class DomainAdmin(ListHeaderAdmin):
 
     def do_extend_expiration_date(self, request, obj):
         if not isinstance(obj, Domain):
-            # Could be problematic if the type is similar,
-            # but not the same (same field/func names).
-            # We do not want to accidentally delete records.
             self.message_user(request, "Object is not of type Domain", messages.ERROR)
             return None
 
         try:
             obj.renew_domain(date_to_extend=date.today())
-        except Exception as err:
+        except RegistryError as err:
             if err.code:
                 self.message_user(
                     request,
@@ -1169,8 +1166,9 @@ class DomainAdmin(ListHeaderAdmin):
                     messages.ERROR,
                 )
             else:
-                # all other type error messages, display the error
                 self.message_user(request, err, messages.ERROR)
+        except Exception as err:
+            self.message_user(request, err, messages.ERROR)
         else:
             updated_domain = Domain.objects.filter(id=obj).get()
             self.message_user(
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 84f451f56..74461f4c9 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -255,7 +255,7 @@ class Domain(TimeStampedModel, DomainHelper):
                 # if no expiration date from registry, set it to today
                 logger.warning("current expiration date not set; setting to today")
                 date_to_extend = date.today()
-
+        print(f"This is the date to extend: {date_to_extend} vs registry {self.registry_expiration_date}")
         # create RenewDomain request
         request = commands.RenewDomain(name=self.name, cur_exp_date=date_to_extend, period=epp.Period(length, unit))