Merge pull request #1015 from alphagov/imdad-feat-return-content-outbound

Return notification content for outbound messages

app/dao/notifications_dao.py

@@ -494,7 +494,7 @@ def dao_get_notifications_by_to_field(service_id, search_term, statuses=None):
     if statuses:
         filters.append(Notification.status.in_(statuses))
 
-    results = db.session.query(Notification).filter(*filters).all()
+    results = db.session.query(Notification).filter(*filters).order_by(desc(Notification.created_at)).all()
     return results
 
 

app/notifications/rest.py

@@ -11,6 +11,10 @@ from app.dao import (
     templates_dao,
     notifications_dao
 )
+from app.errors import (
+    register_errors,
+    InvalidRequest
+)
 from app.models import KEY_TYPE_TEAM, PRIORITY
 from app.models import SMS_TYPE
 from app.notifications.process_notifications import (
@@ -38,12 +42,6 @@ from notifications_utils.recipients import get_international_phone_info
 
 notifications = Blueprint('notifications', __name__)
 
-from app.errors import (
-    register_errors,
-    InvalidRequest
-)
-
-
 register_errors(notifications)
 
 

app/service/rest.py

@@ -59,6 +59,7 @@ from app.schemas import (
     user_schema,
     permission_schema,
     notification_with_template_schema,
+    notification_with_personalisation_schema,
     notifications_filter_schema,
     detailed_service_schema
 )
@@ -316,7 +317,7 @@ def get_notification_for_service(service_id, notification_id):
 def search_for_notification_by_to_field(service_id, search_term, statuses):
     results = notifications_dao.dao_get_notifications_by_to_field(service_id, search_term, statuses)
     return jsonify(
-        notifications=notification_with_template_schema.dump(results, many=True).data
+        notifications=notification_with_personalisation_schema.dump(results, many=True).data
     ), 200