redmine_remotes 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b9a64e1477b3e084cb4d065af0ec66ac260ad54297e687f6561592cfb4052c7
-  data.tar.gz: ebbbc2b95438d7607df5ce0f3b55dbdf2f96a22217cb50a4c1cd1ced6486904f
+  metadata.gz: 2a0671e339c9e225c9413feb402fed23e0ac5e930a3e72027aa2b183749441d5
+  data.tar.gz: eb1245a9f15262922b95bec5574bdbb3dbc84f286d7fed371970b759657f6e2d
 SHA512:
-  metadata.gz: 480b67c9ea42377485df5690606b138f22f3c4763c21631230be44247e1c2e90f95579dc6ce871a4c9361938430dc7c7fd4bbc1a01db3e518d72b79e8e5ac560
-  data.tar.gz: b5aeb056db0c2386a1020116415708602db7105fa3fdabddc2db97e6e734225383961ede83283a645cfd753eaa1a0109222233ca279ad32781014319f7a3aa8f
+  metadata.gz: 0af87885a31cc69c7ec0cc8f1bbd7201b189b8c5f260382d990189affb7ab642b5eba050231e3e7c0a78f5d65a134c21490148d5461858c61af9ad92c813e578
+  data.tar.gz: 322120abe8ba4dde501c3d6cccc3a3315933d18f585d4c7eb9a86b8c147ec797c0dcb2bff8b08ac29001466eb12e2824cb29a1ef7394b5db1d8f21cbe4c31778

data/app/models/redmine_remotes/tableless/remote_issue_fetch/base/_local_issue.rb

@@ -48,7 +48,8 @@ module RedmineRemotes
 
           ::RemoteUser.find_local_user(
             provider_issue.author_login,
-            remote_tracker
+            remote_tracker,
+            true
           )
         end
 

data/app/models/remote_user.rb

@@ -11,18 +11,7 @@ class RemoteUser < ActiveRecord::Base
   validates :remote_login, presence: true, uniqueness: { scope: [:remote_tracker] }
   validates :local_user, presence: true
 
-  class << self
-    def find_local_user(remote_login, remote_tracker = nil)
-      [remote_tracker, nil].each do |tracker|
-        remote_user = ::RemoteUser.where(
-          remote_tracker: tracker,
-          remote_login: remote_login_sanitize(remote_login)
-        ).first
-        return remote_user.local_user if remote_user
-      end
-      return remote_tracker.default_local_user if remote_tracker.present?
-
-      nil
-    end
+  def self.find_local_user(remote_login, remote_tracker = nil, register_not_found = false)
+    ::RemoteUser::FindLocalUser.new(remote_login, remote_tracker, register_not_found).result
   end
 end

data/app/models/remote_user/find_local_user.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteUser < ActiveRecord::Base
+  class FindLocalUser
+    common_constructor :remote_login, :remote_tracker, :register_not_found do
+      self.remote_login = ::RemoteUser.remote_login_sanitize(remote_login)
+    end
+
+    def result
+      result_by_local_user || result_by_remote_user || result_by_register_not_found ||
+        result_by_remote_tracker_default
+    end
+
+    private
+
+    def result_by_local_user
+      result_by_local_user_login || result_by_local_user_mail_address
+    end
+
+    def result_by_local_user_login
+      ::User.find_by(login: remote_login)
+    end
+
+    def result_by_local_user_mail_address
+      condition = ::EmailAddress.arel_table[:address].matches("#{remote_login}@%")
+      ::EmailAddress.where(condition).first.try(:user)
+    end
+
+    def result_by_register_not_found
+      return nil unless register_not_found
+      return nil if remote_tracker.blank?
+
+      ::RemoteUser.create!(remote_login: remote_login, remote_tracker: remote_tracker,
+                           local_user: remote_tracker.default_local_user).local_user
+    end
+
+    def result_by_remote_user
+      remote_trackers_to_search
+        .map { |tracker| remote_tracker_result(tracker) }
+        .find(&:present?)
+    end
+
+    def result_by_remote_tracker_default
+      remote_tracker.try(:default_local_user)
+    end
+
+    def remote_tracker_result(remote_tracker)
+      ::RemoteUser.where(
+        remote_tracker: remote_tracker,
+        remote_login: remote_login
+      ).first.try(:local_user)
+    end
+
+    def remote_trackers_to_search
+      remote_tracker.if_present([]) { |v| [v] } + [nil]
+    end
+  end
+end

data/lib/redmine_remotes/version.rb

@@ -3,7 +3,7 @@
 module RedmineRemotes
   SLUG = 'redmine_remotes'
   NAME = 'Redmine Remotes'
-  VERSION = '0.9.2'
+  VERSION = '0.10.0'
   AUTHOR = 'Eduardo Henrique Bogoni'
   SUMMARY = 'Integração do Redmine com trackers diversos.'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redmine_remotes
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
@@ -142,6 +142,7 @@ files:
 - app/models/remote_tracker/remote.rb
 - app/models/remote_tracker_setting.rb
 - app/models/remote_user.rb
+- app/models/remote_user/find_local_user.rb
 - app/views/project_remote_issues/_issues.html.erb
 - app/views/project_remote_issues/_trackers.html.erb
 - app/views/project_remote_issues/index.html.erb