redmine_remotes 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b08c26b7392ab6cdf69c5e347808474375e9f98bb5102fbc199f6d91b5e22e7
-  data.tar.gz: d68ac09653661d303d0e7b37974fc62b4cc6678af278d2ce5eac9b9e68f16e27
+  metadata.gz: b5f35dbfa9b3937fe817de6c4b40ee9d2478f8cf109a4972dcf23013af7aaf38
+  data.tar.gz: a9351636d9086cb45149db0221ec92dc74ac7d9860e8b98720be6544b799c31e
 SHA512:
-  metadata.gz: 8c8a615c9a0e80edb67f7eb579398e042b3995a98c4b1117ae889de8713f0088e5a0ec6aeb9b318961da7ba6ff472f06c7362be2f983dcb715e044f190f6899a
-  data.tar.gz: 1433dfa717cddb6d7865fce5a97b613f07a501a33ef99eb473d3aef990038b8979c68abffbdda552ce3d610caa3cda07c491b295f4002e9435f1774c7e3c6b89
+  metadata.gz: f0019b818f02217850e974d6ae9095f887349db3bf732965038abbc51438e5f00b6c622e844748bdccb87c074cddbddfff2b94e501610c16af8b8afb8a44ba8d
+  data.tar.gz: cf17dc61038a50092c9e4158303d9678ef57a3a2b561d2c38b4a7a568e006e4384e58cd70e92b3e10363941cc921ec07a2ab28a831cd78b15ce75545c2fac887

data/app/controllers/remote_tracker_settings_controller.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class RemoteTrackerSettingsController < ApplicationController
+  READ_PERMISSION = 'remote_tracker.read'
+  WRITE_PERMISSION = 'remote_tracker.write'
+  PERMISSIONS = READ_PERMISSION
+
+  before_action :localize_options
+  layout 'nonproject_modules'
+  require_permission PERMISSIONS
+
+  active_scaffold :remote_tracker_setting do |conf|
+    conf.columns[:name].form_ui = :select
+    conf.columns[:remote_tracker].form_ui = :select
+    %w[create update].each do |action|
+      conf.send(action).columns = %w[remote_tracker name value]
+    end
+  end
+
+  private
+
+  def localize_options
+    active_scaffold_config.columns[:name].options = {
+      options: ::RemoteTrackerSetting.lists.name.options
+    }
+  end
+end

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

@@ -9,6 +9,7 @@ module RedmineRemotes
         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
           }
         end
@@ -41,6 +42,10 @@ module RedmineRemotes
         def local_issue_status_from_local_tracker
           local_tracker.default_status
         end
+
+        def local_issue_description
+          provider_issue.description
+        end
       end
     end
   end

data/app/models/remote_tracker/jira.rb

@@ -7,7 +7,7 @@ class RemoteTracker < ActiveRecord::Base
     end
 
     def jira_create_instance
-      ::RedmineRemotes::Jira::Instance.new(root_url, username, password)
+      ::RedmineRemotes::Jira::Instance.new(self, root_url, username, password)
     end
   end
 end

data/app/models/remote_tracker.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
 require 'eac_ruby_utils/listable'
 require 'validate_url'
 
@@ -9,6 +10,8 @@ class RemoteTracker < ActiveRecord::Base
 
   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
 
@@ -33,4 +36,8 @@ class RemoteTracker < ActiveRecord::Base
 
     send("#{profile}_find_remote_issue", issue_id)
   end
+
+  def setting_value(name)
+    ::RemoteTrackerSetting.where(remote_tracker: self, name: name).first.if_present(&:value)
+  end
 end

data/app/models/remote_tracker_setting.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/listable'
+
+class RemoteTrackerSetting < ActiveRecord::Base
+  include ::EacRubyUtils::Listable
+  lists.add_string :name, :field_description
+
+  belongs_to :remote_tracker, class_name: 'RemoteTracker', inverse_of: :settings
+
+  validates :name, presence: true, inclusion: { in: lists.name.values }
+  validates :value, presence: true
+end

data/config/initializers/nonproject_modules.rb

@@ -23,6 +23,7 @@
 
 Redmine::MenuManager.map ::RedmineRemotes::SLUG.to_sym do |menu|
   menu.push_controller(:remote_trackers)
+  menu.push_controller(:remote_tracker_settings)
   menu.push_controller(:remote_issues)
   menu.push_controller(:remote_issue_statuses)
   menu.push_controller(:remote_users)

data/config/locales/en.yml

@@ -5,6 +5,10 @@ en:
         profile:
           jira:
             label: Jira
+  remote_tracker_setting:
+    name:
+      field_description:
+        label: Alternative "description" field
   field_issue_remote_code: Remote issue's code
   field_local_issue: Local issue
   field_local_tracker: Local tracker
@@ -12,6 +16,7 @@ en:
   field_remote_tracker: Remote tracker
   label_remote_issues: Remote issues
   label_remote_trackers: Remote trackers
+  label_remote_tracker_settings: Remote trackers / Settings
   label_remote_issue_statuses: Remote issue statuses
   label_remote_users: Remote users
   label_remotes: Remotes

data/config/locales/pt-BR.yml

@@ -5,6 +5,10 @@ pt-BR:
         profile:
           jira:
             label: Jira
+      remote_tracker_setting:
+        name:
+          field_description:
+            label: Campo "descrição" alternativo
   field_issue_remote_code: Código da demanda remota
   field_local_issue: Demanda local
   field_local_tracker: Tipo de tarefa local
@@ -12,6 +16,7 @@ pt-BR:
   field_remote_tracker: Tracker remoto
   label_remote_issues: Demandas remotas
   label_remote_trackers: Trackers remotos
+  label_remote_tracker_settings: Trackers remotos / Configurações
   label_remote_issue_statuses: Situações de demandas remotas
   label_remote_users: Usuários remotos
   label_remotes: Remotos

data/config/routes.rb

@@ -10,6 +10,7 @@ RedmineApp::Application.routes.draw do
                                                             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 }

data/db/migrate/20200504183142_create_remote_tracker_settings.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class CreateRemoteTrackerSettings < ActiveRecord::Migration
+  def change
+    create_table :remote_tracker_settings do |t|
+      t.references :remote_tracker, index: true
+      t.string :name
+      t.string :value
+      t.timestamps
+    end
+
+    add_foreign_key :remote_tracker_settings, :remote_trackers, column: :remote_tracker_id
+  end
+end

data/db/migrate/20200505153200_add_timestamps_to_redmine_trackers.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddTimestampsToRedmineTrackers < ActiveRecord::Migration
+  class RemoteTracker < ::ActiveRecord::Base; end
+
+  def change
+    add_timestamps :remote_trackers, null: true
+    reversible do |dir|
+      dir.up do
+        now = ::Time.zone.now
+        RemoteTracker.update_all(created_at: now, updated_at: now) # rubocop:disable Rails/SkipsModelValidations
+      end
+    end
+
+    change_column_null :remote_trackers, :created_at, false
+    change_column_null :remote_trackers, :updated_at, false
+  end
+end

data/db/migrate/20200505160938_add_timestamps_to_remote_issues.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddTimestampsToRemoteIssues < ActiveRecord::Migration
+  class RemoteIssue < ::ActiveRecord::Base; end
+
+  def change
+    add_timestamps :remote_issues, null: true
+    reversible do |dir|
+      dir.up do
+        now = ::Time.zone.now
+        RemoteIssue.update_all(created_at: now, updated_at: now) # rubocop:disable Rails/SkipsModelValidations
+      end
+    end
+
+    change_column_null :remote_issues, :created_at, false
+    change_column_null :remote_issues, :updated_at, false
+  end
+end

data/db/migrate/20200505161002_add_timestamps_to_remote_users.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class AddTimestampsToRemoteUsers < ActiveRecord::Migration
+  class RemoteUser < ::ActiveRecord::Base; end
+
+  def change
+    add_timestamps :remote_users, null: true
+    reversible do |dir|
+      dir.up do
+        now = ::Time.zone.now
+        RemoteUser.update_all(created_at: now, updated_at: now) # rubocop:disable Rails/SkipsModelValidations
+      end
+    end
+
+    change_column_null :remote_users, :created_at, false
+    change_column_null :remote_users, :updated_at, false
+  end
+end

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

@@ -14,6 +14,10 @@ module RedmineRemotes
           fields.fetch('created')
         end
 
+        def description
+          fields.fetch(instance.description_field)
+        end
+
         def fields
           data.fetch('fields')
         end

data/lib/redmine_remotes/jira/instance.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/core_ext'
+
 module RedmineRemotes
   module Jira
     class Instance < ::RedmineRemotes::RestProvider::Instance
       ISSUE_ID_PATTERN = /\A([a-z][a-z0-9]+)\-(\d+)\z/i.freeze
+      DEFAULT_DESCRIPTION_FIELD = 'description'
 
       class << self
         def parse_issue_id(global_issue_id)
@@ -18,6 +21,11 @@ module RedmineRemotes
         "#{root_url}/rest/api/latest#{service_url_suffix}"
       end
 
+      def description_field
+        remote_tracker.setting_value(::RemoteTrackerSetting::NAME_FIELD_DESCRIPTION)
+                      .if_present(DEFAULT_DESCRIPTION_FIELD)
+      end
+
       def issue_get_url_suffix(provider_issue_id)
         "/issue/#{provider_issue_id}"
       end

data/lib/redmine_remotes/rest_provider/instance.rb

@@ -11,6 +11,13 @@ module RedmineRemotes
     #   * self.build_service_url(service_url_suffix)
     #   * self.issue_get_url_suffix(provider_issue_id)
     class Instance < ::Avmtrf1::RestProvider::Instance
+      attr_reader :remote_tracker
+
+      def initialize(remote_tracker, root_url, username, password)
+        @remote_tracker = remote_tracker
+        super(root_url, username, password)
+      end
+
       def request(service_url_suffix)
         JSON.parse(super(service_url_suffix).body_or_raise)
       end

data/lib/redmine_remotes/version.rb

@@ -3,7 +3,7 @@
 module RedmineRemotes
   SLUG = 'redmine_remotes'
   NAME = 'Redmine Remotes'
-  VERSION = '0.7.0'
+  VERSION = '0.8.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.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-05 00:00:00.000000000 Z
+date: 2020-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -130,6 +130,7 @@ files:
 - app/controllers/project_remote_issues_controller/update.rb
 - app/controllers/remote_issue_statuses_controller.rb
 - app/controllers/remote_issues_controller.rb
+- app/controllers/remote_tracker_settings_controller.rb
 - app/controllers/remote_trackers_controller.rb
 - app/controllers/remote_users_controller.rb
 - app/models/redmine_remotes/tableless/remote_issue_fetch/base.rb
@@ -140,12 +141,12 @@ files:
 - app/models/redmine_remotes/tableless/remote_issue_fetch/create/_remote_issue.rb
 - app/models/redmine_remotes/tableless/remote_issue_fetch/update.rb
 - app/models/redmine_remotes/tableless/remote_issue_fetch/update/_local_issue.rb
-- app/models/redmine_remotes/tableless/remote_issue_fetch/update/_provider_issue.rb
 - app/models/redmine_remotes/tableless/remote_issue_fetch/update/_remote_issue.rb
 - 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_setting.rb
 - app/models/remote_user.rb
 - app/views/project_remote_issues/_issues.html.erb
 - app/views/project_remote_issues/_trackers.html.erb
@@ -163,6 +164,10 @@ files:
 - db/migrate/20190911165556_rename_issue_status_id_to_local_issue_status_id_in_remote_issue_statuses.rb
 - db/migrate/20190912000000_create_remote_issues.rb
 - db/migrate/20190913195930_add_default_local_user_id_to_remote_trackers.rb
+- db/migrate/20200504183142_create_remote_tracker_settings.rb
+- db/migrate/20200505153200_add_timestamps_to_redmine_trackers.rb
+- db/migrate/20200505160938_add_timestamps_to_remote_issues.rb
+- db/migrate/20200505161002_add_timestamps_to_remote_users.rb
 - init.rb
 - lib/redmine_remotes.rb
 - lib/redmine_remotes/jira/entities/issue.rb

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

@@ -1,20 +0,0 @@
-# frozen_string_literal: true
-
-module RedmineRemotes
-  module Tableless
-    module RemoteIssueFetch
-      class Update < ::RedmineRemotes::Tableless::RemoteIssueFetch::Base
-        private
-
-        def provider_issue_uncached
-          remote_issue.remote_tracker.find_remote_issue(remote_issue.remote_code)
-        rescue ::RedmineRemotes::RestProvider::HttpResponse => e
-          errors.add(:remote_issue_id,
-                     "Requisição a \"#{e.url}\" retornou com status #{e.status}")
-          puts "====> #{e.body}"
-          nil
-        end
-      end
-    end
-  end
-end