redmine_remotes 0.8.1 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b65843d810df106f89cfab8c6da6beef03d5421263f21a7b7730e9dab08ce13
-  data.tar.gz: ec23913f8340a42f5c69f28e0f24f72baacf3b59b38adb9d8f32dadeca9fc06c
+  metadata.gz: 2a0671e339c9e225c9413feb402fed23e0ac5e930a3e72027aa2b183749441d5
+  data.tar.gz: eb1245a9f15262922b95bec5574bdbb3dbc84f286d7fed371970b759657f6e2d
 SHA512:
-  metadata.gz: 886781f236327ed6e0d30d26f3950e80a07629c3c2905c8bf98a50cb8c9ed10daa9be495c804059d2ac195816894c77ee2af43e87d3c253ccb20a568bcd0bb5d
-  data.tar.gz: 41578f7e2bfa7a6c97bdad8cc9bff55c1a8e26f8099d5ba824c0b0e420ed746ee46f8058b6d9cfb8069de6fc6dda8c4b16b5ed566bce325abada1043e1b268dd
+  metadata.gz: 0af87885a31cc69c7ec0cc8f1bbd7201b189b8c5f260382d990189affb7ab642b5eba050231e3e7c0a78f5d65a134c21490148d5461858c61af9ad92c813e578
+  data.tar.gz: 322120abe8ba4dde501c3d6cccc3a3315933d18f585d4c7eb9a86b8c147ec797c0dcb2bff8b08ac29001466eb12e2824cb29a1ef7394b5db1d8f21cbe4c31778

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

@@ -6,11 +6,36 @@ module RedmineRemotes
       class Base < ::EacRailsUtils::TablelessModel
         private
 
+        def save_local_issue
+          save_local_issue_except_create_on && save_local_issue_created_on
+        end
+
+        def save_local_issue_created_on
+          local_issue_provider_attributes[:created_on].if_present do |created_on|
+            if created_on.present? && local_issue.created_on != created_on
+              local_issue.update_column( # rubocop:disable Rails/SkipsModelValidations
+                :created_on, created_on
+              )
+            end
+          end
+
+          true
+        end
+
+        def save_local_issue_except_create_on
+          local_issue_provider_attributes.except(:created_on)
+                                         .each { |attr, value| local_issue.send("#{attr}=", value) }
+          return true if local_issue.save
+
+          fetch_record_errors(local_issue, default_column: default_error_column)
+          false
+        end
+
         def local_issue_provider_attributes
           {
             subject: local_issue_subject, author: local_issue_author, status: local_issue_status,
             description: local_issue_description,
-            created_on: provider_issue.created_on, updated_on: provider_issue.updated_on
+            created_on: provider_issue.created_on
           }
         end
 
@@ -23,7 +48,8 @@ module RedmineRemotes
 
           ::RemoteUser.find_local_user(
             provider_issue.author_login,
-            remote_tracker
+            remote_tracker,
+            true
           )
         end
 

data/app/models/redmine_remotes/tableless/remote_issue_fetch/create.rb

@@ -22,7 +22,7 @@ module RedmineRemotes
         def create
           ::Issue.transaction do
             return false unless valid?
-            return false unless create_local_issue
+            return false unless save_local_issue
             return false unless create_remote_issue
           end
           true

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

@@ -6,20 +6,14 @@ module RedmineRemotes
       class Create < ::RedmineRemotes::Tableless::RemoteIssueFetch::Base
         private
 
-        def create_local_issue
-          return true if local_issue.save
-
-          fetch_record_errors(local_issue, default_column: default_error_column)
-          false
+        def local_issue_provider_attributes
+          super.merge(
+            project: project, tracker: local_tracker, priority: local_issue_priority
+          )
         end
 
         def local_issue_uncached
-          remote_issue_by_remote_code.if_present { |v| return v.local_issue }
-          ::Issue.new(
-            local_issue_provider_attributes.merge(
-              project: project, tracker: local_tracker, priority: local_issue_priority
-            )
-          )
+          remote_issue_by_remote_code.if_present(&:local_issue) || ::Issue.new
         end
 
         def local_issue_priority

data/app/models/redmine_remotes/tableless/remote_issue_fetch/update.rb

@@ -20,7 +20,7 @@ module RedmineRemotes
 
         def save
           return false unless valid?
-          return false unless update_local_issue_with_remote_data
+          return false unless save_local_issue
 
           true
         end

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

@@ -13,13 +13,6 @@ module RedmineRemotes
         def local_tracker
           local_issue.if_present(&:tracker)
         end
-
-        def update_local_issue_with_remote_data
-          return true if local_issue.update(local_issue_provider_attributes)
-
-          fetch_record_errors(local_issue, default_column: default_error_column)
-          false
-        end
       end
     end
   end

data/app/models/remote_tracker.rb

@@ -6,14 +6,14 @@ require 'validate_url'
 
 class RemoteTracker < ActiveRecord::Base
   include ::EacRubyUtils::Listable
-  include ::RemoteTracker::Jira
+  include ::RemoteTracker::Remote
 
   has_many :issues, class_name: 'RemoteIssue', inverse_of: :remote_tracker,
                     dependent: :restrict_with_error
   has_many :settings, class_name: 'RemoteTrackerSetting', inverse_of: :remote_tracker,
                       dependent: :destroy
 
-  lists.add_string :profile, :jira
+  lists.add_string :profile, :esosti, :jira
 
   has_many :issue_statuses, class_name: 'RemoteIssueStatus', inverse_of: :remote_tracker,
                             dependent: :destroy
@@ -31,12 +31,6 @@ class RemoteTracker < ActiveRecord::Base
     "#{root_url} [#{profile_label}, #{username}]"
   end
 
-  def find_remote_issue(issue_id)
-    raise 'Profile blank' if profile.blank?
-
-    send("#{profile}_find_remote_issue", issue_id)
-  end
-
   def setting_value(name)
     ::RemoteTrackerSetting.where(remote_tracker: self, name: name).first.if_present(&:value)
   end

data/app/models/remote_tracker/remote.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class RemoteTracker < ActiveRecord::Base
+  module Remote
+    def find_remote_issue(issue_id)
+      remote_instance.find_issue(issue_id)
+    end
+
+    def remote_instance
+      remote_instance_class.new(self, root_url, username, password)
+    end
+
+    def remote_instance_class
+      raise 'Profile blank' if profile.blank?
+
+      ::RedmineRemotes.const_get(profile.capitalize).const_get('Instance')
+    end
+  end
+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/config/locales/en.yml

@@ -3,6 +3,8 @@ en:
     listable:
       remote_tracker:
         profile:
+          esosti:
+            label: e-Sosti (Control Desk)
           jira:
             label: Jira
   remote_tracker_setting:

data/config/locales/pt-BR.yml

@@ -3,6 +3,8 @@ pt-BR:
     listable:
       remote_tracker:
         profile:
+          esosti:
+            label: e-Sosti (Control Desk)
           jira:
             label: Jira
       remote_tracker_setting:

data/lib/redmine_remotes/esosti.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module Esosti
+    class << self
+      RICH_TEXT_COMMENT = /<!--\s*RICH\s+TEXT\s-->/i.freeze
+
+      def remote_text_to_local(remote_text)
+        ::Redmine::WikiFormatting.html_parser.to_text(
+          remote_text.gsub(RICH_TEXT_COMMENT, '').each_line.map(&:strip).join(" \n")
+        ).each_line.map(&:strip).join("\n").gsub(/\n+/, "\n")
+      end
+    end
+  end
+end

data/lib/redmine_remotes/esosti/entities/issue.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'avmtrf1/esosti/entities/issue'
+
+module RedmineRemotes
+  module Esosti
+    module Entities
+      class Issue < ::Avmtrf1::Esosti::Entities::Issue
+        def author_login
+          attributes.fetch('CREATEDBY').if_present { |v| v.gsub(/@[^@]+\z/, '') }
+        end
+
+        def attributes
+          data.first.fetch('Attributes')
+        end
+
+        def code
+          attributes.fetch('TICKETID')
+        end
+
+        def created_on
+          attributes.fetch('CREATIONDATE')
+        end
+
+        def description
+          ::RedmineRemotes::Esosti.remote_text_to_local(
+            related_mbos.fetch('LONGDESCRIPTION').first.fetch('Attributes').fetch('LDTEXT')
+          )
+        end
+
+        def related_mbos
+          data.first.fetch('RelatedMbos')
+        end
+
+        def status_name
+          attributes.fetch('STATUS')
+        end
+
+        def subject
+          attributes.fetch('DESCRIPTION')
+        end
+      end
+    end
+  end
+end

data/lib/redmine_remotes/esosti/instance.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module Esosti
+    class Instance < ::RedmineRemotes::RestProvider::Instance
+      ISSUE_ID_PATTERN = /\A(?:ss|in)[0-9]+\z/i.freeze
+
+      class << self
+        def parse_issue_id(global_issue_id)
+          m = ISSUE_ID_PATTERN.match(global_issue_id)
+          return nil unless m
+
+          ::OpenStruct.new(provider_issue_id: m[0], project_id: nil, project_issue_id: nil)
+        end
+      end
+
+      def build_service_url(service_url_suffix)
+        "#{root_url}/maxrest/rest#{service_url_suffix}"
+      end
+
+      def issue_get_url_suffix(provider_issue_id)
+        "/os/MS_RMTICKET/?ticketid=#{provider_issue_id}"
+      end
+    end
+  end
+end

data/lib/redmine_remotes/jira/entities/issue.rb

@@ -30,10 +30,6 @@ module RedmineRemotes
           fields.fetch('status').fetch('name')
         end
 
-        def updated_on
-          fields.fetch('updated')
-        end
-
         def author_login
           fields.try(:fetch, 'reporter').try(:fetch, 'key')
         end

data/lib/redmine_remotes/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_remotes
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.10.0
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-07 00:00:00.000000000 Z
+date: 2020-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: '0.28'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.27'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.27.1
+        version: '0.28'
 - !ruby/object:Gem::Dependency
   name: curb
   requirement: !ruby/object:Gem::Requirement
@@ -145,9 +139,10 @@ files:
 - app/models/remote_issue.rb
 - app/models/remote_issue_status.rb
 - app/models/remote_tracker.rb
-- app/models/remote_tracker/jira.rb
+- 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
@@ -170,6 +165,9 @@ files:
 - db/migrate/20200505161002_add_timestamps_to_remote_users.rb
 - init.rb
 - lib/redmine_remotes.rb
+- lib/redmine_remotes/esosti.rb
+- lib/redmine_remotes/esosti/entities/issue.rb
+- lib/redmine_remotes/esosti/instance.rb
 - lib/redmine_remotes/jira/entities/issue.rb
 - lib/redmine_remotes/jira/instance.rb
 - lib/redmine_remotes/patches/issue.rb

data/app/models/remote_tracker/jira.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-class RemoteTracker < ActiveRecord::Base
-  module Jira
-    def jira_find_remote_issue(issue_id)
-      jira_create_instance.find_issue(issue_id)
-    end
-
-    def jira_create_instance
-      ::RedmineRemotes::Jira::Instance.new(self, root_url, username, password)
-    end
-  end
-end