Ce/connect messaging

corehq/apps/reports/standard/sms.py

@@ -62,6 +62,7 @@
     OUTGOING,
     SMS,
     WORKFLOWS_FOR_REPORTS,
+    ConnectMessage,
     MessagingEvent,
     MessagingSubEvent,
     PhoneBlacklist,
@@ -709,8 +710,8 @@
         event_status = EventStatusFilter.get_value(self.request, self.domain)
         if event_status == MessagingEvent.STATUS_ERROR:
             event_status_filter = (
                 Q(status=event_status) |
                 Q(messagingsubevent__status=event_status) |
                 Q(messagingsubevent__sms__error=True)
             )
         elif event_status == MessagingEvent.STATUS_IN_PROGRESS:
@@ -720,21 +721,21 @@
             # session_is_open=True if there actually are
             # subevent and xforms session records
             event_status_filter = (
                 Q(status=event_status) |
                 Q(messagingsubevent__status=event_status) |
                 (Q(messagingsubevent__xforms_session__id__isnull=False) &
                  Q(messagingsubevent__xforms_session__session_is_open=True))
             )
         elif event_status == MessagingEvent.STATUS_NOT_COMPLETED:
             event_status_filter = (
                 Q(status=event_status) |
                 Q(messagingsubevent__status=event_status) |
                 (Q(messagingsubevent__xforms_session__session_is_open=False) &
                  Q(messagingsubevent__xforms_session__submission_id__isnull=True))
             )
         elif event_status == MessagingEvent.STATUS_EMAIL_DELIVERED:
             event_status_filter = (
                 Q(status=event_status) |
                 Q(messagingsubevent__status=event_status)
             )
 
@@ -773,7 +774,7 @@
 
         if content_type_filter:
             data = data.filter(
                 (Q(content_type__in=content_type_filter) |
                  Q(messagingsubevent__content_type__in=content_type_filter))
             )
 
@@ -873,7 +874,7 @@
         if self.messaging_event:
             if self.messaging_event.content_type == MessagingEvent.CONTENT_EMAIL:
                 contact_column = EMAIL_ADDRRESS
             elif self.messaging_event.content_type in (MessagingEvent.CONTENT_CONNECT, MessagingEvent.CONTENT_CONNECT_SURVEY):
                 contact_column = CONNECT_ID
         else:
             contact_column = PHONE_NUMBER
@@ -915,10 +916,10 @@
     def view_response(self):
         subevents = self.messaging_subevents
         if (
             len(subevents) == 1 and
             subevents[0].content_type in (MessagingEvent.CONTENT_SMS_SURVEY,
                                           MessagingEvent.CONTENT_IVR_SURVEY) and
             subevents[0].xforms_session_id and
             subevents[0].status != MessagingEvent.STATUS_ERROR
         ):
             # There's only one survey to report on here - just redirect to the
@@ -964,7 +965,8 @@
                             self._fmt(status),
                         ])
             elif messaging_subevent.content_type in (MessagingEvent.CONTENT_SMS_SURVEY,
-                    MessagingEvent.CONTENT_IVR_SURVEY):
+                                                     MessagingEvent.CONTENT_IVR_SURVEY,
+                                                     MessagingEvent.CONTENT_CONNECT_SURVEY):
                 status = get_status_display(messaging_subevent)
                 xforms_session = messaging_subevent.xforms_session
                 timestamp = xforms_session.start_time if xforms_session else messaging_subevent.date
@@ -998,6 +1000,26 @@
                     self._fmt(_('Email')),
                     self._fmt(status),
                 ])
+            elif messaging_subevent.content_type == MessagingEvent.CONTENT_CONNECT:
+                timestamp = ServerTime(messaging_subevent.date).user_time(self.timezone).done()
+                status = get_status_display(messaging_subevent)
+                content = '-'
+                recipient_address = '-'
+                try:
+                    msg = ConnectMessage.objects.get(messaging_subevent=messaging_subevent.pk)
+                    content = msg.text
+                    recipient = msg.couch_recipient
+                except ConnectMessage.DoesNotExist:
+                    pass
+                result.append([
+                    self._fmt_timestamp(timestamp),
+                    self._fmt_contact_link(messaging_subevent.recipient_id, doc_info),
+                    self._fmt(content),
+                    self._fmt(recipient),
+                    self._fmt_direction(msg.direction),
+                    self._fmt(_('Connect Message')),
+                    self._fmt(status),
+                ])
         return result
 
 
@@ -1209,8 +1231,8 @@
     @property
     def _show_users_without_phone_numbers(self):
         return (
             self.filter_type == 'contact' and
             self.contact_type == 'users' and
             self.has_phone_number != 'has_phone_number'
         )
 
@@ -1233,9 +1255,9 @@
         elif number.pending_verification:
             return "Verification Pending"
         elif (
                 not (number.is_two_way or number.pending_verification) and
                 PhoneNumber.get_reserved_number(number.phone_number)
              ):
             return "Already In Use"
         return "Not Verified"