Post test teaks (#1186)

.github/workflows/notify-callback.yml

@@ -22,6 +22,7 @@ jobs:
       - name: Mock callback
         run: |
           curl \
+            --no-progress-meter \
             --request POST \
             --header 'BOT: ${{ secrets.BOT_TOKEN }}' \
             --header 'Content-type: application/json' \

app/controllers/hook_controller.rb

@@ -42,7 +42,7 @@ def change
   # @see https://docs.notifications.service.gov.uk/ruby.html#delivery-receipts
   def notify
     user = User.find_by(email: payload['to'])
-    user.update!(notify_callback: payload)
+    user.update!(notify_callback: payload) if user
     render json: { status: 'callback received' }, status: :ok
   end
 

app/jobs/application_job.rb

@@ -39,7 +39,7 @@ def handle_error(error)
   # @param level [Symbol]
   # @return [String]
   def log(message, level = :info)
-    message = "#{ENV['DOMAIN']} - #{self.class.name} #{message}"
+    message = "#{self.class.name} in #{ENV['ENVIRONMENT']}: #{message}"
     Sentry.capture_message(message, level: level) if Rails.env.production?
 
     if ENV['RAILS_LOG_TO_STDOUT'].present?

app/jobs/content_check_job.rb

@@ -3,7 +3,7 @@ class ContentCheckJob < ApplicationJob
   # @return [Boolean]
   def run(*)
     Training::Module.cache.clear
-    log "#{self.class.name}: Running in '#{env}' via '#{api}'"
+    log "Running in '#{env}' via '#{api}'"
     valid?
   end
 
@@ -17,7 +17,7 @@ def valid?
       log Training::Module.cache.size # should be larger than 0
 
       unless check.valid?
-        log "ContentCheckJob: #{mod.name} in '#{env}' via '#{api}' is not valid", :warn
+        log "#{mod.name} in '#{env}' via '#{api}' is not valid", :warn
       end
 
       check.valid?

app/jobs/dashboard_job.rb

@@ -10,7 +10,7 @@ class DashboardJob < ApplicationJob
   # @param upload [Boolean] defaults to true in production or if $DASHBOARD_UPDATE exists
   def run(upload: Rails.application.dashboard?)
     super do
-      log "DashboardJob: Running upload=#{upload}"
+      log "upload=#{upload}"
 
       Dashboard.new(path: build_dir).call(upload: upload, clean: true)
     end

app/jobs/mail_job.rb

@@ -6,7 +6,7 @@ def self.recipients
   end
 
   def run(*)
-    log "#{self.class.name}: #{self.class.recipients.count} recipients"
+    log "#{self.class.recipients.count} recipients"
 
     super
   end

app/jobs/new_module_mail_job.rb

@@ -7,10 +7,10 @@ class NewModuleMailJob < MailJob
   # @param release_id [Integer]
   def run(release_id)
     super do
-      log "Cache key: #{Training::Module.cache_key}"
-      log 'Recalculating key...'
+      log "cache key #{Training::Module.cache_key}"
+      log 'recalculating key...'
       Training::Module.reset_cache_key!
-      log "Cache key: #{Training::Module.cache_key}"
+      log "cache key #{Training::Module.cache_key}"
 
       return :no_new_module unless new_module_published?