redmine_remotes 0.14.0 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b69ffeb75da1b7cdee13641076954cbbab68343584a359b213a607918eb619e
-  data.tar.gz: 890479aa66e8d40a76809386d34f56d823c644d0a21aade8e9aaa5308fe05046
+  metadata.gz: b73c970478b213277563054f35129ddcc1242da52dfff81eee4d672f9dc04f82
+  data.tar.gz: '028153033c5e5dbed1dca11f1205a3679f9c1ccafc9ba98c1d9cd456e01db3d6'
 SHA512:
-  metadata.gz: ea705a044abece2d36ea6332ec1b11d28020195c7779e6ca4dc98b5f0d127f97763689bba612e28f281a2fd65522cfcf4adc5b8784e12d896604f0a8e02bef21
-  data.tar.gz: ce32ae83e8430cef00ed296e67a0fa905adf33583ffee1869e09a4582ac265c8a7660cad52a0f00868966338bb61ef636cf26c7d31abad2107ddb2e9930a3497
+  metadata.gz: cca0145c05035eb1ead69f75fefdd33b13fad6e3c5834f260e6165b35b70d0be614401a3b167d31428fcbf6b318e4a9a06d76d23d21fb14f0a6a3ec3740aaac4
+  data.tar.gz: faf153f23e23b209910f6d852ef1e9ae034833444d89059061c6e3452c3a5370156eb95a66ee49cc5d5c98e1ea94df06721890428653ac101789d2eab4fa6b46

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/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.rb

@@ -43,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/000_dependencies.rb

@@ -2,5 +2,5 @@
 
 Redmine::Plugin.post_register ::RedmineRemotes::SLUG.to_sym do
   # Source: https://github.com/esquilo-azul/redmine_nonproject_modules
-  requires_redmine_plugin(:redmine_nonproject_modules, version_or_higher: '0.2.1')
+  requires_redmine_plugin(:redmine_nonproject_modules, version_or_higher: '0.3.9')
 end

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

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

@@ -6,12 +6,19 @@ module RedmineRemotes
   module Esosti
     module Entities
       class Issue < ::Avmtrf1::Esosti::Entities::Issue
+        EXTRA_DESCRIPTION_BEFORE = { reported_by: 'Relatado por', affected_person: 'Pessoa afetada',
+                                     type_description: 'Tipo de solicitação' }.freeze
+
         def human_view_url
           instance.issue_human_view_url(uid)
         end
 
         def author_login
-          attributes.fetch('CREATEDBY').if_present { |v| v.gsub(/@[^@]+\z/, '') }
+          mail_local_part(attributes.fetch('CREATEDBY'))
+        end
+
+        def affected_person
+          mail_local_part(attributes.fetch('AFFECTEDPERSON'))
         end
 
         def attributes
@@ -32,21 +39,45 @@ module RedmineRemotes
           )
         end
 
+        def extra_description_before
+          {
+            'Relatado por' => "user:#{reported_by}",
+            'Pessoa afetada' => "user:#{affected_person}",
+            'Tipo de solicitação' => type_description
+          }
+        end
+
         def related_mbos
           data.first.fetch('RelatedMbos')
         end
 
+        def reported_by
+          mail_local_part(attributes.fetch('REPORTEDBY'))
+        end
+
         def status_name
           attributes.fetch('STATUS')
         end
 
         def subject
+          description.gsub(/\s+/, ' ')
+        end
+
+        def type_description
           attributes.fetch('DESCRIPTION')
         end
 
         def uid
           attributes.fetch('TICKETUID').fetch('content')
         end
+
+        private
+
+        def mail_local_part(mail_address)
+          mail_address.if_present do |v|
+            /\A([^@]+)@/.if_match(v, false) { |m| m[1].downcase }.if_present(mail_address)
+          end
+        end
       end
     end
   end

data/lib/redmine_remotes/jobs/fetch_issues.rb

@@ -19,7 +19,7 @@ module RedmineRemotes
       def fetch_issue(remote_issue)
         ::Rails.logger.info 'Fetching remote issue ' \
           "\"#{remote_issue}|\##{remote_issue.local_issue.id}\""
-        record = ::RedmineRemotes::Tableless::RemoteIssueFetch::Update.new(
+        record = ::RemoteIssueFetch::Update.new(
           remote_issue: remote_issue
         )
         return if record.save

data/lib/redmine_remotes/jobs/fetch_trackers.rb

@@ -14,7 +14,7 @@ module RedmineRemotes
 
       def fetch_tracker(remote_tracker)
         ::Rails.logger.info "Fetch remote tracker \"#{remote_tracker}\"..."
-        record = ::RedmineRemotes::Tableless::RemoteTrackerFetch.new(
+        record = ::RemoteTrackerFetch.new(
           remote_tracker: remote_tracker
         )
         return if record.save

data/lib/redmine_remotes/version.rb

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