From 98f55fd48a7dbbfc22d16352104e815bd6da802e Mon Sep 17 00:00:00 2001 From: Maciej Szlosarczyk Date: Fri, 17 Aug 2018 11:19:49 +0300 Subject: [PATCH] Simplify a method to remove Rubocop violation --- app/models/concerns/versions.rb | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb index 91926272c..7075303e9 100644 --- a/app/models/concerns/versions.rb +++ b/app/models/concerns/versions.rb @@ -34,20 +34,14 @@ module Versions end def user_from_id_role_username(str) - if str.match(/^(\d+)-(ApiUser:|api-)/) - user = ApiUser.find_by(id: $1) - end - unless user.present? - user = if str.match(/^(\d+)-AdminUser:/) - AdminUser.find_by(id: $1) - end - unless user.present? - # on import we copied Registrar name, which may eql code - registrar = Registrar.find_by(name: str) - # assume each registrar has only one user - user = registrar.api_users.first if registrar - end + registrar = Registrar.find_by(name: str) + user = registrar.api_users.first if registrar + str_match = str.match(/^(\d+)-(ApiUser:|api-|AdminUser:)/) + + if str_match + user ||= User.find_by(id: str_match[1]) end + user end