gitlab_support_readiness 1.0.99 → 1.0.101

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc7fd990882686085701557b01aace06ccec7bac9cc9da3511d7b376c887491
-  data.tar.gz: cbbbadf995335829623eff125c745c04c532fee08ffac889db18689f29a0dbbc
+  metadata.gz: 18d066501ccc3c72dd601e30f5084f239b2ba0fff4f79e8ecbbfda5e53d9e344
+  data.tar.gz: a1939980514c43c95a3b090c143931cf53fef850ae1513c162b41dca43dc79ae
 SHA512:
-  metadata.gz: ecc2ec436986dc13f4e2c332ad71100e240c4adeb6c93fb7561b0b5ed1a5403913d000dbde07cd3054f13bebf0306cdf7e5853d974c3023e342c909fa73f962b
-  data.tar.gz: 7b2b27ef716d35190cc29643c61adbb22b944e8ba629b5fd5113fb0a6ec44d541227b9f8d4ef2ed8b23ff6d7cdd5a1627a257b2e4cd090a8fe83acfb455f7708
+  metadata.gz: 7aec35c7cb5e2c8cefd09125bb10dbe5bd9fb2cd86f95dc797397ffe35acf8d3f2bb5b069818247f36f679e859835f21d2dc02da58d266e40d32884c7c7b3650
+  data.tar.gz: a9e53c57c6d23dafaf0e2b70ecc5bdc43bb2d045c12f3805fc337a53468e06481add0f251e03430364fc2aadf75c3f9b82a7d2af013734aa9cafdfd90d02e191

data/lib/support_readiness/repos/dynamic_content.rb

@@ -20,6 +20,7 @@ module Readiness
       # @param verbose [Boolean] Whether you want a detailed report or not
       # @return [Hash]
       def self.compare(zendesk_client, location = 'data', verbose = false)
+        @zendesk_client = zendesk_client
         @locales = Zendesk::Locales.list(zendesk_client)
         @from_repo = gather(location)
         @from_zendesk = Zendesk::DynamicContent.list(zendesk_client)
@@ -183,11 +184,14 @@ module Readiness
       #   pp repo.count
       #   # => 2
       def self.gather(location)
+        @ticket_fields = Readiness::Zendesk::TicketFields.list(@zendesk_client)
+        @ticket_forms = Readiness::Zendesk::TicketForms.list(@zendesk_client)
         @errors = []
         @location = location
         array = []
         Dir["#{@location}/*.yaml"].each do |f|
           object = YAML.safe_load_file(f)
+          object = convert_names_to_ids(object)
           data = {
             item: Zendesk::DynamicContent.new(object),
             variants: object['variants'].map { |v| Zendesk::DynamicContentVariants.new(v) }
@@ -199,6 +203,24 @@ module Readiness
         array
       end
 
+      ##
+      # Converts various user Strings to the proper ID value
+      #
+      # @author Jason Colyer
+      # @since 1.0.100
+      # @param content [Hash] The dynamic content information from the YAML file
+      # @return [Hash]
+      def self.convert_names_to_ids(dynamic_content)
+        dynamic_content['variants'].each_with_index do |v, i|
+          if v['content'] =~ /\[Form\:\ .*\]/
+            name = v['content'].split('[Form: ').last.split(']').first
+            ticket_form = Readiness::Zendesk::TicketForms.find_by_name(@zendesk_client, name, @ticket_forms)
+            dynamic_content['variants'][i]['content'] = v['content'].gsub("[Form: #{ticket_form.name}]", ticket_form.id.to_s)
+          end
+        end
+        dynamic_content
+      end
+
       ##
       # Outputs an error report and exits with a status code of 1
       #

data/lib/support_readiness/ticket_processor/account_blocked.rb

@@ -62,7 +62,7 @@ module Readiness
               @requester_gitlab = search.detect { |s| s.email.downcase == @requester.email.downcase }
               return failed_ps_block if @requester_gitlab.nil?
 
-              memberships = Readiness::GitLab::Users.memberships(@gitlab_admin_client, @requester, ['type=Namespace'])
+              memberships = Readiness::GitLab::Users.memberships(@gitlab_admin_client, @requester_gitlab, ['type=Namespace'])
               has_paid = false
               memberships.select { |m| m['access_level'] == 50 }.each do |m|
                 namespace = Readiness::GitLab::Namespaces.find(@gitlab_admin_client, m['source_id'])
@@ -82,7 +82,7 @@ module Readiness
               new_ticket = Readiness::Zendesk::Tickets.new
               new_ticket.id = @ticket.id
               new_ticket.status = 'solved'
-              new_ticket.comment = { body: ps_block_removed }
+              new_ticket.comment = { body: ps_block_removed_comment }
               new_ticket.custom_fields = [
                 { id: 360020735259, value: 'stage-frt' }
               ]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.99
+  version: 1.0.101
 platform: ruby
 authors:
 - Jason Colyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-01-09 00:00:00.000000000 Z
+date: 2025-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport