be aggressive with saves

Author: drusepth

app/controllers/basil_controller.rb

@@ -551,10 +551,11 @@ def commission
 
   def complete_commission
     commission = BasilCommission.find_by(job_id: params[:jobid])
-    return if commission.nil?
-
-    commission.update(completed_at:   DateTime.current,
-                      final_settings: JSON.parse(params[:settings]))
+    raise "Tried to complete commission with invalid job ID #{params[:jobid]}" if commission.nil?
+    
+    merged_settings = commission.final_settings || {}
+    commission.update!(completed_at:   DateTime.current,
+                       final_settings: merged_settings.merge(JSON.parse(params.fetch(:settings, "{}"))))
 
     # Attach the image in S3 to our `image` ActiveStorage relation
     key    = "job-#{params[:jobid]}.png"

app/models/basil_commission.rb

@@ -18,8 +18,7 @@ def submit_to_job_queue!
 
     # TODO clean this up and put it in a service
     sts_client = Aws::STS::Client.new(region: region)
-    queue_url = 'https://sqs.' + region + '.amazonaws.com/' + 
-      sts_client.get_caller_identity.account + '/' + queue_name
+    queue_url = 'https://sqs.' + region + '.amazonaws.com/' + sts_client.get_caller_identity.account + '/' + queue_name
     sqs_client = Aws::SQS::Client.new(region: region)
 
     message_body = {

app/views/basil/jam.html.erb

@@ -293,6 +293,9 @@
                           <%= commission.prompt %>
                         </blockquote>
                       </li>
+                      <li>
+                        <small><%= commission.job_id %></small>
+                      </li>
                     </ul>
                   </div>
                 </div>