gitlab_support_readiness 1.0.112 → 1.0.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8edd59d6823d5030545aa74b9ce7dba68822470283bc7384a6e071ea04003f94
-  data.tar.gz: 8f0871238aa1a5d14879f036b1e0dbaeff16e3a507c17451b51461093ec4f843
+  metadata.gz: 93b6cb23dabf09e15246950b6429e48e2d4a97c0ebe5ad213108308c93fc5b4f
+  data.tar.gz: 49c4ee1dea90bc170e4bdb5296aa42d42cbd6c93a50d3afad5337ebe6c17908c
 SHA512:
-  metadata.gz: bc6f3c2f6f6a4408f1639a2276c74305417af57536bf3f6a0d7b268c0c7b85283613b93ef9454c44bd6f7b7fcf465d58e85cc8ea9fda18dd2d83f85329576097
-  data.tar.gz: b7af37d1003e016d0269015402781d45c9cb25827d66024f3a3d5e7911866e7b37cc723fcdbdb087921ac2032554ced35f0dc411f06b4382da9adbfb7bcd3f26
+  metadata.gz: 1f75945f11ba45b3751e3840e003044334db7b8909ab404f9c2d8bcda805323c5d79e5bb232028462432d0f319d06e5e772b2df3923f07b3985cb88a78a100ca
+  data.tar.gz: 01b0fa32643664ed94ce10ee8d07f8844cc7bdd091e7d9efe7912298f9733e6a92727d9dae4d70129c7477cf81b65feb1b76be9f680afa46a2799bcd6c70937a

data/lib/support_readiness/client.rb

@@ -249,73 +249,79 @@ module Readiness
     # @author Jason Colyer
     # @since 1.0.112
     # @param object [Object] The object to parse
-    def self.convert_conditions(object)
+    def self.convert_conditions(object, attribute_name = 'conditions')
       %w[any all].each do |type|
-        object['conditions'][type].each_with_index do |c, i|
+        object[attribute_name][type].each_with_index do |c, i|
           if c['field'] == 'group_id'
             group = Readiness::Zendesk::Groups.find_by_name(@zendesk_client, c['value'], @groups)
             unless group.nil?
-              object['conditions'][type][i]['value'] = group.id.to_s
+              object[attribute_name][type][i]['value'] = group.id.to_s
             end
           end
           if c['field'] == 'organization_id'
-            code = c['value']
+            code = c['value'].to_s
             next if code.empty?
             next if %r{^[0-9]+$}.match code
 
             search = Readiness::Zendesk::Search.organizations(@zendesk_client, "salesforce_id:#{code}")
             if search.count == 1
-              object['conditions'][type][i]['value'] = search.first.id.to_s
+              object[attribute_name][type][i]['value'] = search.first.id.to_s
             end
           end
           if c['field'] == 'satisfaction_reason_code'
             reason = Readiness::Zendesk::SatisfactionReasons.find_by_name(@zendesk_client, c['value'], @satisfaction_reasons)
             unless reason.nil?
-              object['conditions'][type][i]['value'] = reason.reason_code.to_s
+              object[attribute_name][type][i]['value'] = reason.reason_code.to_s
             end
           end
           if c['field'] == 'via_id'
             via_type = Readiness::Zendesk::ViaTypes.find_by_name(c['value'])
             unless via_type.nil?
-              object['conditions'][type][i]['value'] = via_type.id.to_s
+              object[attribute_name][type][i]['value'] = via_type.id.to_s
             end
           end
           if c['field'] == 'requester_role'
             role = Readiness::Zendesk::RequesterRoles.find_by_name(c['value'])
             unless role.nil?
-              object['conditions'][type][i]['value'] = role.id.to_s
+              object[attribute_name][type][i]['value'] = role.id.to_s
             end
           end
           if c['field'] == 'role'
             role = Readiness::Zendesk::TicketUserTypes.find_by_name(@zendesk_client, c['value'])
             unless role.nil?
-              object['conditions'][type][i]['value'] = role.id.to_s
+              object[attribute_name][type][i]['value'] = role.id.to_s
             end
           end
           if c['field'] == 'assignee_id'
             unless ['', 'current_user', 'requester_id'].include? c['value']
               search = Readiness::Zendesk::Search.users(@zendesk_client, "email:#{c['value']}")
               if search.count == 1
-                object['conditions'][type][i]['value'] = search.first.id.to_s
+                object[attribute_name][type][i]['value'] = search.first.id.to_s
               end
             end
           end
           if c['field'] == 'ticket_form_id'
-            if c['value'] =~ /Form\:\ /
+            if c['value'].to_s =~ /Form\:\ /
               name = c['value'].split('Form: ').last
               ticket_form = Readiness::Zendesk::TicketForms.find_by_name(@zendesk_client, name, @ticket_forms)
-              object['conditions'][type][i]['value'] = ticket_form.id.to_s
+              object[attribute_name][type][i]['value'] = ticket_form.id.to_s
             end
           end
-          if c['field'] =~ /Field\:\ /
+          if c['field'].to_s =~ /Field\:\ /
             name = c['field'].split('Field: ').last
             ticket_field = Readiness::Zendesk::TicketFields.find_by_name(@zendesk_client, name, @ticket_fields)
-            object['conditions'][type][i]['field'] = "custom_fields_#{ticket_field.id}"
+            if attribute_name == 'filter'
+              object[attribute_name][type][i]['field'] = "ticket_fields_#{ticket_field.id}"
+              field_option = ticket_field.custom_field_options.detect { |o| o.value == c['value'] }
+              object[attribute_name][type][i]['value'] = field_option.id.to_s unless field_option.nil?
+            else
+              object[attribute_name][type][i]['field'] = "custom_fields_#{ticket_field.id}"
+            end
           end
           if c['value'].to_s =~ /Schedule\:\ /
             name = c['value'].split('Schedule: ').last
             schedule = Readiness::Zendesk::Schedules.find_by_name(@zendesk_client, name, @schedules)
-            object['conditions'][type][i]['value'] = schedule.id.to_s
+            object[attribute_name][type][i]['value'] = schedule.id.to_s
           end
         end
       end

data/lib/support_readiness/repos/sla_policies.rb

@@ -48,6 +48,7 @@ module Readiness
       #   pp diffs[:updates.count]
       #   # => 1
       def self.compare(zendesk_client, location = 'data', verbose = false)
+        @zendesk_client = zendesk_client
         diffs = {
           updates: [],
           creates: []
@@ -133,11 +134,20 @@ module Readiness
       #   pp repo.count
       #   # => 35
       def self.gather(location = 'data')
+        @categories = Readiness::Zendesk::TriggerCategories.list(@zendesk_client)
+        @groups = Readiness::Zendesk::Groups.list(@zendesk_client)
+        @schedules = Readiness::Zendesk::Schedules.list(@zendesk_client)
+        @satisfaction_reasons = Readiness::Zendesk::SatisfactionReasons.list(@zendesk_client)
+        @targets = Readiness::Zendesk::Targets.list(@zendesk_client)
+        @ticket_fields = Readiness::Zendesk::TicketFields.list(@zendesk_client)
+        @ticket_forms = Readiness::Zendesk::TicketForms.list(@zendesk_client)
+        @webhooks = Readiness::Zendesk::Webhooks.list(@zendesk_client)
         @errors = []
         @location = location
         array = []
         Dir["#{@location}/*.yaml"].each do |f|
           object = YAML.safe_load_file(f)
+          object = convert_conditions(object, 'filter')
           validity_check(f, object)
           object['id'] = nil
           array.push(Zendesk::SLAs.new(object))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.112
+  version: 1.0.114
 platform: ruby
 authors:
 - Jason Colyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport