Determine agreement by service not user’s org

A user might not have a guessable organisation type, even if the service
they’re working on does have an organisation set. This can happen for
users with @nhs.net email addresses, for example.

app/main/views/agreement.py

@@ -8,6 +8,7 @@ from app.main import main
 from app.main.forms import AcceptAgreementForm
 from app.main.views.sub_navigation_dictionaries import features_nav
 from app.s3_client.s3_mou_client import get_mou
+from app.utils import user_has_permissions
 
 
 @main.route('/agreement')
@@ -29,6 +30,15 @@ def service_agreement(service_id):
     )
 
 
+@main.route('/services/<uuid:service_id>/agreement.pdf')
+@login_required
+@user_has_permissions('manage_service')
+def service_download_agreement(service_id):
+    return send_file(**get_mou(
+        current_service.organisation.crown_status_or_404
+    ))
+
+
 @main.route('/services/<uuid:service_id>/agreement/accept', methods=['GET', 'POST'])
 @login_required
 def service_accept_agreement(service_id):

app/navigation.py

@@ -252,6 +252,7 @@ class HeaderNavigation(Navigation):
         'service_dashboard_updates',
         'service_delete_email_reply_to',
         'service_delete_sms_sender',
+        'service_download_agreement',
         'service_edit_email_reply_to',
         'service_edit_letter_contact',
         'service_edit_sms_sender',
@@ -539,6 +540,7 @@ class MainNavigation(Navigation):
         'service_dashboard_updates',
         'service_delete_email_reply_to',
         'service_delete_sms_sender',
+        'service_download_agreement',
         'service_letter_validation_preview',
         'service_switch_can_upload_document',
         'service_switch_count_as_live',
@@ -777,6 +779,7 @@ class CaseworkNavigation(Navigation):
         'service_dashboard_updates',
         'service_delete_email_reply_to',
         'service_delete_sms_sender',
+        'service_download_agreement',
         'service_edit_email_reply_to',
         'service_edit_letter_contact',
         'service_edit_sms_sender',
@@ -1048,6 +1051,7 @@ class OrgNavigation(Navigation):
         'service_dashboard_updates',
         'service_delete_email_reply_to',
         'service_delete_sms_sender',
+        'service_download_agreement',
         'service_edit_email_reply_to',
         'service_edit_letter_contact',
         'service_edit_sms_sender',

app/templates/views/agreement/_agreement-signed.html

@@ -1,7 +1,7 @@
 <p>
   Your organisation ({{ owner }}) has already accepted the GOV.UK
   Notify data sharing and financial agreement. You can
-  <a href="{{ url_for('main.download_agreement') }}">download a copy</a>.
+  <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">download a copy</a>.
 </p>
 <p>
   The agreement contains commercially sensitive information, so don’t share it more widely than you need to.

app/templates/views/agreement/_agreement.html

@@ -9,7 +9,7 @@
   It needs to be accepted by, or on behalf of someone who can sign contracts for your organisation.
 </p>
 <p>
-  <a href="{{ url_for('main.download_agreement') }}">Download a copy of the agreement</a>.
+  <a href="{{ url_for('main.service_download_agreement', service_id=current_service.id) }}">Download a copy of the agreement</a>.
 </p>
 <p>
   The agreement contains commercially sensitive information, so don’t share it more widely than you need to.