Use Govuk Notify Mailer

.env.example

@@ -1,6 +1,7 @@
 PORT=3000
 GOVUK_NOTIFY_API_KEY=
 GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID=
+GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID=
 AZURE_CLIENT_ID=
 AZURE_CLIENT_SECRET=
 AZURE_TENANT_ID=

.github/workflows/build-and-deploy.yml

@@ -88,7 +88,7 @@ jobs:
         build-args: |
           COMMIT_SHA=${{ env.IMAGE_TAG }}
           GOVUK_NOTIFY_API_KEY=${{ secrets.GOVUK_NOTIFY_API_KEY }}
-          GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID=${{ secrets.GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID }}
+          GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID=${{ secrets.GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID }}
 
     - name: Push ${{ env.DOCKER_IMAGE }} images for review
       if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy') }}

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
       RAILS_ENV: test
       DATABASE_URL: 'postgres://rails:password@localhost:5432/rails_test'
       GOVUK_NOTIFY_API_KEY: ${{ secrets.GOVUK_NOTIFY_API_KEY }}
-      GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID: ${{ secrets.GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID }}
+      GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID: ${{ secrets.GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

Dockerfile

@@ -29,17 +29,16 @@ COPY . .
 RUN echo export PATH=/usr/local/bin:\$PATH > /root/.ashrc
 ENV ENV="/root/.ashrc"
 
-RUN bundle exec rake assets:precompile && \
-    rm -rf node_modules tmp
-
 ARG COMMIT_SHA
 ENV COMMIT_SHA=$COMMIT_SHA
 
 ARG GOVUK_NOTIFY_API_KEY
 ENV GOVUK_NOTIFY_API_KEY=$GOVUK_NOTIFY_API_KEY
 
-ARG GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID
-ENV GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID=$GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID
+ARG GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID
+ENV GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID=$GOVUK_NOTIFY_GENERIC_EMAIL_TEMPLATE_ID
+
+RUN bundle exec rake assets:precompile && \
+    rm -rf node_modules tmp
 
-CMD bundle exec rails db:migrate && \
-    bundle exec rails server -b 0.0.0.0
+CMD ./bin/app-startup.sh

Gemfile

@@ -77,3 +77,5 @@ end
 gem "sidekiq", "~> 7.1"
 
 gem "sidekiq-cron", "~> 1.10"
+
+gem "mail-notify", "~> 1.1"

Gemfile.lock

@@ -211,6 +211,13 @@ GEM
       net-imap
       net-pop
       net-smtp
+    mail-notify (1.1.0)
+      actionmailer (>= 5.2.4.6)
+      actionpack (>= 5.2.7.1)
+      actionview (>= 5.2.7.1)
+      activesupport (>= 5.2.4.6)
+      notifications-ruby-client (~> 5.1)
+      rack (>= 2.1.4.1)
     marcel (1.0.2)
     matrix (0.4.2)
     method_source (1.0.0)
@@ -463,6 +470,7 @@ DEPENDENCIES
   invisible_captcha
   jbuilder
   launchy
+  mail-notify (~> 1.1)
   notifications-ruby-client
   okcomputer
   omniauth-azure-activedirectory-v2

app/mailers/govuk_notify_mailer.rb

@@ -0,0 +1,10 @@
+class GovukNotifyMailer < Mail::Notify::Mailer
+  def application_submission
+    @urn = params[:urn]
+    view_mail(
+      Rails.configuration.x.govuk_notify.generic_email_template_id,
+      to: params[:email],
+      subject: t("mailer.application_submission.subject"),
+    )
+  end
+end

app/services/submit_form.rb

@@ -96,17 +96,12 @@ def delete_form
   end
 
   def send_applicant_email
-    return if Rails.env.development?
-
-    # TODO: perform this in a job
-    template_id = ENV.fetch("GOVUK_NOTIFY_APPLICATION_SUBMITTED_TEMPLATE_ID")
-    email_address = application.applicant.email_address
-    application_id = application.urn
-
-    GovukNotify::Client.send_email(
-      template_id,
-      email_address,
-      application_id,
-    )
+    GovukNotifyMailer
+      .with(
+        email: application.applicant.email_address,
+        urn: application.urn,
+      )
+      .application_submission
+      .deliver_later
   end
 end