redmine_remotes 0.12.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70c4977d8154fa08f7d03093a35dc948c5bd78639a2a2ce42352e58c5d737050
-  data.tar.gz: 8c56794c3633be3b5e731800025a61a73a8df6e17c50776a87790659e0b3235d
+  metadata.gz: f3c2514b43de6a3aca2a542e1231a07f52061cd5ca7a98640a00448937d1e9fe
+  data.tar.gz: 63be070a70db543d4c400b88105f88efff9f05ed138b77ea42f83e61c900823e
 SHA512:
-  metadata.gz: 546876674ce5856dacf18ed183ddca546dcbdbe2ae17ede908b2512e18af12512f9fd8449d829a82105c654994f62a6a01589c42a2b7e055f5e94a64a182cec2
-  data.tar.gz: 2e821818b0294b9e8b889612666a7a10c0eb494abe661743bc8f9122ca741285364aea93e679bb30068b73c9aec7f53aa25f1c1e96b95a0ba2d887199509c280
+  metadata.gz: '09aa40d59c72529810076b7291e9ecdf99e619c847edffd1278408d765413d662120472f3ce34b461757294e2ab32fc77a3c74bf15f8b3d157190f4dae664522'
+  data.tar.gz: 130728f8cac9e183cabfb18dd26b98a1c636edeee6fc256801f356549490450c9443b7a58bb4ea8dfd35d7b66ac71b189fd959aba7145e4217bf4da5aaa4c900

data/app/controllers/project_remote_issues_controller/create.rb

@@ -30,7 +30,7 @@ class ProjectRemoteIssuesController < ApplicationController
     end
 
     def create_model_class
-      ::RedmineRemotes::Tableless::RemoteIssueFetch::Create
+      ::RemoteIssueFetch::Create
     end
 
     def create_params

data/app/controllers/project_remote_issues_controller/update.rb

@@ -14,7 +14,7 @@ class ProjectRemoteIssuesController < ApplicationController
     private
 
     def update_model_class
-      ::RedmineRemotes::Tableless::RemoteIssueFetch::Update
+      ::RemoteIssueFetch::Update
     end
 
     def update_params

data/app/controllers/remote_trackers_controller.rb

@@ -14,7 +14,10 @@ class RemoteTrackersController < ApplicationController
     conf.columns[:password].form_ui = :password
     conf.columns[:profile].form_ui = :select
     conf.columns[:default_local_user].form_ui = :select
-    %w[list show].each { |action| conf.send(action).columns.exclude :password }
+    %w[list show].each do |action|
+      conf.send(action).columns.exclude :password
+      conf.send(action).columns << :fetched_at
+    end
   end
 
   private

data/app/models/remote_issue.rb

@@ -12,6 +12,17 @@ class RemoteIssue < ActiveRecord::Base
   validates :remote_tracker, presence: true
   validates :remote_code, presence: true, uniqueness: { scope: [:remote_tracker] }
 
+  scope :outdated, lambda {
+    t = arel_table
+    where(
+      t[:fetched_at].eq(nil)
+      .or(
+        t[:outdated_at].not_eq(nil)
+        .and(t[:fetched_at].lt(t[:outdated_at]))
+      )
+    )
+  }
+
   def to_s
     "#{remote_tracker}|#{remote_code}"
   end

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

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Base < ::EacRailsUtils::Models::Tableless
+    private
+
+    DESCRIPTION_SECTION_SEPARATOR = "\n\n"
+
+    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
+      }
+    end
+
+    def local_issue_subject
+      "[#{provider_issue.code}] #{provider_issue.subject}".truncate(100)
+    end
+
+    def local_issue_author_uncached
+      return nil if provider_issue.blank?
+
+      ::RemoteUser.find_local_user(
+        provider_issue.author_login,
+        remote_tracker,
+        true
+      )
+    end
+
+    def local_issue_status
+      remote_tracker.try(:find_local_issue_status, local_tracker, provider_issue.status_name, true)
+    end
+
+    def local_issue_description
+      [local_issue_extra_description(:before), provider_issue.description,
+       local_issue_extra_description(:after), local_issue_import_footer]
+        .reject(&:blank?).map(&:strip).join("\n\n----\n\n") + "\n"
+    end
+
+    def local_issue_extra_description(position)
+      extra = provider_issue.try("extra_description_#{position}").if_present('')
+      extra = extra.map { |k, v| "* *#{k}:* #{v}" } if extra.is_a?(::Hash)
+      extra = extra.map { |v| "#{v}\n" }.join if extra.is_a?(::Enumerable)
+      extra.to_s
+    end
+
+    def local_issue_import_footer
+      "_Demanda remota importada de #{provider_issue.human_view_url}._"
+    end
+  end
+end

data/app/models/remote_issue_fetch/base/_provider_issue.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Base < ::EacRailsUtils::Models::Tableless
+    private
+
+    def provider_issue_uncached
+      return nil if [remote_tracker, issue_remote_code].any?(&:blank?)
+
+      remote_tracker.find_remote_issue(issue_remote_code)
+    rescue ::Avmtrf1::RestProvider::Response => e
+      errors.add(default_error_column,
+                 "Requisição a \"#{e.url}\" retornou com status #{e.status}")
+      ::Rails.logger.warn(e.body)
+      nil
+    end
+  end
+end

data/app/models/remote_issue_fetch/base/_remote_issue.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Base < ::EacRailsUtils::Models::Tableless
+    private
+
+    def fetched_at_uncached
+      ::Time.zone.now
+    end
+
+    def save_remote_issue
+      remote_issue.fetched_at = fetched_at
+      return true if remote_issue.save
+
+      fetch_record_errors(remote_issue, default_column: default_error_column)
+      false
+    end
+  end
+end

data/app/models/remote_issue_fetch/base.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'eac_rails_utils/models/fetch_errors'
+require 'eac_ruby_utils/core_ext'
+
+module RemoteIssueFetch
+  class Base < ::EacRailsUtils::Models::Tableless
+    enable_simple_cache
+    require_sub __FILE__
+    include ::EacRailsUtils::Models::FetchErrors
+
+    validates :fetched_at, presence: true
+    validates :local_tracker, presence: true
+    validates :remote_tracker, presence: true
+    validates :issue_remote_code, presence: true
+
+    validate :author_present
+    validate :provider_issue_present
+
+    def author_present
+      return if provider_issue.blank?
+      return if local_issue_author.present?
+
+      errors.add(:remote_code,
+                 "Usuário local não encontrado para \"#{provider_issue.author_login}\"")
+    end
+
+    def provider_issue_present
+      return if issue_remote_code.blank?
+      return if provider_issue.present?
+
+      errors.add(:remote_code,
+                 "Demanda remota não encontrada com o código \"#{issue_remote_code}\"")
+    end
+
+    def save
+      ::Issue.transaction do
+        return false unless valid?
+        return false unless save_local_issue
+        return false unless save_remote_issue
+      end
+      true
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Create < ::RemoteIssueFetch::Base
+    private
+
+    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(&:local_issue) || ::Issue.new
+    end
+
+    def local_issue_priority
+      ::IssuePriority.default
+    end
+  end
+end

data/app/models/remote_issue_fetch/create/_remote_issue.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Create < ::RemoteIssueFetch::Base
+    private
+
+    def remote_issue_uncached
+      remote_issue_by_remote_code.if_blank do
+        ::RemoteIssue.new(remote_tracker: remote_tracker, remote_code: issue_remote_code,
+                          local_issue: local_issue)
+      end
+    end
+
+    def remote_issue_by_remote_code_uncached
+      ::RemoteIssue.find_by(
+        remote_tracker: remote_tracker,
+        remote_code: ::RemoteIssue.remote_code_sanitize(issue_remote_code)
+      )
+    end
+  end
+end

data/app/models/remote_issue_fetch/create.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Create < ::RemoteIssueFetch::Base
+    require_sub __FILE__
+
+    attribute :issue_remote_code, ::String
+    attribute :local_tracker_id, ::Integer
+    attribute :project_id, ::Integer
+    attribute :remote_tracker_id, ::Integer
+
+    belongs_to :local_tracker, class_name: 'Tracker'
+    belongs_to :project, class_name: 'Project'
+    belongs_to :remote_tracker, class_name: 'RemoteTracker'
+
+    validates :project, presence: true
+
+    validate :tracker_in_project
+
+    def default_error_column
+      :issue_remote_code
+    end
+
+    def save
+      remote_issue_by_remote_code.present? ? update : super
+    end
+
+    def tracker_in_project
+      return unless local_tracker.present? && project.present?
+      return if project.trackers.include?(local_tracker)
+
+      errors.add(:local_tracker, 'is not a tracker of project')
+    end
+
+    def update
+      update_record = ::RemoteIssueFetch::Update
+                      .new(remote_issue: remote_issue_by_remote_code)
+      return true if update_record.save
+
+      fetch_record_errors(update_record, default_column: default_error_column)
+      false
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Update < ::RemoteIssueFetch::Base
+    private
+
+    def local_issue
+      remote_issue.local_issue
+    end
+
+    def local_tracker
+      local_issue.if_present(&:tracker)
+    end
+  end
+end

data/app/models/remote_issue_fetch/update/_remote_issue.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RemoteIssueFetch
+  class Update < ::RemoteIssueFetch::Base
+    private
+
+    def issue_remote_code
+      remote_issue.remote_code
+    end
+
+    def remote_tracker
+      remote_issue.remote_tracker
+    end
+  end
+end

data/app/models/remote_issue_fetch/update.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module RemoteIssueFetch
+  class Update < ::RemoteIssueFetch::Base
+    require_sub __FILE__
+
+    attribute :remote_issue_id, ::Integer
+    belongs_to :remote_issue
+
+    validates :remote_issue, presence: true
+
+    def default_error_column
+      :remote_issue_id
+    end
+  end
+end

data/app/models/remote_tracker/find_issue_local_status.rb

@@ -22,7 +22,7 @@ class RemoteTracker < ActiveRecord::Base
     end
 
     def result_by_remote_issue_status
-      ::RemoteIssueStatus.where(remote_issue_status_find_attributes).first.try(:local_issue_status)
+      ::RemoteIssueStatus.find_by(remote_issue_status_find_attributes).try(:local_issue_status)
     end
 
     def result_by_local_issue_status

data/app/models/remote_tracker/remote.rb

@@ -1,19 +1,43 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 class RemoteTracker < ActiveRecord::Base
   module Remote
-    def find_remote_issue(issue_id)
-      remote_instance.find_issue(issue_id)
-    end
+    common_concern
+
+    module ClassMethods
+      def fetchable_profiles
+        @fetchable_profiles ||= lists.profile.values.select do |profile|
+          profile_fetchable?(profile)
+        end
+      end
 
-    def remote_instance
-      remote_instance_class.new(self, root_url, username, password)
+      def profile_fetchable?(profile)
+        provider_instance_class(profile).method_defined?(:fetch_issues_changed)
+      end
+
+      def provider_instance_class(profile)
+        lists.profile.value_validate!(profile)
+
+        ::RedmineRemotes.const_get(profile.capitalize).const_get('Instance')
+      end
     end
 
-    def remote_instance_class
-      raise 'Profile blank' if profile.blank?
+    module InstanceMethods
+      def find_remote_issue(issue_id)
+        remote_instance.find_issue(issue_id)
+      end
+
+      def remote_instance
+        r = remote_instance_class.new(root_url, username, password)
+        r.send('remote_tracker=', self)
+        r
+      end
 
-      ::RedmineRemotes.const_get(profile.capitalize).const_get('Instance')
+      def remote_instance_class
+        self.class.provider_instance_class(profile)
+      end
     end
   end
 end

data/app/models/remote_tracker.rb

@@ -27,6 +27,12 @@ class RemoteTracker < ActiveRecord::Base
   validates :password, presence: true
   validates :default_local_user, presence: true
 
+  scope :fetchable, -> { where(profile: fetchable_profiles) }
+
+  def fetchable?
+    self.class.fetchable_profiles.include?(profile)
+  end
+
   def find_local_issue_status(local_tracker, remote_status_name, register_not_found = false)
     ::RemoteTracker::FindIssueLocalStatus.new(self, local_tracker, remote_status_name,
                                               register_not_found).result
@@ -37,6 +43,6 @@ class RemoteTracker < ActiveRecord::Base
   end
 
   def setting_value(name)
-    ::RemoteTrackerSetting.where(remote_tracker: self, name: name).first.if_present(&:value)
+    ::RemoteTrackerSetting.find_by(remote_tracker: self, name: name).if_present(&:value)
   end
 end

data/app/models/remote_tracker_fetch/provider.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteTrackerFetch < ::EacRailsUtils::Models::Tableless
+  module Provider
+    private
+
+    def provider_issues_codes
+      remote_tracker.remote_instance.fetch_issues_changed(start_time, end_time)
+    end
+  end
+end

data/app/models/remote_tracker_fetch/remote_issues.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteTrackerFetch < ::EacRailsUtils::Models::Tableless
+  module RemoteIssues
+    private
+
+    def save_remote_issues
+      remote_issues.all? { |remote_issue| save_remote_issue(remote_issue) }
+    end
+
+    def save_remote_issue(remote_issue)
+      return true if remote_issue.update(outdated_at: end_time)
+
+      fetch_record_errors(remote_issue, default_column: default_error_column)
+      false
+    end
+
+    def remote_issues_uncached
+      provider_issues_codes.map do |code|
+        ::RemoteIssue.find_by(remote_tracker: remote_tracker,
+                              remote_code: ::RemoteIssue.remote_code_sanitize(code))
+      end.reject(&:blank?)
+    end
+  end
+end

data/app/models/remote_tracker_fetch/remote_tracker.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteTrackerFetch < ::EacRailsUtils::Models::Tableless
+  module RemoteTracker
+    private
+
+    def save_remote_tracker
+      return true if remote_tracker.update(fetched_at: end_time)
+
+      fetch_record_errors(remote_tracker, default_column: default_error_column)
+      false
+    end
+  end
+end

data/app/models/remote_tracker_fetch.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+class RemoteTrackerFetch < ::EacRailsUtils::Models::Tableless
+  require_sub __FILE__, include_modules: true, require_dependency: true
+  enable_simple_cache
+  include ::EacRailsUtils::Models::FetchErrors
+
+  attribute :remote_tracker_id, ::Integer
+  belongs_to :remote_tracker, class_name: 'RemoteTracker'
+
+  validates :remote_tracker, presence: true
+  validates :start_time, presence: true
+  validates :end_time, presence: true
+  validate :remote_tracker_fetchable_validation
+
+  def save
+    ::Issue.transaction do
+      return false unless valid?
+      return false unless save_remote_issues
+      return false unless save_remote_tracker
+    end
+    true
+  end
+
+  def default_error_column
+    :remote_tracker_id
+  end
+
+  private
+
+  def end_time_uncached
+    ::Time.zone.now
+  end
+
+  def start_time_uncached
+    remote_tracker.try(:fetched_at) || end_time
+  end
+
+  def remote_tracker_fetchable_validation
+    return if remote_tracker.blank?
+    return if remote_tracker.fetchable?
+
+    errors.add(:remote_tracker, "Remote tracker \"#{remote_tracker}\" is not fetchable")
+  end
+end

data/app/models/remote_user/find_local_user.rb

@@ -25,7 +25,7 @@ class RemoteUser < ActiveRecord::Base
 
     def result_by_local_user_mail_address
       condition = ::EmailAddress.arel_table[:address].matches("#{remote_login}@%")
-      ::EmailAddress.where(condition).first.try(:user)
+      ::EmailAddress.find_by(condition).try(:user)
     end
 
     def result_by_register_not_found
@@ -47,10 +47,10 @@ class RemoteUser < ActiveRecord::Base
     end
 
     def remote_tracker_result(remote_tracker)
-      ::RemoteUser.where(
+      ::RemoteUser.find_by(
         remote_tracker: remote_tracker,
         remote_login: remote_login
-      ).first.try(:local_user)
+      ).try(:local_user)
     end
 
     def remote_trackers_to_search

data/config/initializers/001_patches.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'redmine_remotes/patches/avmtrf1_rest_provider_instance'
 require 'redmine_remotes/patches/issue'
 require 'redmine_remotes/patches/issue_status'
 require 'redmine_remotes/patches/project'

data/config/locales/en.yml

@@ -22,3 +22,4 @@ en:
   label_remote_issue_statuses: Remote issue statuses
   label_remote_users: Remote users
   label_remotes: Remotes
+  menu_redmine_remotes: Remotes

data/config/locales/pt-BR.yml

@@ -22,3 +22,4 @@ pt-BR:
   label_remote_issue_statuses: Situações de demandas remotas
   label_remote_users: Usuários remotos
   label_remotes: Remotos
+  menu_redmine_remotes: Remotos

data/config/routes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 RedmineApp::Application.routes.draw do
+  concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
   get '/projects/:id/remotes', to: 'project_remote_issues#index'
   get '/projects/:id/tracker/:tracker_id/new_issue', to: 'project_remote_issues#new',
                                                      as: 'new_project_remote_issue'
@@ -9,9 +10,9 @@ RedmineApp::Application.routes.draw do
   put '/projects/:id/remote_issue/:remote_issue_id/update', to: 'project_remote_issues#update',
                                                             as: 'update_project_remote_issue'
   resources(:project_remote_issues, only: [:index])
-  resources(:remote_trackers) { as_routes }
-  resources(:remote_tracker_settings) { as_routes }
-  resources(:remote_issues) { as_routes }
-  resources(:remote_issue_statuses) { as_routes }
-  resources(:remote_users) { as_routes }
+  resources(:remote_trackers, concerns: :active_scaffold)
+  resources(:remote_tracker_settings, concerns: :active_scaffold)
+  resources(:remote_issues, concerns: :active_scaffold)
+  resources(:remote_issue_statuses, concerns: :active_scaffold)
+  resources(:remote_users, concerns: :active_scaffold)
 end

data/db/migrate/20190531171641_create_remote_trackers.rb

@@ -2,7 +2,7 @@
 
 class CreateRemoteTrackers < ActiveRecord::Migration
   def change
-    create_table :remote_trackers do |t|
+    create_table :remote_trackers do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.string :profile
       t.string :root_url
       t.string :username

data/db/migrate/20190910182842_create_remote_users.rb

@@ -2,7 +2,7 @@
 
 class CreateRemoteUsers < ActiveRecord::Migration
   def change
-    create_table :remote_users do |t|
+    create_table :remote_users do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :remote_tracker, index: true
       t.string :remote_login
       t.references :local_user, index: true

data/db/migrate/20190910203552_create_remote_issue_statuses.rb

@@ -2,7 +2,7 @@
 
 class CreateRemoteIssueStatuses < ActiveRecord::Migration
   def change
-    create_table :remote_issue_statuses do |t|
+    create_table :remote_issue_statuses do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :remote_tracker, index: true
       t.references :local_tracker, index: true
       t.string :remote_name

data/db/migrate/20190912000000_create_remote_issues.rb

@@ -2,7 +2,7 @@
 
 class CreateRemoteIssues < ActiveRecord::Migration
   def change
-    create_table :remote_issues do |t|
+    create_table :remote_issues do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :remote_tracker, index: true
       t.references :local_issue, index: true, nullable: true
       t.string :remote_code