Rename model

Reflects the new name of the feature.

Note that the name of the underlying table hasn’t changed because it’s
explicitly set to `service_whitelist`. Changing this will be a more
involved process.

app/dao/service_whitelist_dao.py

@@ -1,10 +1,10 @@
 from app import db
-from app.models import ServiceWhitelist
+from app.models import ServiceGuestList
 
 
 def dao_fetch_service_guest_list(service_id):
-    return ServiceWhitelist.query.filter(
-        ServiceWhitelist.service_id == service_id).all()
+    return ServiceGuestList.query.filter(
+        ServiceGuestList.service_id == service_id).all()
 
 
 def dao_add_and_commit_guest_list_contacts(objs):
@@ -13,5 +13,5 @@ def dao_add_and_commit_guest_list_contacts(objs):
 
 
 def dao_remove_service_guest_list(service_id):
-    return ServiceWhitelist.query.filter(
-        ServiceWhitelist.service_id == service_id).delete()
+    return ServiceGuestList.query.filter(
+        ServiceGuestList.service_id == service_id).delete()

app/models.py

@@ -655,17 +655,17 @@ class ServicePermission(db.Model):
 MOBILE_TYPE = 'mobile'
 EMAIL_TYPE = 'email'
 
-WHITELIST_RECIPIENT_TYPE = [MOBILE_TYPE, EMAIL_TYPE]
-whitelist_recipient_types = db.Enum(*WHITELIST_RECIPIENT_TYPE, name='recipient_type')
+GUEST_LIST_RECIPIENT_TYPE = [MOBILE_TYPE, EMAIL_TYPE]
+guest_list_recipient_types = db.Enum(*GUEST_LIST_RECIPIENT_TYPE, name='recipient_type')
 
 
-class ServiceWhitelist(db.Model):
+class ServiceGuestList(db.Model):
     __tablename__ = 'service_whitelist'
 
     id = db.Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
     service_id = db.Column(UUID(as_uuid=True), db.ForeignKey('services.id'), index=True, nullable=False)
     service = db.relationship('Service', backref='whitelist')
-    recipient_type = db.Column(whitelist_recipient_types, nullable=False)
+    recipient_type = db.Column(guest_list_recipient_types, nullable=False)
     recipient = db.Column(db.String(255), nullable=False)
     created_at = db.Column(db.DateTime, default=datetime.datetime.utcnow)
 

app/service/utils.py

@@ -3,7 +3,7 @@ import itertools
 from notifications_utils.recipients import allowed_to_send_to
 
 from app.models import (
-    ServiceWhitelist,
+    ServiceGuestList,
     MOBILE_TYPE, EMAIL_TYPE,
     KEY_TYPE_TEST, KEY_TYPE_TEAM, KEY_TYPE_NORMAL)
 
@@ -16,7 +16,7 @@ def get_recipients_from_request(request_json, key, type):
 
 def get_guest_list_objects(service_id, request_json):
     return [
-        ServiceWhitelist.from_string(service_id, type, recipient)
+        ServiceGuestList.from_string(service_id, type, recipient)
         for type, recipient in (
             get_recipients_from_request(request_json,
                                         'phone_numbers',