From fa6edab62ac7a4e9d1b8a7b79c89bbbb7cb24b45 Mon Sep 17 00:00:00 2001
From: Artur Beljajev <artur.beljajev@internet.ee>
Date: Mon, 12 Feb 2018 15:50:12 +0200
Subject: [PATCH] Remove extra attribute

Registrar can be queried from user

#700
---
 app/controllers/epp/sessions_controller.rb                | 8 +++-----
 .../20180212123810_remove_epp_sessions_registrar_id.rb    | 5 +++++
 db/structure.sql                                          | 3 ++-
 lib/tasks/dev.rake                                        | 1 -
 spec/factories/epp_session.rb                             | 1 -
 spec/requests/epp/contact/create/ident_spec.rb            | 2 +-
 spec/requests/epp/contact/create/phone_spec.rb            | 2 +-
 spec/requests/epp/contact/create_spec.rb                  | 2 +-
 spec/requests/epp/contact/delete/used_spec.rb             | 2 +-
 spec/requests/epp/contact/info_spec.rb                    | 2 +-
 spec/requests/epp/contact/update/ident_spec.rb            | 2 +-
 spec/requests/epp/contact/update/phone_spec.rb            | 2 +-
 spec/requests/epp/contact/update_spec.rb                  | 2 +-
 spec/requests/epp/domain/create/account_balance_spec.rb   | 2 +-
 spec/requests/epp/domain/create/default_period_spec.rb    | 2 +-
 .../epp/domain/create/optional_nameserver_spec.rb         | 2 +-
 spec/requests/epp/domain/create/period_spec.rb            | 2 +-
 spec/requests/epp/domain/create/price_spec.rb             | 2 +-
 .../epp/domain/create/required_nameserver_spec.rb         | 2 +-
 spec/requests/epp/domain/delete/discarded_spec.rb         | 2 +-
 spec/requests/epp/domain/renew/account_balance_spec.rb    | 2 +-
 spec/requests/epp/domain/renew/default_period_spec.rb     | 2 +-
 spec/requests/epp/domain/renew/expire_time_spec.rb        | 2 +-
 spec/requests/epp/domain/renew/max_expire_time_spec.rb    | 2 +-
 spec/requests/epp/domain/renew/period_spec.rb             | 2 +-
 spec/requests/epp/domain/renew/price_spec.rb              | 2 +-
 spec/requests/epp/domain/transfer/discarded_spec.rb       | 2 +-
 spec/requests/epp/domain/update/discarded_spec.rb         | 2 +-
 spec/requests/epp/domain/update/nameserver_add_spec.rb    | 2 +-
 spec/requests/epp/domain/update/nameserver_remove_spec.rb | 2 +-
 .../update/registrant_change/same_as_current_spec.rb      | 2 +-
 .../epp/domain/update/registrant_change/verified_spec.rb  | 2 +-
 spec/requests/epp/domain/update/status_spec.rb            | 2 +-
 test/fixtures/epp_sessions.yml                            | 2 --
 34 files changed, 38 insertions(+), 38 deletions(-)
 create mode 100644 db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb

diff --git a/app/controllers/epp/sessions_controller.rb b/app/controllers/epp/sessions_controller.rb
index 1ffd9c02e..e4efc581d 100644
--- a/app/controllers/epp/sessions_controller.rb
+++ b/app/controllers/epp/sessions_controller.rb
@@ -94,7 +94,6 @@ class Epp::SessionsController < EppController
       epp_session = EppSession.new
       epp_session.session_id = cookies[:session]
       epp_session.user = @api_user
-      epp_session.registrar = @api_user.registrar
       epp_session.save!
       render_epp_response('login_success')
     else
@@ -117,11 +116,10 @@ class Epp::SessionsController < EppController
   end
 
   def connection_limit_ok?
-    c = EppSession.where(
-      'registrar_id = ? AND updated_at >= ?', @api_user.registrar_id, Time.zone.now - 1.second
-    ).count
+    epp_session_count = EppSession.where(user_id: @api_user.registrar.api_users.ids)
+                      .where('updated_at >= ?', Time.zone.now - 1.second).count
 
-    return false if c >= 4
+    return false if epp_session_count >= 4
     true
   end
 
diff --git a/db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb b/db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb
new file mode 100644
index 000000000..80e2a7056
--- /dev/null
+++ b/db/migrate/20180212123810_remove_epp_sessions_registrar_id.rb
@@ -0,0 +1,5 @@
+class RemoveEppSessionsRegistrarId < ActiveRecord::Migration
+  def change
+    remove_column :epp_sessions, :registrar_id, :integer
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index a6f29a47e..f7fdc5148 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -1053,7 +1053,6 @@ CREATE TABLE epp_sessions (
     session_id character varying NOT NULL,
     created_at timestamp without time zone,
     updated_at timestamp without time zone,
-    registrar_id integer,
     user_id integer
 );
 
@@ -5086,3 +5085,5 @@ INSERT INTO schema_migrations (version) VALUES ('20180207071528');
 
 INSERT INTO schema_migrations (version) VALUES ('20180207072139');
 
+INSERT INTO schema_migrations (version) VALUES ('20180212123810');
+
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index d0c855903..f4b133ed1 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -51,7 +51,6 @@ namespace :dev do
 
       epp_session = EppSession.new
       epp_session.session_id = 'test'
-      epp_session.registrar = registrar
       epp_session.user = api_user
       epp_session.save!
 
diff --git a/spec/factories/epp_session.rb b/spec/factories/epp_session.rb
index 20e3afc45..296368a92 100644
--- a/spec/factories/epp_session.rb
+++ b/spec/factories/epp_session.rb
@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :epp_session do
     sequence(:session_id) { |n| "test#{n}" }
-    registrar
     association :user, factory: :api_user
   end
 end
diff --git a/spec/requests/epp/contact/create/ident_spec.rb b/spec/requests/epp/contact/create/ident_spec.rb
index cdf457002..5a9535187 100644
--- a/spec/requests/epp/contact/create/ident_spec.rb
+++ b/spec/requests/epp/contact/create/ident_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP contact:create' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
 
   before do
diff --git a/spec/requests/epp/contact/create/phone_spec.rb b/spec/requests/epp/contact/create/phone_spec.rb
index 3c7796659..1b55f6407 100644
--- a/spec/requests/epp/contact/create/phone_spec.rb
+++ b/spec/requests/epp/contact/create/phone_spec.rb
@@ -4,7 +4,7 @@ require_relative '../shared/phone'
 RSpec.describe 'EPP contact:create' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let(:request_xml) { <<-XML
     <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/spec/requests/epp/contact/create_spec.rb b/spec/requests/epp/contact/create_spec.rb
index 8b4b14794..3d72e3eda 100644
--- a/spec/requests/epp/contact/create_spec.rb
+++ b/spec/requests/epp/contact/create_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP contact:create' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request_xml_with_address) { '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
       <command>
diff --git a/spec/requests/epp/contact/delete/used_spec.rb b/spec/requests/epp/contact/delete/used_spec.rb
index e37d30173..663065ca5 100644
--- a/spec/requests/epp/contact/delete/used_spec.rb
+++ b/spec/requests/epp/contact/delete/used_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP contact:delete' do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:user) { create(:api_user, registrar: registrar) }
   let(:registrar) { create(:registrar) }
   let!(:registrant) { create(:registrant, registrar: registrar, code: 'TEST') }
diff --git a/spec/requests/epp/contact/info_spec.rb b/spec/requests/epp/contact/info_spec.rb
index a16a235a8..0468e097a 100644
--- a/spec/requests/epp/contact/info_spec.rb
+++ b/spec/requests/epp/contact/info_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP contact:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request_xml) { '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
       <command>
diff --git a/spec/requests/epp/contact/update/ident_spec.rb b/spec/requests/epp/contact/update/ident_spec.rb
index ec25d1c8c..ed42d129f 100644
--- a/spec/requests/epp/contact/update/ident_spec.rb
+++ b/spec/requests/epp/contact/update/ident_spec.rb
@@ -5,7 +5,7 @@ require 'rails_helper'
 RSpec.describe 'EPP contact:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:ident) { contact.identifier }
   let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let(:request_xml) { <<-XML
diff --git a/spec/requests/epp/contact/update/phone_spec.rb b/spec/requests/epp/contact/update/phone_spec.rb
index 696725ab4..57109367d 100644
--- a/spec/requests/epp/contact/update/phone_spec.rb
+++ b/spec/requests/epp/contact/update/phone_spec.rb
@@ -4,7 +4,7 @@ require_relative '../shared/phone'
 RSpec.describe 'EPP contact:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let!(:contact) { create(:contact, code: 'TEST') }
   let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let(:request_xml) { <<-XML
diff --git a/spec/requests/epp/contact/update_spec.rb b/spec/requests/epp/contact/update_spec.rb
index 3d40e8699..c5344bae2 100644
--- a/spec/requests/epp/contact/update_spec.rb
+++ b/spec/requests/epp/contact/update_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP contact:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request_xml_with_address) { '<?xml version="1.0" encoding="UTF-8" standalone="no"?>
     <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
       <command>
diff --git a/spec/requests/epp/domain/create/account_balance_spec.rb b/spec/requests/epp/domain/create/account_balance_spec.rb
index 43edae1aa..e27477b3a 100644
--- a/spec/requests/epp/domain/create/account_balance_spec.rb
+++ b/spec/requests/epp/domain/create/account_balance_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:create', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:contact) { create(:contact, code: 'test') }
diff --git a/spec/requests/epp/domain/create/default_period_spec.rb b/spec/requests/epp/domain/create/default_period_spec.rb
index fd807bef0..c4708f5cb 100644
--- a/spec/requests/epp/domain/create/default_period_spec.rb
+++ b/spec/requests/epp/domain/create/default_period_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:create', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:contact) { create(:contact, code: 'test') }
diff --git a/spec/requests/epp/domain/create/optional_nameserver_spec.rb b/spec/requests/epp/domain/create/optional_nameserver_spec.rb
index 83ab1df44..409307373 100644
--- a/spec/requests/epp/domain/create/optional_nameserver_spec.rb
+++ b/spec/requests/epp/domain/create/optional_nameserver_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:create', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:registrar) { create(:registrar_with_unlimited_balance) }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
diff --git a/spec/requests/epp/domain/create/period_spec.rb b/spec/requests/epp/domain/create/period_spec.rb
index f9550002e..15f49d41f 100644
--- a/spec/requests/epp/domain/create/period_spec.rb
+++ b/spec/requests/epp/domain/create/period_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:create', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:contact) { create(:contact, code: 'test') }
diff --git a/spec/requests/epp/domain/create/price_spec.rb b/spec/requests/epp/domain/create/price_spec.rb
index 2b2aa789e..e065ba3bb 100644
--- a/spec/requests/epp/domain/create/price_spec.rb
+++ b/spec/requests/epp/domain/create/price_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:create', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:contact) { create(:contact, code: 'test') }
diff --git a/spec/requests/epp/domain/create/required_nameserver_spec.rb b/spec/requests/epp/domain/create/required_nameserver_spec.rb
index 3c72c58a5..7657075b7 100644
--- a/spec/requests/epp/domain/create/required_nameserver_spec.rb
+++ b/spec/requests/epp/domain/create/required_nameserver_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:create', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/create', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:registrar) { create(:registrar_with_unlimited_balance) }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
diff --git a/spec/requests/epp/domain/delete/discarded_spec.rb b/spec/requests/epp/domain/delete/discarded_spec.rb
index 1cce794bc..55e74d965 100644
--- a/spec/requests/epp/domain/delete/discarded_spec.rb
+++ b/spec/requests/epp/domain/delete/discarded_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:delete' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request_xml) { <<-XML
     <?xml version="1.0" encoding="UTF-8" standalone="no"?>
     <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
diff --git a/spec/requests/epp/domain/renew/account_balance_spec.rb b/spec/requests/epp/domain/renew/account_balance_spec.rb
index 128c60070..98d088075 100644
--- a/spec/requests/epp/domain/renew/account_balance_spec.rb
+++ b/spec/requests/epp/domain/renew/account_balance_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:renew' do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:zone) { create(:zone, origin: 'test') }
diff --git a/spec/requests/epp/domain/renew/default_period_spec.rb b/spec/requests/epp/domain/renew/default_period_spec.rb
index 2f09acbcc..fb4961e9d 100644
--- a/spec/requests/epp/domain/renew/default_period_spec.rb
+++ b/spec/requests/epp/domain/renew/default_period_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:renew', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:zone) { create(:zone, origin: 'test') }
diff --git a/spec/requests/epp/domain/renew/expire_time_spec.rb b/spec/requests/epp/domain/renew/expire_time_spec.rb
index 90cad850e..d2b6dce5f 100644
--- a/spec/requests/epp/domain/renew/expire_time_spec.rb
+++ b/spec/requests/epp/domain/renew/expire_time_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:renew' do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:registrar) { create(:registrar_with_unlimited_balance) }
diff --git a/spec/requests/epp/domain/renew/max_expire_time_spec.rb b/spec/requests/epp/domain/renew/max_expire_time_spec.rb
index 211af8685..5983fb02c 100644
--- a/spec/requests/epp/domain/renew/max_expire_time_spec.rb
+++ b/spec/requests/epp/domain/renew/max_expire_time_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:renew' do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:user) { create(:api_user_epp, registrar: registrar) }
   let(:registrar) { create(:registrar_with_unlimited_balance) }
   let!(:zone) { create(:zone, origin: 'test') }
diff --git a/spec/requests/epp/domain/renew/period_spec.rb b/spec/requests/epp/domain/renew/period_spec.rb
index 6c5167d26..3704519ca 100644
--- a/spec/requests/epp/domain/renew/period_spec.rb
+++ b/spec/requests/epp/domain/renew/period_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:renew', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:zone) { create(:zone, origin: 'test') }
diff --git a/spec/requests/epp/domain/renew/price_spec.rb b/spec/requests/epp/domain/renew/price_spec.rb
index 4a9c65ff3..02603ca60 100644
--- a/spec/requests/epp/domain/renew/price_spec.rb
+++ b/spec/requests/epp/domain/renew/price_spec.rb
@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe 'EPP domain:renew', settings: false do
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/renew', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:user) { create(:api_user_epp, registrar: registrar) }
   let!(:zone) { create(:zone, origin: 'test') }
diff --git a/spec/requests/epp/domain/transfer/discarded_spec.rb b/spec/requests/epp/domain/transfer/discarded_spec.rb
index d279bf003..26596d993 100644
--- a/spec/requests/epp/domain/transfer/discarded_spec.rb
+++ b/spec/requests/epp/domain/transfer/discarded_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:transfer' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request_xml) { <<-XML
     <?xml version="1.0" encoding="UTF-8" standalone="no"?>
     <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
diff --git a/spec/requests/epp/domain/update/discarded_spec.rb b/spec/requests/epp/domain/update/discarded_spec.rb
index 29ae1f44c..4a31b7d10 100644
--- a/spec/requests/epp/domain/update/discarded_spec.rb
+++ b/spec/requests/epp/domain/update/discarded_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request_xml) { <<-XML
     <?xml version="1.0" encoding="UTF-8" standalone="no"?>
     <epp xmlns="https://epp.tld.ee/schema/epp-ee-1.0.xsd">
diff --git a/spec/requests/epp/domain/update/nameserver_add_spec.rb b/spec/requests/epp/domain/update/nameserver_add_spec.rb
index 8a00d585d..2acc462f6 100644
--- a/spec/requests/epp/domain/update/nameserver_add_spec.rb
+++ b/spec/requests/epp/domain/update/nameserver_add_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let!(:domain) { create(:domain, name: 'test.com') }
   subject(:response_xml) { Nokogiri::XML(response.body) }
   subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] }
diff --git a/spec/requests/epp/domain/update/nameserver_remove_spec.rb b/spec/requests/epp/domain/update/nameserver_remove_spec.rb
index 3796d2e12..129d1ce55 100644
--- a/spec/requests/epp/domain/update/nameserver_remove_spec.rb
+++ b/spec/requests/epp/domain/update/nameserver_remove_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   subject(:response_xml) { Nokogiri::XML(response.body) }
   subject(:response_code) { response_xml.xpath('//xmlns:result').first['code'] }
   subject(:response_description) { response_xml.css('result msg').text }
diff --git a/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb b/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb
index 1c0c8eb5b..0a5f3b245 100644
--- a/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb
+++ b/spec/requests/epp/domain/update/registrant_change/same_as_current_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) }
 
diff --git a/spec/requests/epp/domain/update/registrant_change/verified_spec.rb b/spec/requests/epp/domain/update/registrant_change/verified_spec.rb
index e94923644..c81d46f66 100644
--- a/spec/requests/epp/domain/update/registrant_change/verified_spec.rb
+++ b/spec/requests/epp/domain/update/registrant_change/verified_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let!(:registrant) { create(:registrant, code: 'old-code') }
   let!(:domain) { create(:domain, name: 'test.com', registrant: registrant) }
diff --git a/spec/requests/epp/domain/update/status_spec.rb b/spec/requests/epp/domain/update/status_spec.rb
index df5506fb6..f5cb638ad 100644
--- a/spec/requests/epp/domain/update/status_spec.rb
+++ b/spec/requests/epp/domain/update/status_spec.rb
@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe 'EPP domain:update' do
   let(:registrar) { create(:registrar) }
   let(:user) { create(:api_user_epp, registrar: registrar) }
-  let(:session_id) { create(:epp_session, user: user, registrar: registrar).session_id }
+  let(:session_id) { create(:epp_session, user: user).session_id }
   let(:request) { post '/epp/command/update', { frame: request_xml }, 'HTTP_COOKIE' => "session=#{session_id}" }
   let(:request_xml) { <<-XML
     <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/test/fixtures/epp_sessions.yml b/test/fixtures/epp_sessions.yml
index 9d824cf1c..cc40c8211 100644
--- a/test/fixtures/epp_sessions.yml
+++ b/test/fixtures/epp_sessions.yml
@@ -1,9 +1,7 @@
 api_bestnames:
   session_id: 1
   user: api_bestnames
-  registrar: bestnames
 
 api_goodnames:
   session_id: 2
   user: api_goodnames
-  registrar: goodnames