Implement changes and add new tests

Author: esrakartalOpt

lib/optimizely/event/entity/event_batch.rb

@@ -30,7 +30,6 @@ def as_json
         anonymize_ip: @anonymize_ip,
         enrich_decisions: @enrich_decisions,
         visitors: @visitors,
-        region: @region
       }
     end
 

lib/optimizely/event/event_factory.rb

@@ -67,7 +67,6 @@ def create_log_event(user_events, logger)
         builder.with_client_name(user_context[:client_name])
         builder.with_anonymize_ip(user_context[:anonymize_ip])
         builder.with_enrich_decisions(true)
-        builder.with_region(user_context[:region])
 
         builder.with_visitors(visitors)
         event_batch = builder.build

spec/event/event_factory_spec.rb

@@ -120,6 +120,22 @@
     expect(log_event.http_verb).to eq(:post)
   end
 
+  it 'should create valid Event when create_impression_event is called without attributes and with EU' do
+    @expected_impression_params[:region] = 'EU'
+    experiment = project_config.get_experiment_from_key('test_experiment')
+    metadata = {
+      flag_key: '',
+      rule_key: 'test_experiment',
+      rule_type: 'experiment',
+      variation_key: '111128'
+    }
+    impression_event = Optimizely::UserEventFactory.create_impression_event(project_config, experiment, '111128', metadata, 'test_user', nil)
+    log_event = Optimizely::EventFactory.create_log_event(impression_event, spy_logger)
+    expect(log_event.params).to eq(@expected_impression_params)
+    expect(log_event.url).to eq(@expected_endpoints[:EU])
+    expect(log_event.http_verb).to eq(:post)
+  end
+
   it 'should create a valid Event when create_impression_event is called with attributes as a string value' do
     @expected_impression_params[:visitors][0][:attributes].unshift(
       entity_id: '111094',
@@ -629,6 +645,33 @@
     expect(log_event.http_verb).to eq(:post)
   end
 
+  it 'should create valid Event when create_conversion_event is called with Bucketing ID attribute and with EU' do
+    @expected_conversion_params[:visitors][0][:attributes].unshift(
+      {
+        entity_id: '111094',
+        key: 'browser_type',
+        type: 'custom',
+        value: 'firefox'
+      },
+      entity_id: Optimizely::Helpers::Constants::CONTROL_ATTRIBUTES['BUCKETING_ID'],
+      key: Optimizely::Helpers::Constants::CONTROL_ATTRIBUTES['BUCKETING_ID'],
+      type: 'custom',
+      value: 'variation'
+    )
+
+    @expected_conversion_params[:region] = 'EU'
+
+    user_attributes = {
+      'browser_type' => 'firefox',
+      '$opt_bucketing_id' => 'variation'
+    }
+    conversion_event = Optimizely::UserEventFactory.create_conversion_event(project_config, event, 'test_user', user_attributes, nil)
+    log_event = Optimizely::EventFactory.create_log_event(conversion_event, spy_logger)
+    expect(log_event.params).to eq(@expected_conversion_params)
+    expect(log_event.url).to eq(@expected_endpoints[:EU])
+    expect(log_event.http_verb).to eq(:post)
+  end
+
   it 'should create valid Event with user agent when bot_filtering is enabled' do
     # Test that create_conversion_event creates Event object
     # with right params when user agent attribute is provided and