redmine_remotes 0.8.0 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5f35dbfa9b3937fe817de6c4b40ee9d2478f8cf109a4972dcf23013af7aaf38
-  data.tar.gz: a9351636d9086cb45149db0221ec92dc74ac7d9860e8b98720be6544b799c31e
+  metadata.gz: 2b9a64e1477b3e084cb4d065af0ec66ac260ad54297e687f6561592cfb4052c7
+  data.tar.gz: ebbbc2b95438d7607df5ce0f3b55dbdf2f96a22217cb50a4c1cd1ced6486904f
 SHA512:
-  metadata.gz: f0019b818f02217850e974d6ae9095f887349db3bf732965038abbc51438e5f00b6c622e844748bdccb87c074cddbddfff2b94e501610c16af8b8afb8a44ba8d
-  data.tar.gz: cf17dc61038a50092c9e4158303d9678ef57a3a2b561d2c38b4a7a568e006e4384e58cd70e92b3e10363941cc921ec07a2ab28a831cd78b15ce75545c2fac887
+  metadata.gz: 480b67c9ea42377485df5690606b138f22f3c4763c21631230be44247e1c2e90f95579dc6ce871a4c9361938430dc7c7fd4bbc1a01db3e518d72b79e8e5ac560
+  data.tar.gz: b5aeb056db0c2386a1020116415708602db7105fa3fdabddc2db97e6e734225383961ede83283a645cfd753eaa1a0109222233ca279ad32781014319f7a3aa8f

data/app/controllers/remote_issues_controller.rb

@@ -9,6 +9,7 @@ class RemoteIssuesController < ApplicationController
   require_permission PERMISSIONS
 
   active_scaffold :remote_issue do |conf|
-    conf.columns[:tracker].form_ui = :select
+    conf.columns[:remote_tracker].form_ui = :select
+    conf.actions.exclude :create, :update, :delete
   end
 end

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

@@ -11,16 +11,13 @@ module RedmineRemotes
         require_sub __FILE__
         include ::Eac::Model
 
+        validates :local_tracker, presence: true
+        validates :remote_tracker, presence: true
+        validates :issue_remote_code, presence: true
+
         validate :author_present
         validate :provider_issue_present
 
-        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 author_present
           return if provider_issue.blank?
           return if local_issue_author.present?

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
 

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

@@ -15,17 +15,14 @@ module RedmineRemotes
         belongs_to :project, class_name: 'Project'
         belongs_to :remote_tracker, class_name: 'RemoteTracker'
 
-        validates :local_tracker, presence: true
-        validates :remote_tracker, presence: true
         validates :project, presence: true
-        validates :issue_remote_code, presence: true
 
         validate :tracker_in_project
 
         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
@@ -47,8 +44,12 @@ module RedmineRemotes
         end
 
         def update
-          ::RedmineRemotes::Tableless::RemoteIssueFetch::Update
-            .new(remote_issue: remote_issue_by_remote_code).save
+          update_record = ::RedmineRemotes::Tableless::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/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: :issue_remote_code)
-          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

@@ -11,14 +11,7 @@ module RedmineRemotes
         end
 
         def local_tracker
-          local_issue.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: :issue_remote_code)
-          false
+          local_issue.if_present(&:tracker)
         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/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.0'
+  VERSION = '0.9.2'
   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.0
+  version: 0.9.2
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-06 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,7 +139,7 @@ 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/views/project_remote_issues/_issues.html.erb
@@ -170,6 +164,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