gitlab_support_readiness 1.0.37 → 1.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e459cc3f2cb6630193b9782e6d9b679e8cbd9f1700682f52de8345e9a3f4e970
-  data.tar.gz: 17d46a1beaa0fd0fe550616d8a607b82e298dfa4581f6aaa89dedcfac7d0f373
+  metadata.gz: 9b1330c4fb2dc431a85de88f941a158751eb98d45431c567669d0913fe8bacd1
+  data.tar.gz: d40b44310ef4c8217507178164924e83faccf9827d843778a1b71b5562b5e313
 SHA512:
-  metadata.gz: 660521337677a451df9fdefe8a74e10161bf2ab3c7cbb0c0ba3ddf7b5c82c499d6fecdc679bd79f2c129ed9ae374281bcf299e79de88b0e3b6093df67ed0b49e
-  data.tar.gz: 14d7ef1485caf2c3f10cc16f1a7015cbb29000bcab4e39691a0796639b86e1243e4c1939012bd3651745172e760e4652c2eb808d49dd475cf13f6e72fa0ff231
+  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
       #

metadata

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