tidy up codes and tests

app/dao/services_dao.py

@@ -2,7 +2,7 @@ import uuid
 from datetime import date, datetime, timedelta
 
 from sqlalchemy import asc, func
-from sqlalchemy.orm import joinedload, lazyload
+from sqlalchemy.orm import joinedload
 from flask import current_app
 
 from app import db
@@ -48,9 +48,6 @@ def dao_fetch_all_services(only_active=False):
         joinedload('users')
     )
 
-    # import pdb
-    # pdb.set_trace()
-
     if only_active:
         query = query.filter(Service.active)
 
@@ -363,8 +360,6 @@ def dao_fetch_monthly_historical_stats_for_service(service_id, year):
 @statsd(namespace='dao')
 def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mode_services=None):
 
-    # service_id = db.session.query(Service.id).filter(Service.restricted == True)
-
     query = db.session.query(
         Notification.notification_type,
         Notification.status,
@@ -374,7 +369,6 @@ def dao_fetch_todays_stats_for_all_services(include_from_test_key=True, trial_mo
         Service
     ).filter(
         func.date(Notification.created_at) == date.today(),
-        # Service.restricted == trial_mode_services
     ).group_by(
         Notification.notification_type,
         Notification.status,