"Mark as spam" feature for contact.PhoneNumber

Author: jMyles

deployment/setup_db.py

@@ -11,6 +11,7 @@
 from what_apps.slashroot import config as slashroot_config
 from what_apps.people import config as people_config
 from what_apps.contact import config as contact_config
+from what_apps.comm import config as comm_config
 
 utility = ManagementUtility(['', 'syncdb', '--noinput'])
 utility.execute()
@@ -29,8 +30,9 @@
 admin.save()
 
 rusty, rusty_profile = people_config.setup()
-rusty_contact = contact_config.setup()
+rusty_contact, rusty_home_number, rusty_work_number = contact_config.setup()
 
 rusty_profile.contact_info = rusty_contact
 rusty_profile.save()
 
+comm_config.setup(rusty_home_number)

templates/comm/call_alert.html

@@ -1,7 +1,7 @@
 <div class="displayCall" id="displayCall_{{call.id}}" call="{{call.id}}" status="{{call.status}}">
 	<div class="basicCallInfo">
 	    <h5><a href="{{call.resolve_task.get_absolute_url}}">PhoneCall #{{call.id}}</a> {{call.created}}</h5> 
-	    From {%if call.from_user %}{{call.from_user.get_full_name}}{% else %}Unknown Caller{% endif %}</strong>
+	    From <a href="{{call.from_number.get_absolute_url}}">{{call.from_number}}</a></strong>
 	    {% if call.from_user.userprofile %}
 			<strong>(<a href="{{call.from_user.get_absolute_url}}">{{call.from_user.userprofile.user.get_full_name}}</a>)</strong>    
 	    {% else %}

templates/contact/phone_number_profile.html

@@ -3,12 +3,25 @@
 {% block title %}{{phone_number}}{% endblock %}
 
 {% block more_content %}
+
+		
 
         {% if not phone_number.user %}
             <h2><a href='/contact/new_contact/?phone_number={{phone_number.number}}'>Add to Contacts</a></h2>
         {% endif %}
 
-        <h2><a href="/comm/outgoing_call_menu/?phone_number={{phone_number.id}}">Place Call</a></h2>    
+        <h2><a href="/comm/outgoing_call_menu/?phone_number={{phone_number.id}}">Place Call to this number</a></h2>
+        
+        <form action="" method="POST">
+          {% csrf_token %}
+          {% if phone_number.spam %}
+            <input type="hidden" value="0" name="spam">
+            <button>This number is marked as spam.  Click here to unmark.</button>
+          {% else %}
+            <input type="hidden" value="1" name="spam">
+		    <button>Mark as spam.</button>
+          {% endif %}
+        </form>
 
 
 

urls.py

@@ -10,11 +10,6 @@
 
 admin.autodiscover()
 
-
-
-
-
-
 urlpatterns = patterns('',
     #MAIN
     (r'^$', 'what_apps.main.views.main_landing'),

what_apps/comm/config.py

@@ -0,0 +1,6 @@
+from what_apps.comm.factories import PhonecallFactory
+
+
+def setup(from_number):
+    PhonecallFactory.create(from_number=from_number)
+    

what_apps/comm/factories.py

@@ -1,27 +1,31 @@
 import factory
 import datetime
 from models import PhoneCall
-from contact.factories import PhoneNumberFactory, PhoneServiceFactory
+from what_apps.contact.factories import PhoneNumberFactory, PhoneServiceFactory
+from what_apps.people.models import UserProfile
+from twilio.rest.resources.phone_numbers import PhoneNumber
+from what_apps.contact.models import ContactInfo
 
 
 class PhonecallFactory(factory.Factory):
     FACTORY_FOR = PhoneCall
-    service = factory.Subfactory(PhoneServiceFactory)
+    service = factory.SubFactory(PhoneServiceFactory)
     call_id = factory.Sequence(lambda n: n)
     account_id = factory.Sequence(lambda n: n)
     dial = True
-    from_number = factory.Subfactory(PhoneNumberFactory)
-    to_number = factory.Subfactory(PhoneNumberFactory)
+    from_number = factory.SubFactory(PhoneNumberFactory)
+    to_number = factory.SubFactory(PhoneNumberFactory)
     ended = datetime.datetime.now()
 
-    @class_method
+    @classmethod
     def _prepare(cls,
                  create,
                  from_number=None,
                  to_number=None,
                  from_user=None,
                  to_user=None,
-                 is_twilio=False
+                 is_twilio=False,
+                 dial=False,
                  **kwargs):
 
         if from_user and from_number:
@@ -33,12 +37,15 @@ def _prepare(cls,
         if from_user:
             UserProfile.objects.get_or_create(user=from_user, defaults={'contact_info':ContactInfo.objects.create()})
             from_number = PhoneNumber.objects.get_or_create(owner=from_user.userprofile.contact_info, defaults=dict(number="+15551231234"))[0]
-        else:
-
         if to_number:
             pass #We'll just use this.
         elif to_user:
             UserProfile.objects.get_or_create(user=to_user, defaults={'contact_info':ContactInfo.objects.create()})
             to_number = PhoneNumber.objects.create(owner=to_user.userprofile.contact_info, number="+15551231234")
         else:
-            to_number = PhoneNumber.objects.get_or_create(type='mobile', number='+18455551234')[0]
+            to_number = PhoneNumber.objects.get_or_create(type='mobile', number='+18455551234')[0]
+        
+        return super(PhonecallFactory, cls)._prepare(create,
+                                                     from_number=from_number,
+                                                     to_number=to_number,
+                                                     **kwargs)

what_apps/comm/models.py

@@ -15,16 +15,14 @@
 from what_apps.utility.models import FixedObject
 
 
-
-
-
 class Communication(models.Model):
     '''
     A single instance of communication - a phone call, email, etc.
     '''
     created = models.DateTimeField(auto_now_add=True)
     description = models.TextField(blank=True, null=True)
 
+
 class CommunicationInvolvement(models.Model):
     '''
     People are involved in communication in different ways depending on the medium, the circumstances, and sometimes the actual people.
@@ -70,6 +68,7 @@ def summary(self):
         if self.direction == "from":
             return "%s called " % (self.person.userprofile.user.first_name)
 
+
 class PhoneCallQuerySet(QuerySet):
     def involving(self, user_list=None, include_from=True, include_to=True, subtractive=False):
         '''
@@ -112,6 +111,7 @@ def has_recording(self, voicemail=True):
         else:
             return calls_with_recordings.filter(tasks__tags__name="voicemail")
 
+
 class PhoneCall(Communication):
     '''
     This model is loosely based on a twilio phone call HTTP request, which is explained here:
@@ -277,6 +277,7 @@ def set_resolve_status(self, status, user):
         resolve_task = self.resolve_task()
         return status_is_changed
 
+
 class PhoneCallRecording(models.Model):
     '''
     Tracks the audio recording of a telephone call.
@@ -319,6 +320,7 @@ def message_count(self):
        count = self.number
        return count
 
+
 class PhoneCallEvent(object):
     '''
     Not a model.
@@ -348,13 +350,11 @@ def summary(self):
             summary = "caller hung up"
         return summary
 
-
-
-
 #TODO: Move this stuff elsewhere.  Maybe the .save() method.
 
 RESOLVE_PHONE_CALL = "TaskPrototype__resolve_phone_call"
 
+
 def notifyCallSave(instance, **kwargs):
     '''
     When phone calls are saved, push to watch_calls

what_apps/comm/provider_views.py

@@ -39,7 +39,11 @@ def answer(request, this_is_only_a_test=False):
     #Now we need a call object with the appropriate details, regardless of the provider.
     call_info = standardize_call_info(request, provider=provider)
     call = call_object_from_call_info(call_info) #Identify the call, saving it as a new object if necessary.
-    comm_logger.info('%s %s call from %s' % (call_info['status'], provider, call.from_number))
+    if call.from_number.spam:
+        r.reject()
+        comm_logger.info('%s %s call from %s (rejected because spam)' % (call_info['status'], provider, call.from_number))
+    else:
+        comm_logger.info('%s %s call from %s' % (call_info['status'], provider, call.from_number))
 
     if not call.ended:
         r.say(SLASHROOT_EXPRESSIONS['public_greeting'], voice=random_tropo_voice()) #Greet them.

what_apps/comm/response.py

@@ -150,6 +150,14 @@ def prompt_and_record(self, recording_object=None, prompt=None, transcribe=False
                 recording_kwargs['transcription'] = {'id':kwargs['call_id'], "url":"%s/comm/transcription_handler/%s/%s/" % ((resources.COMM_DOMAIN,) + recording_url_args)}
             self.response_object.record(**recording_kwargs)
 
+    def reject(self):
+        if self.provider.name == "Twilio":
+            self.response_object.reject()
+        else:
+            raise NotImplementedError("Twilio only for the moment.")
+            
+        
+    
     def hangup(self, *args, **kwargs):
         self.response_object.hangup(*args, **kwargs)
 

what_apps/comm/tests.py

@@ -66,6 +66,7 @@
 import json
 import what_apps.do.config as do_config
 import what_apps.mellon.config as mellon_config
+from what_apps.contact.factories import PhoneNumberFactory
 
 
 
@@ -268,13 +269,24 @@ def test_turn_tropo_request_into_phone_call_object(self):
 class CallerInitialExperience(TestCase):
     def setUp(self):
         prepare_testcase_for_answer_tests(self)
-
+    
     def test_twilio_greeting(self):
         '''
     Tests that the greeting is equal to the say command
         '''
         self.assertEqual(self.twilio_response_object.verbs[0].name, 'Say')
         self.assertEqual(self.twilio_response_object.verbs[0].body, SLASHROOT_EXPRESSIONS['public_greeting'])
+    
+    def test_spam_number_is_hung_up_upon(self):
+        spam_caller = PhoneNumberFactory.create(number="001-001-0123", spam=True)
+        request_dict = TYPICAL_TWILIO_REQUEST.copy()
+        request_dict['From'] = request_dict['Caller'] = "+10010010123"
+        request_dict['CallSid'] = "DefinitelyNotTheSameCallBLAHBLAHblahblah"
+        request = FakeRequest(data=request_dict)
+        
+        response = answer(request)
+        
+        self.assertEqual(response._container[0].verbs[0].name, "Reject")
 
     def test_twilio_answer_second_command_dial(self):
         '''

what_apps/contact/config.py

@@ -17,6 +17,6 @@ def setup():
                                              owner=rusty_contact,
                                              type="work")
 
-    return rusty_contact
+    return rusty_contact, home_number, work_number
 
 

what_apps/contact/factories.py

@@ -1,6 +1,13 @@
 import factory
 import datetime
+from what_apps.contact.models import PhoneNumber, PhoneProvider
+
 
 class PhoneNumberFactory(factory.Factory):
+    FACTORY_FOR = PhoneNumber
     type = 'mobile'
-    number = factory.Sequence(lambda n: '888-555-%04.f' % n)
+    number = factory.Sequence(lambda n: '888-555-%04.f' % float(n)) # Typecast required because factory_boy passes str
+
+
+class PhoneServiceFactory(factory.Factory):
+    FACTORY_FOR = PhoneProvider

what_apps/contact/models.py

@@ -74,11 +74,16 @@ class PhoneNumber(models.Model):
 
     def __unicode__(self):
         if self.owner:
-            return "%s (%s)" % (self.owner, self.type)
+            name = "%s (%s)" % (self.owner, self.type)
         elif self.number == "+10000000000":
-            return "Blank Number"
+            name = "Blank Number"
         else:
-            return "Unknown Caller #%s" % self.id
+            name = "Unknown Caller #%s" % self.id
+        
+        if self.spam:
+            name += " (SPAM!)"
+        
+        return name
 
 
     def save(self, owner=None, *args, **kwargs):

what_apps/contact/views.py

@@ -219,4 +219,9 @@ def toggle_dial_list(request, dial_list_id):
 
 def phone_number_profile(request, phone_number_id):
     phone_number = PhoneNumber.objects.get(id=phone_number_id)
+    
+    if request.POST:
+        phone_number.spam = int(request.POST['spam'])
+        phone_number.save()
+    
     return render(request, 'contact/phone_number_profile.html', locals())