diff --git a/app/controllers/frontend_log_controller.rb b/app/controllers/frontend_log_controller.rb index 66434ae7212..1517a09d20e 100644 --- a/app/controllers/frontend_log_controller.rb +++ b/app/controllers/frontend_log_controller.rb @@ -56,13 +56,12 @@ class FrontendLogController < ApplicationController EVENT_MAP = ALLOWED_EVENTS.index_by(&:to_s).merge(LEGACY_EVENT_MAP).freeze def create - result = frontend_logger.track_event(log_params[:event], log_params[:payload].to_h) + success = frontend_logger.track_event(log_params[:event], log_params[:payload].to_h) - if result - render json: { success: true }, status: :ok + if success + render json: { success: }, status: :ok else - render json: { success: false, error_message: 'invalid event' }, - status: :bad_request + render json: { success:, error_message: 'invalid event' }, status: :bad_request end end diff --git a/app/services/frontend_logger.rb b/app/services/frontend_logger.rb index 9ec2d53af4d..3b0ec281906 100644 --- a/app/services/frontend_logger.rb +++ b/app/services/frontend_logger.rb @@ -25,8 +25,6 @@ def track_event(name, attributes) analytics_method.call(**hash_from_kwargs(attributes, analytics_method)) true else - # 2023-10-31 - Temporary - analytics.track_event("Frontend (warning): #{name}", attributes) false end end diff --git a/spec/controllers/frontend_log_controller_spec.rb b/spec/controllers/frontend_log_controller_spec.rb index 6a3ce372296..9ca398cedbb 100644 --- a/spec/controllers/frontend_log_controller_spec.rb +++ b/spec/controllers/frontend_log_controller_spec.rb @@ -31,10 +31,9 @@ end context 'with invalid event name' do - it 'logs with warning' do + it 'responds as unsuccessful' do action - expect(fake_analytics).to have_logged_event('Frontend (warning): Custom Event') expect(response).to have_http_status(:bad_request) expect(json[:success]).to eq(false) expect(json[:error_message]).to eq('invalid event') @@ -239,10 +238,9 @@ end context 'with invalid event name' do - it 'logs with warning' do + it 'responds as unsuccessful' do action - expect(fake_analytics).to have_logged_event('Frontend (warning): Custom Event') expect(response).to have_http_status(:bad_request) expect(json[:success]).to eq(false) expect(json[:error_message]).to eq('invalid event') diff --git a/spec/services/frontend_logger_spec.rb b/spec/services/frontend_logger_spec.rb index 2d146bf1d85..545ea9f4a4f 100644 --- a/spec/services/frontend_logger_spec.rb +++ b/spec/services/frontend_logger_spec.rb @@ -37,16 +37,14 @@ def example_method_handler(ok:, **rest) context 'with unknown event' do let(:name) { :test_event } - it 'logs unknown event with warning' do - call - - expect(analytics).to have_logged_event('Frontend (warning): test_event') - end + it { expect(call).to eq(false) } end context 'with method handler' do let(:name) { 'method' } + it { expect(call).to eq(true) } + it 'calls method with attributes based on signature' do call @@ -57,6 +55,8 @@ def example_method_handler(ok:, **rest) context 'with proc handler' do let(:name) { 'proc' } + it { expect(call).to eq(true) } + it 'calls the method and passes analytics and attributes' do call