redmine_remotes 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f974e7b689f90b6250957c0a0356f22fa78fbd9e84705a18abbd5667df745da0
-  data.tar.gz: eb073a99fd7ee11795b341d132f943e820f78103928baa66983ccbebef2531a2
+  metadata.gz: '08af38aa84220415817925bc4d43800241483e63af58ee400db473c0703e6056'
+  data.tar.gz: ebc18a12269acbd0a96e483b0292b44969b73f4c40cdb237dde72c82bca70c2b
 SHA512:
-  metadata.gz: 74953344c1a68f1ce612e808341767fbdc0a4e359f145d55273cd29c7b5160da9b2fc149dc4bb1b536a1ea96d0a2ef95a0e690f4c6f0f20019a143414ee01f7c
-  data.tar.gz: cd80adf88f456deedeb3a440626877fa7e5c50bc9d84b8a9311531459e5ad731e9e69422b7b169c306e1630eca4f97a90a126233725dbce9446738b4d751d5b1
+  metadata.gz: e1df465e2f09a973aaef13ee09c62ff6fbed22159d13b84b2b97fceaed35633364fb2a07f9fa7cce77f824503fa6a7d5d95e5a1a82bd213c5188a76096c74826
+  data.tar.gz: 390421bd835ad593c9bf28dafe09a8ffd80ed64eb27f9a6f4f5b2a3dda05ec932284c4bdddce9b5538f37499ad9b505f68fa8afcde176dd81e6f535b24f4e211

data/app/controllers/project_remote_issues_controller/create.rb

@@ -30,7 +30,7 @@ class ProjectRemoteIssuesController < ApplicationController
     end
 
     def create_model_class
-      ::RemoteIssueFetch::Create
+      ::RedmineRemotes::IssueFetch::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
-      ::RemoteIssueFetch::Update
+      ::RedmineRemotes::IssueFetch::Update
     end
 
     def update_params

data/app/tableless_models/redmine_remotes/issue_fetch/base/local_issue.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Base < ::EacRailsUtils::Models::Tableless
+      module LocalIssue
+        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
+  end
+end

data/app/tableless_models/redmine_remotes/issue_fetch/base/provider_issue.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Base < ::EacRailsUtils::Models::Tableless
+      module ProviderIssue
+        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_str)
+          nil
+        end
+      end
+    end
+  end
+end

data/app/tableless_models/redmine_remotes/issue_fetch/base/remote_issue.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Base < ::EacRailsUtils::Models::Tableless
+      module RemoteIssue
+        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
+  end
+end

data/app/tableless_models/redmine_remotes/issue_fetch/base.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'eac_rails_utils/models/fetch_errors'
+require 'eac_ruby_utils/core_ext'
+
+module RedmineRemotes
+  module IssueFetch
+    class Base < ::EacRailsUtils::Models::Tableless
+      enable_simple_cache
+      require_sub __FILE__, include_modules: true
+      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
+end

data/app/tableless_models/redmine_remotes/issue_fetch/create/local_issue.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Create < ::RedmineRemotes::IssueFetch::Base
+      module LocalIssue
+        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
+  end
+end

data/app/tableless_models/redmine_remotes/issue_fetch/create/remote_issue.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Create < ::RedmineRemotes::IssueFetch::Base
+      module RemoteIssue
+        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
+  end
+end

data/app/tableless_models/redmine_remotes/issue_fetch/create.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Create < ::RedmineRemotes::IssueFetch::Base
+      require_sub __FILE__, include_modules: true
+
+      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 = ::RedmineRemotes::IssueFetch::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
+end

data/app/tableless_models/redmine_remotes/issue_fetch/update/local_issue.rb

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

data/app/tableless_models/redmine_remotes/issue_fetch/update/remote_issue.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module RedmineRemotes
+  module IssueFetch
+    class Update < ::RedmineRemotes::IssueFetch::Base
+      module RemoteIssue
+        private
+
+        def issue_remote_code
+          remote_issue.remote_code
+        end
+
+        def remote_tracker
+          remote_issue.remote_tracker
+        end
+      end
+    end
+  end
+end

data/app/tableless_models/redmine_remotes/issue_fetch/update.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+
+module RedmineRemotes
+  module IssueFetch
+    class Update < ::RedmineRemotes::IssueFetch::Base
+      require_sub __FILE__, include_modules: true
+
+      attribute :remote_issue_id, ::Integer
+      belongs_to :remote_issue
+
+      validates :remote_issue, presence: true
+
+      def default_error_column
+        :remote_issue_id
+      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 = ::RemoteIssueFetch::Update.new(
+        record = ::RedmineRemotes::IssueFetch::Update.new(
           remote_issue: remote_issue
         )
         return if record.save

data/lib/redmine_remotes/version.rb

@@ -3,7 +3,7 @@
 module RedmineRemotes
   SLUG = 'redmine_remotes'
   NAME = 'Redmine Remotes'
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
   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.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Eduardo Henrique Bogoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-13 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aranha-parsers
@@ -154,16 +154,6 @@ files:
 - app/controllers/remote_trackers_controller.rb
 - app/controllers/remote_users_controller.rb
 - app/models/remote_issue.rb
-- app/models/remote_issue_fetch/base.rb
-- app/models/remote_issue_fetch/base/_local_issue.rb
-- app/models/remote_issue_fetch/base/_provider_issue.rb
-- app/models/remote_issue_fetch/base/_remote_issue.rb
-- app/models/remote_issue_fetch/create.rb
-- app/models/remote_issue_fetch/create/_local_issue.rb
-- app/models/remote_issue_fetch/create/_remote_issue.rb
-- app/models/remote_issue_fetch/update.rb
-- app/models/remote_issue_fetch/update/_local_issue.rb
-- app/models/remote_issue_fetch/update/_remote_issue.rb
 - app/models/remote_issue_status.rb
 - app/models/remote_tracker.rb
 - app/models/remote_tracker/find_issue_local_status.rb
@@ -175,6 +165,16 @@ files:
 - app/models/remote_tracker_setting.rb
 - app/models/remote_user.rb
 - app/models/remote_user/find_local_user.rb
+- app/tableless_models/redmine_remotes/issue_fetch/base.rb
+- app/tableless_models/redmine_remotes/issue_fetch/base/local_issue.rb
+- app/tableless_models/redmine_remotes/issue_fetch/base/provider_issue.rb
+- app/tableless_models/redmine_remotes/issue_fetch/base/remote_issue.rb
+- app/tableless_models/redmine_remotes/issue_fetch/create.rb
+- app/tableless_models/redmine_remotes/issue_fetch/create/local_issue.rb
+- app/tableless_models/redmine_remotes/issue_fetch/create/remote_issue.rb
+- app/tableless_models/redmine_remotes/issue_fetch/update.rb
+- app/tableless_models/redmine_remotes/issue_fetch/update/local_issue.rb
+- app/tableless_models/redmine_remotes/issue_fetch/update/remote_issue.rb
 - app/views/project_remote_issues/_issues.html.erb
 - app/views/project_remote_issues/_trackers.html.erb
 - app/views/project_remote_issues/index.html.erb

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

@@ -1,77 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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

@@ -1,19 +0,0 @@
-# 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

@@ -1,45 +0,0 @@
-# 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

@@ -1,21 +0,0 @@
-# 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

@@ -1,21 +0,0 @@
-# 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

@@ -1,44 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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

@@ -1,15 +0,0 @@
-# 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

@@ -1,18 +0,0 @@
-# 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