Account for watchlist entries with no expiration

This should fix the 500 error happening when trying to edit a watchlist entry.

uber/model_checks.py

@@ -152,7 +152,7 @@ def include_other_details(entry):
 
 @validation.WatchList
 def not_active_after_expiration(entry):
-    if entry.active and localized_now().date() > entry.expiration:
+    if entry.active and entry.expiration and localized_now().date() > entry.expiration:
         return ('expiration', 'An entry cannot be active with an expiration date in the past.')
 
 

uber/tasks/security.py

@@ -11,6 +11,7 @@
 def deactivate_expired_watchlist_entries():
     with Session() as session:
         expired_entries = session.query(WatchList).filter(WatchList.active == True,  # noqa: E712
+                                                          WatchList.expiration != None,
                                                           WatchList.expiration <= date.today())
 
         expired_count = expired_entries.count()