Skip to content

Commit

Permalink
fixed misformatted string bug, added content to lookups dashboard
Browse files Browse the repository at this point in the history
  • Loading branch information
sara committed Jul 18, 2018
1 parent 6e1939f commit 3841e47
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 19 deletions.
2 changes: 1 addition & 1 deletion garfield/lookup/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@

@admin.register(Lookup)
class LookupAdmin(admin.ModelAdmin):
pass
list_display = ('officer_phone_number', 'contact_phone_number', 'related_contact')

26 changes: 8 additions & 18 deletions garfield/lookup/views.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
#from celery import chain
#from celery import shared_task

#from django.conf import settings
#from django.db.models.signals import post_save
#from django.dispatch import receiver
#from django.forms.models import model_to_dict
#from django.template.loader import render_to_string

import requests
#import sys

#from django.shortcuts import render
from django.http import HttpResponse

from twilio.rest import Client
Expand All @@ -21,7 +9,7 @@
from .decorators import twilio_view
from garfield import local as local
import phonenumbers
# Create your views here.

@twilio_view
def index(request):
"""
Expand Down Expand Up @@ -57,8 +45,10 @@ def lookup_contact(request):
contact_number = request.GET.get('Body')
try:
valid = is_valid_number(contact_number)
except:
error_message = "Error on input %s \nPhone numbers may only contain +[country code] and numeric characters, please check your syntax\n" % (contact_number)
if valid is False:
raise Exception
except Exception as e:
error_message = "Error on input %s \nPhone numbers must be formatted +[country code][area code][7 digit identifier], please check your syntax\n" % (contact_number)
raise InputError(contact_number, error_message)
contact_information = {}
try:
Expand Down Expand Up @@ -87,10 +77,10 @@ def __init__(self, expression, message):
self.message = message

def is_valid_number(number:str):
phnumber = phonenumbers.parse(number)
try:
return phonenumbers.is_possible_number(phnumber)
except Exception as e:
phnumber = phonenumbers.parse(number)
return(phonenumbers.is_possible_number(phnumber))
except Exception as e:
raise e

def create_lookup_entry(request, contact_phone_number, related_contact):
Expand Down

0 comments on commit 3841e47

Please sign in to comment.