fix stale timestamps for checkouts

Author: ezekg

app/controllers/api/v1/licenses/actions/checkouts_controller.rb

@@ -120,7 +120,7 @@ def checkout_license_file(**kwargs)
         to: :show?
 
       license_file.validate!
-      license.touch_async(:last_check_out_at,
+      license.touch_async!(:last_check_out_at,
         time: Time.current,
       )
 

app/controllers/api/v1/machines/actions/checkouts_controller.rb

@@ -123,7 +123,7 @@ def checkout_machine_file(**kwargs)
         to: :show?
 
       machine_file.validate!
-      machine.touch_async(:last_check_out_at,
+      machine.touch_async!(:last_check_out_at,
         time: Time.current,
       )
 

features/api/v1/licenses/actions/checkouts.feature

@@ -104,8 +104,7 @@ Feature: License checkout actions
     Given time is frozen at "2022-10-16T14:52:48.000Z"
     And the current account is "test1"
     And the current account has 1 "webhook-endpoint"
-    And the current account has 1 "license"
-    And the last "license" has the following attributes:
+    And the current account has 1 "license" with the following attributes:
       """
       { "id": "dc664944-c4e3-49a5-a3f8-a8804ffd804d" }
       """

features/api/v1/machines/actions/checkouts.feature

@@ -104,8 +104,7 @@ Feature: Machine checkout actions
     Given time is frozen at "2022-10-16T14:52:48.000Z"
     And the current account is "test1"
     And the current account has 1 "webhook-endpoint"
-    And the current account has 1 "machine"
-    And the last "machine" has the following attributes:
+    And the current account has 1 "machine" with the following attributes:
       """
       { "id": "dc664944-c4e3-49a5-a3f8-a8804ffd804d" }
       """

features/step_definitions/request_steps.rb

@@ -67,8 +67,7 @@
     head path
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a GET request to "([^\"]*)"$/ do |path|
@@ -88,8 +87,7 @@
     get path
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a POST request to "([^\"]*)"$/ do |path|
@@ -109,8 +107,7 @@
     post path
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a PUT request to "([^\"]*)"$/ do |path|
@@ -130,8 +127,7 @@
     put path
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a PATCH request to "([^\"]*)"$/ do |path|
@@ -151,8 +147,7 @@
     patch path
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a POST request to "([^\"]*)" with the following:$/ do |path, body|
@@ -173,8 +168,7 @@
     post path, body
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a POST request to "([^\"]*)" with the following badly encoded data:$/ do |path, body|
@@ -195,8 +189,7 @@
     post path, body.encode!('CP1252')
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a PATCH request to "([^\"]*)" with the following:$/ do |path, body|
@@ -217,8 +210,7 @@
     patch path, body
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a PUT request to "([^\"]*)" with the following:$/ do |path, body|
@@ -239,8 +231,7 @@
     put path, body
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
+  drain_async_jobs
 end
 
 When /^I send a DELETE request to "([^\"]*)" with the following:$/ do |path, body|
@@ -261,9 +252,7 @@
     delete path, body
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
-  drain_async_destroy_jobs
+  drain_async_jobs
 end
 
 When /^I send a DELETE request to "([^\"]*)"$/ do |path|
@@ -283,9 +272,7 @@
     delete path
   end
 
-  drain_async_create_jobs
-  drain_async_update_jobs
-  drain_async_destroy_jobs
+  drain_async_jobs
 rescue Timeout::Error
 end
 

features/step_definitions/worker_steps.rb

@@ -2,41 +2,15 @@
 
 World Rack::Test::Methods
 
-def drain_async_destroy_jobs
+def drain_async_jobs
   require 'sidekiq/testing'
 
-  # FIXME(ezekg) We only want to process the destroy async jobs so we
-  #              can't just drain the entire job wrapper class.
+  # FIXME(ezekg) there doesn't seem to be an easier way to drain a subset of wrapped jobs
   active_job = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper
   active_job.jobs.each do |job|
     case job['wrapped']
-    when ActiveRecord::DestroyAssociationAsyncJob.name
-      active_job.process_job(job)
-    end
-  end
-
-  YankArtifactWorker.drain
-end
-
-def drain_async_create_jobs
-  require 'sidekiq/testing'
-
-  active_job = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper
-  active_job.jobs.each do |job|
-    case job['wrapped']
-    when AsyncCreatable::CreateAsyncJob.name
-      active_job.process_job(job)
-    end
-  end
-end
-
-def drain_async_update_jobs
-  require 'sidekiq/testing'
-
-  active_job = ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper
-  active_job.jobs.each do |job|
-    case job['wrapped']
-    when AsyncUpdatable::UpdateAsyncJob.name
+    when AsyncCreatable::CreateAsyncJob.name, AsyncUpdatable::UpdateAsyncJob.name,
+         AsyncTouchable::TouchAsyncJob.name, AsyncDestroyable::DestroyAsyncJob.name
       active_job.process_job(job)
     end
   end