Use service ID, not from token to build notification

app/notifications/rest.py

@@ -119,13 +119,13 @@ def send_notification(notification_type, service_id=None, expects_job=False):
 
     if notification_type is SMS_NOTIFICATION:
         send_sms.apply_async((
-            api_user['client'],
+            service_id,
             notification_id,
             encryption.encrypt(notification)),
             queue='sms')
     else:
         send_email.apply_async((
-            api_user['client'],
+            service_id,
             notification_id,
             template.subject,
             "{}@{}".format(service.email_from, current_app.config['NOTIFY_EMAIL_DOMAIN']),

tests/app/notifications/test_rest.py

@@ -487,7 +487,7 @@ def test_should_allow_valid_sms_notification_for_job(notify_api, sample_job, moc
 
             notification_id = json.loads(response.data)['notification_id']
             app.celery.tasks.send_sms.apply_async.assert_called_once_with(
-                (str(sample_job.template.service_id),
+                (str(sample_job.service_id),
                  notification_id,
                  "something_encrypted"),
                 queue="sms"