feat(dossiers): lock submit en construction to avoid merge collisions with double submits

This commit is contained in:
Colin Darie 2024-01-24 10:04:31 +01:00
parent 4d1988fd66
commit 56f8b61866
No known key found for this signature in database
GPG key ID: 8C76CADD40253590
4 changed files with 68 additions and 1 deletions

View file

@ -77,7 +77,7 @@ jobs:
- name: Install build dependancies - name: Install build dependancies
# - fonts pickable by ImageMagick # - fonts pickable by ImageMagick
# - rust for YJIT support # - rust for YJIT support
run: sudo apt-get install -y gsfonts rustc run: sudo apt-get install -y gsfonts rustc redis-server
- name: Setup the app runtime and dependencies - name: Setup the app runtime and dependencies
uses: ./.github/actions/ci-setup-rails uses: ./.github/actions/ci-setup-rails

View file

@ -0,0 +1,16 @@
module LockableConcern
extend ActiveSupport::Concern
included do
def lock_action(key)
lock = Kredis.flag(key, config: :volatile)
head :locked and return if lock.marked?
lock.mark(expires_in: 10.seconds)
yield
lock.remove
end
end
end

View file

@ -2,6 +2,7 @@ module Users
class DossiersController < UserController class DossiersController < UserController
include DossierHelper include DossierHelper
include TurboChampsConcern include TurboChampsConcern
include LockableConcern
layout 'procedure_context', only: [:identite, :update_identite, :siret, :update_siret] layout 'procedure_context', only: [:identite, :update_identite, :siret, :update_siret]
@ -19,6 +20,10 @@ module Users
before_action :show_demarche_en_test_banner before_action :show_demarche_en_test_banner
before_action :store_user_location!, only: :new before_action :store_user_location!, only: :new
around_action only: :submit_en_construction do |_controller, action|
lock_action("lock-submit-en-construction-#{@dossier.id}", &action)
end
def index def index
ordered_dossiers = Dossier.includes(:procedure).order_by_updated_at ordered_dossiers = Dossier.includes(:procedure).order_by_updated_at
deleted_dossiers = current_user.deleted_dossiers.includes(:procedure).order_by_updated_at deleted_dossiers = current_user.deleted_dossiers.includes(:procedure).order_by_updated_at

View file

@ -0,0 +1,46 @@
describe LockableConcern, type: :controller do
controller(ApplicationController) do
include LockableConcern
def test_action
lock_action(params.fetch(:lock_key)) do
render plain: 'Action completed'
end
end
end
before do
routes.draw { get 'test_action/:lock_key' => 'anonymous#test_action' }
end
describe '#lock_action' do
# randomize key to avoid collision on concurrent tests
let(:lock_key) { "test_lock_#{SecureRandom.uuid}" }
subject { get :test_action, params: { lock_key: } }
context 'when there is no concurrent request' do
it 'completes the action' do
expect(subject).to have_http_status(:ok)
end
end
context 'when there are concurrent requests' do
it 'aborts the second request' do
# Simulating the first request acquiring the lock
Kredis.flag(lock_key, config: :volatile).mark(expires_in: 3.seconds)
# Making the second request
expect(subject).to have_http_status(:locked)
end
end
context 'when the lock expires' do
it 'allows another request after expiration' do
Kredis.flag(lock_key, config: :volatile).mark(expires_in: 0.001.seconds)
sleep 0.002
expect(subject).to have_http_status(:ok)
end
end
end
end