merge from main and fix some tests

app/service/rest.py

@@ -2,11 +2,11 @@ import itertools
 from datetime import datetime
 
 from flask import Blueprint, current_app, jsonify, request
-from app.aws.s3 import get_personalisation_from_s3
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy.orm.exc import NoResultFound
 from werkzeug.datastructures import MultiDict
 
+from app.aws.s3 import get_personalisation_from_s3, get_phone_number_from_s3
 from app.config import QueueNames
 from app.dao import fact_notification_status_dao, notifications_dao
 from app.dao.annual_billing_dao import set_default_free_allowance_for_service
@@ -429,8 +429,17 @@ def get_all_notifications_for_service(service_id):
     for notification in pagination.items:
         if notification.job_id is not None:
             notification.personalisation = get_personalisation_from_s3(
-                notification.service_id, notification.job_id, notification.job_row_number
-                )
+                notification.service_id,
+                notification.job_id,
+                notification.job_row_number,
+            )
+            recipient = get_phone_number_from_s3(
+                notification.service_id,
+                notification.job_id,
+                notification.job_row_number,
+            )
+            notification.to = recipient
+            notification.normalised_to = recipient
 
     kwargs = request.args.to_dict()
     kwargs["service_id"] = service_id