gitlab_support_readiness 1.0.36 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13950952a0154e8d77531bb3ac9e64373ca9b1a48707e43eb455ba9ab65a2ea5
-  data.tar.gz: 3938db24450f52fb5069e1ee6e932e2f047f56899db442cc8f80e9a205c92a2a
+  metadata.gz: 9b1330c4fb2dc431a85de88f941a158751eb98d45431c567669d0913fe8bacd1
+  data.tar.gz: d40b44310ef4c8217507178164924e83faccf9827d843778a1b71b5562b5e313
 SHA512:
-  metadata.gz: 67a775d1e90080ff3e37bfb7c500db214eb5dd073e8d756c5862bde1254f76ec2b4c98ae40991abb0c73ef85486c255b7788f77132126128b1f73da1e8d71d92
-  data.tar.gz: 5092f72ca08b3a66bf29c57dc23e5655712fb71e295ad420dbf74c629da61fc4fce4fc4efa40d47dc65c33de7ce9a3866bca1ef491da18d8ee94f4f32fffe4d4
+  metadata.gz: 2a5ea2c78752e407c81cb86776a1e8d1ee2ac55ee7ebf1acfab7fe4c440c881efac6fcfad72fb1da4d0483c5f31bd8abb663af2d623e13c1387471848e87c445
+  data.tar.gz: 1635651da9633d04fd6ef1462ed3e5d233f3a0e5c1234bb674df719ed5eef698476b5f6114d9e052e23cadbcb3b56359eec9336fd80209dd4b8c5ac4518ab779

data/lib/support_readiness/repos/ticket_fields.rb

@@ -52,8 +52,8 @@ module Readiness
             repo.custom_field_options.map! { |o| Zendesk::TicketFieldOptions.new(o) } unless repo.custom_field_options.first.is_a? Object
             repo.custom_field_options.each do |repo_option|
               repo_option.position = repo.custom_field_options.index(repo_option) if repo_option.position.nil?
-              zd_option = zd_options.detect { |zd_o| zd_o.name == repo_option.name }
-              if zd_option.nil? || to_clean_json(zd_option) != to_clean_json(repo_option)
+              zd_option = zd.custom_field_options.detect { |zd_o| zd_o.value == repo_option.value }
+              if zd_option.nil? || option_difference?(zd_option, repo_option)
                 @diffs[:option_updates].push({ "#{repo.title}" => repo_option })
               end
             end
@@ -69,6 +69,22 @@ module Readiness
         @diffs
       end
 
+      ##
+      # Deterine if there is a difference between the repo ticket field options to the Zendesk instance ticket field options
+      #
+      # @author Jason Colyer
+      # @since 1.0.38
+      # @param zd_option [Object] An instance of {Readiness::Zendesk::TicketFieldOptions}
+      # @param repo_option [Object] An instance of {Readiness::Zendesk::TicketFieldOptions}
+      # @return [Boolean]
+      def self.option_difference?(zd_option, repo_option)
+        return true if zd_option.name != repo_option.name
+        return true if zd_option.position != repo_option.position
+        return true if zd_option.value != repo_option.value
+
+        false
+      end
+
       ##
       # Outputs a comparison report
       #

data/lib/support_readiness/zendesk/tickets.rb

@@ -174,9 +174,9 @@ module Readiness
       #   config.token = 'test123abc'
       #   config.url = 'https://example.zendesk.com/api/v2'
       #   client = Readiness::Zendesk::Client.new(config)
-      #   ticket1 = Readiness::Zendesk::Tickets.find!(client, 1) 
+      #   ticket1 = Readiness::Zendesk::Tickets.find!(client, 1)
       #   ticket1.status = 'solved'
-      #   ticket2 = Readiness::Zendesk::Tickets.find!(client, 2) 
+      #   ticket2 = Readiness::Zendesk::Tickets.find!(client, 2)
       #   ticket2.status = 'pending'
       #   tickets = [ticket1, ticket2]
       #   updates = Readiness::Zendesk::Tickets.update_many!(client, tickets)
@@ -243,7 +243,7 @@ module Readiness
       #   config.url = 'https://example.zendesk.com/api/v2'
       #   client = Readiness::Zendesk::Client.new(config)
       #   ticket = Readiness::Zendesk::Tickets.find!(client, 123456)
-      #   comments = Readiness::Zendesk::Tickets.find!(client, ticket)
+      #   comments = Readiness::Zendesk::Tickets.comments(client, ticket)
       #   pp creates.select { |c| c['public'] == false }.count
       #   # => 12
       def self.comments(client, ticket, sort = 'created_at')
@@ -705,7 +705,7 @@ module Readiness
       #   config.token = 'test123abc'
       #   config.url = 'https://example.zendesk.com/api/v2'
       #   client = Readiness::Zendesk::Client.new(config)
-      #   tickets = Readiness::Zendesk::Tickets.find!(client, [35436, 35437])
+      #   tickets = Readiness::Zendesk::Tickets.find_many(client, [35436, 35437])
       #   pp ticket.count
       #   # => 2
       def self.find_many(client, tids)
@@ -864,7 +864,7 @@ module Readiness
       #   config.url = 'https://example.zendesk.com/api/v2'
       #   client = Readiness::Zendesk::Client.new(config)
       #   ticket = Readiness::Zendesk::Tickets.find!(client, 141)
-      #   redaction = Readiness::Zendesk::Tickets.redact_attachments!(client, ticket)
+      #   redaction = Readiness::Zendesk::Tickets.redact_attachments(client, ticket)
       #   pp redaction
       #   # => true
       def self.redact_attachments(client, ticket)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.36
+  version: 1.0.38
 platform: ruby
 authors:
 - Jason Colyer