pr feedback and report error

corehq/apps/reports/standard/sms.py

@@ -873,7 +873,7 @@ def headers(self):
         if self.messaging_event:
             if self.messaging_event.content_type == MessagingEvent.CONTENT_EMAIL:
                 contact_column = EMAIL_ADDRRESS
-            elif self.messaging_event.content_type == MessagingEvent.CONTENT_CONNECT:
+            elif self.messaging_event.content_type in (MessagingEvent.CONTENT_CONNECT, MessagingEvent.CONTENT_CONNECT_SURVEY):
                 contact_column = CONNECT_ID
         else:
             contact_column = PHONE_NUMBER

corehq/apps/sms/models.py

@@ -596,39 +596,21 @@ def opt_out_sms(cls, phone_number, domain=None):
         return True
 
 
-class AbstractNumber(ABC):
-    owner_doc_type = None
-    owner_id = None
-    is_two_way = None
-    phone_number = None
-    domain = None
-
-    @property
-    @abstractmethod
-    def backend(self):
-        pass
-
-    @property
-    @abstractmethod
-    def is_sms(self):
-        pass
-
-
-class ConnectMessagingNumber(AbstractNumber):
+class ConnectMessagingNumber:
     owner_doc_type = "CommCareUser"
     is_two_way = True
     pending_verification = False
 
-    def __init__(self, user):
-        self.user = user
+    def __init__(self, owner):
+        self.owner = owner
 
     @property
     def phone_number(self):
         return self.user_link.channel_id
 
     @property
     def user_link(self):
-        django_user = self.user.get_django_user()
+        django_user = self.owner.get_django_user()
         return ConnectIDUserLink.objects.get(commcare_user=django_user)
 
     @property
@@ -637,11 +619,7 @@ def backend(self):
 
     @property
     def owner_id(self):
-        return self.user._id
-
-    @property
-    def owner(self):
-        return self.user
+        return self.owner._id
 
     @property
     def domain(self):

corehq/apps/smsforms/tasks.py

@@ -76,7 +76,7 @@ def send_first_message(domain, recipient, phone_entry_or_number, session, respon
             messaging_subevent_id=logged_subevent.pk
         )
 
-        if isinstance(phone_entry_or_number, PhoneNumber) or isinstance(phone_entry_or_number, ConnectMessagingNumber):
+        if isinstance(phone_entry_or_number, (PhoneNumber, ConnectMessagingNumber)):
             send_message_to_verified_number(
                 phone_entry_or_number,
                 message,

corehq/messaging/scheduling/models/abstract.py

@@ -184,7 +184,7 @@ def memoized_language_set(self):
             content = event.memoized_content
             if isinstance(content, (SMSContent, SMSCallbackContent, ConnectMessageContent)):
                 result |= set(content.message)
-            elif isinstance(content, (EmailContent)):
+            elif isinstance(content, EmailContent):
                 result |= set(content.subject)
                 result |= set(content.message)