redmine_remotes 0.15.3 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18d9615ff3b718437d968bdc9c3483e185936efa5f9ba0bd6d936bd2c6732e34
-  data.tar.gz: 97d71e8ba3e72b4154775ed48e3ab6604133059dda380cc36cb6838dedc4af19
+  metadata.gz: f974e7b689f90b6250957c0a0356f22fa78fbd9e84705a18abbd5667df745da0
+  data.tar.gz: eb073a99fd7ee11795b341d132f943e820f78103928baa66983ccbebef2531a2
 SHA512:
-  metadata.gz: f4de283cfde98c0739a7d335cd531a79350bbffb22d70acfcbf26b600c3e519796f719a670e7de39e7ab0114bce829537833f748d7e56df657e4069e3ae465b0
-  data.tar.gz: 67c0236c893e01723aedd350f33b1c79d733da22514b2060a5c407a6abc58835360d857878461ad1df2bc72501cda2fff5dce91da5d5cdcec1dfabc4a8a0ede1
+  metadata.gz: 74953344c1a68f1ce612e808341767fbdc0a4e359f145d55273cd29c7b5160da9b2fc149dc4bb1b536a1ea96d0a2ef95a0e690f4c6f0f20019a143414ee01f7c
+  data.tar.gz: cd80adf88f456deedeb3a440626877fa7e5c50bc9d84b8a9311531459e5ad731e9e69422b7b169c306e1630eca4f97a90a126233725dbce9446738b4d751d5b1

data/app/controllers/remote_issue_statuses_controller.rb

@@ -8,9 +8,22 @@ class RemoteIssueStatusesController < ApplicationController
   layout 'nonproject_modules'
   require_permission PERMISSIONS
 
+  SEARCH_COLUMNS = %i[remote_name local_issue_status local_tracker remote_tracker].freeze
+  before_action :localize_options
+
   active_scaffold :remote_issue_status do |conf|
-    %i[remote_tracker local_tracker local_issue_status].each do |column|
+    conf.actions.swap :search, :field_search
+    SEARCH_COLUMNS.each do |column|
       conf.columns[column].form_ui = :select
     end
+    conf.field_search.columns = SEARCH_COLUMNS
+  end
+
+  private
+
+  def localize_options
+    active_scaffold_config.columns[:remote_name].options = {
+      options: ::RemoteIssueStatus.remote_name_options
+    }
   end
 end

data/app/models/remote_issue_status.rb

@@ -13,4 +13,10 @@ class RemoteIssueStatus < ActiveRecord::Base
   validates :remote_tracker, presence: true
   validates :local_tracker, presence: true
   validates :local_issue_status, presence: true
+
+  class << self
+    def remote_name_options
+      all.pluck(:remote_name).map { |v| [v.upcase, v] }
+    end
+  end
 end

data/app/models/remote_tracker.rb

@@ -19,7 +19,8 @@ class RemoteTracker < ActiveRecord::Base
                             dependent: :destroy
   has_many :remote_users, class_name: 'RemoteUser', inverse_of: :remote_tracker,
                           dependent: :restrict_with_error
-  belongs_to :default_local_user, class_name: 'User', inverse_of: :remote_trackers_as_default
+  belongs_to :default_local_user, class_name: 'User', inverse_of: :remote_trackers_as_default,
+                                  foreign_key: :default_local_user_id
 
   validates :profile, presence: true, inclusion: { in: lists.profile.values }
   validates :root_url, presence: true, uniqueness: { scope: [:username] }, url: true

data/app/models/remote_user.rb

@@ -6,7 +6,7 @@ class RemoteUser < ActiveRecord::Base
   downcase_columns :remote_login
 
   belongs_to :remote_tracker, class_name: 'RemoteTracker', inverse_of: :remote_users
-  belongs_to :local_user, class_name: 'User', inverse_of: :remote_users
+  belongs_to :local_user, class_name: 'User', inverse_of: :remote_users, foreign_key: :local_user_id
 
   validates :remote_login, presence: true, uniqueness: { scope: [:remote_tracker] }
   validates :local_user, presence: true

data/config/locales/en.yml

@@ -1,4 +1,9 @@
 en:
+  activerecord:
+    models:
+      remote_issue_status:
+        one: Remote issue status
+        other: Remote issue statuses
   eac_ruby_utils:
     listable:
       remote_tracker:
@@ -13,8 +18,10 @@ en:
         label: Alternative "description" field
   field_issue_remote_code: Remote issue's code
   field_local_issue: Local issue
+  field_local_issue_status: Local issue status
   field_local_tracker: Local tracker
   field_remote_code: Remote code
+  field_remote_name: Local issue status's name
   field_remote_tracker: Remote tracker
   label_remote_issues: Remote issues
   label_remote_trackers: Remote trackers

data/config/locales/pt-BR.yml

@@ -1,4 +1,9 @@
 pt-BR:
+  activerecord:
+    models:
+      remote_issue_status:
+        one: Situação de demanda remota
+        other: Situações de demandas remotas
   eac_ruby_utils:
     listable:
       remote_tracker:
@@ -13,8 +18,10 @@ pt-BR:
             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
+  field_local_issue_status: Situação de demanda local
+  field_local_tracker: Tipo de demanda local
   field_remote_code: Código remoto
+  field_remote_name: Nome da situação de demanda remota
   field_remote_tracker: Tracker remoto
   label_remote_issues: Demandas remotas
   label_remote_trackers: Trackers remotos

data/db/migrate/20190531171641_create_remote_trackers.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateRemoteTrackers < ActiveRecord::Migration
+class CreateRemoteTrackers < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :remote_trackers do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.string :profile

data/db/migrate/20190910182842_create_remote_users.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateRemoteUsers < ActiveRecord::Migration
+class CreateRemoteUsers < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :remote_users do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :remote_tracker, index: true

data/db/migrate/20190910203552_create_remote_issue_statuses.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateRemoteIssueStatuses < ActiveRecord::Migration
+class CreateRemoteIssueStatuses < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :remote_issue_statuses do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :remote_tracker, index: true

data/db/migrate/20190911165556_rename_issue_status_id_to_local_issue_status_id_in_remote_issue_statuses.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class RenameIssueStatusIdToLocalIssueStatusIdInRemoteIssueStatuses < ActiveRecord::Migration
+class RenameIssueStatusIdToLocalIssueStatusIdInRemoteIssueStatuses < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     rename_column :remote_issue_statuses, :issue_status_id, :local_issue_status_id
   end

data/db/migrate/20190912000000_create_remote_issues.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateRemoteIssues < ActiveRecord::Migration
+class CreateRemoteIssues < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :remote_issues do |t| # rubocop:disable Rails/CreateTableWithTimestamps
       t.references :remote_tracker, index: true

data/db/migrate/20190913195930_add_default_local_user_id_to_remote_trackers.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddDefaultLocalUserIdToRemoteTrackers < ActiveRecord::Migration
+class AddDefaultLocalUserIdToRemoteTrackers < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     add_reference :remote_trackers, :default_local_user, index: true
 

data/db/migrate/20200504183142_create_remote_tracker_settings.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class CreateRemoteTrackerSettings < ActiveRecord::Migration
+class CreateRemoteTrackerSettings < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     create_table :remote_tracker_settings do |t|
       t.references :remote_tracker, index: true

data/db/migrate/20200505153200_add_timestamps_to_redmine_trackers.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddTimestampsToRedmineTrackers < ActiveRecord::Migration
+class AddTimestampsToRedmineTrackers < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   class RemoteTracker < ::ActiveRecord::Base; end
 
   def change

data/db/migrate/20200505160938_add_timestamps_to_remote_issues.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddTimestampsToRemoteIssues < ActiveRecord::Migration
+class AddTimestampsToRemoteIssues < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   class RemoteIssue < ::ActiveRecord::Base; end
 
   def change

data/db/migrate/20200505161002_add_timestamps_to_remote_users.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddTimestampsToRemoteUsers < ActiveRecord::Migration
+class AddTimestampsToRemoteUsers < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   class RemoteUser < ::ActiveRecord::Base; end
 
   def change

data/db/migrate/20200602192120_add_outdated_at_to_remote_issues.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddOutdatedAtToRemoteIssues < ActiveRecord::Migration
+class AddOutdatedAtToRemoteIssues < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     add_column :remote_issues, :outdated_at, :datetime
   end

data/db/migrate/20200602194753_add_fetched_at_to_remote_issues.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddFetchedAtToRemoteIssues < ActiveRecord::Migration
+class AddFetchedAtToRemoteIssues < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     add_column :remote_issues, :fetched_at, :timestamp
   end

data/db/migrate/20200602203020_add_fetched_at_to_remote_trackers.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class AddFetchedAtToRemoteTrackers < ActiveRecord::Migration
+class AddFetchedAtToRemoteTrackers < (
+    ::Rails.version < '5.1' ? ::ActiveRecord::Migration : ::ActiveRecord::Migration[4.2]
+  )
   def change
     add_column :remote_trackers, :fetched_at, :datetime
   end

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

@@ -6,11 +6,16 @@ module RedmineRemotes
   module Esosti
     module Entities
       class Issue < ::Avmtrf1::Esosti::Entities::Issue
+        DEFAULT_TYPE_FOR_URL_PREFIX = '_unmapped_'
         EXTRA_DESCRIPTION_BEFORE = { reported_by: 'Relatado por', affected_person: 'Pessoa afetada',
                                      type_description: 'Tipo de solicitação' }.freeze
+        TYPES_FOR_URL = {
+          'INCIDENTE' => 'ms_incident',
+          'SS' => 'ms_sr'
+        }.freeze
 
         def human_view_url
-          instance.issue_human_view_url(uid)
+          instance.issue_human_view_url(type_for_url, uid)
         end
 
         def author_login
@@ -63,6 +68,14 @@ module RedmineRemotes
           description.gsub(/\s+/, ' ')
         end
 
+        def type_for_url
+          TYPES_FOR_URL[type_class] || "#{DEFAULT_TYPE_FOR_URL_PREFIX}#{type_class}"
+        end
+
+        def type_class
+          attributes.fetch('CLASS')
+        end
+
         def type_description
           attributes.fetch('DESCRIPTION')
         end

data/lib/redmine_remotes/esosti/instance.rb

@@ -17,8 +17,8 @@ module RedmineRemotes
         end
       end
 
-      def issue_human_view_url(ticket_uid)
-        "#{root_url}/itsm/ui/?event=loadapp&value=ms_sr&uniqueid=#{ticket_uid}"
+      def issue_human_view_url(ticket_type, ticket_uid)
+        "#{root_url}/itsm/ui/?event=loadapp&value=#{ticket_type}&uniqueid=#{ticket_uid}"
       end
 
       def fetch_issues_changed(start_time, _end_time)

data/lib/redmine_remotes/patches/user.rb

@@ -7,10 +7,10 @@ module EacRedmineUsability
 
       included do
         has_many :remote_users, class_name: 'RemoteUser', inverse_of: :local_user,
-                                dependent: :destroy
+                                dependent: :destroy, foreign_key: :local_user_id
         has_many :remote_trackers_as_default,
                  class_name: 'RemoteTracker', inverse_of: :default_local_user,
-                 dependent: :restrict_with_error
+                 dependent: :restrict_with_error, foreign_key: :default_local_user_id
       end
     end
   end

data/lib/redmine_remotes/version.rb

@@ -3,7 +3,7 @@
 module RedmineRemotes
   SLUG = 'redmine_remotes'
   NAME = 'Redmine Remotes'
-  VERSION = '0.15.3'
+  VERSION = '0.16.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.15.3
+  version: 0.16.0
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-07 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers