gitlab_support_readiness 1.0.64 → 1.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37103ba6b2b5b0da5927de56d8b8c5af2340d9db6e00f19df569f909efcb8734
-  data.tar.gz: c7eb9093306155290df97a2609d531767dccc079ddacebf94c2ac05259287bb8
+  metadata.gz: 555e87ceef9f70d14577d0c9d419f56648f3cfad7e4e177169970b041937d2c9
+  data.tar.gz: 5bc0fc6ddd09c51732523a7d33265500d9ee11b3231a09a8697eec2f22f3cd5e
 SHA512:
-  metadata.gz: 2e3e09c09efaa56732fb6f48ebddadb70964d3315e8d3bb88643b5b63319806b9b12d87f545d14d94cbbcb31570d4d4952c159b0d9eb7100a4434667a8c82240
-  data.tar.gz: bdd10f86a80025a655bd96065ffde08cba5c42afcd7f31cac317b413c97f22c32f60c2771028b159b1f20f83d803f8668780bef42caa07c0a6cad117522e026d
+  metadata.gz: 9bc0544b8ac79a53e228879be0c736746cf01fe095f4ab1d8a84ec0a82e4222f01c799fa463bb986d79f978d987246ce81762dc940f3259086a0572c6c0da6f5
+  data.tar.gz: 4c4aaf705453f395ad3a32bf4e6de36ab1cfb23b755568e85e22743bfe07d414da119d45523abab573b37959b21be8a82e6daa1c61acd6e12dff126e0041cc4f

data/lib/support_readiness/support_super_form_processor/gratis_request.rb

@@ -137,6 +137,9 @@ module Readiness
         query = Readiness::Salesforce::Queries.new(opportunity_query)
         results = Readiness::Salesforce::Queries.run!(@sfdc_client, query)
         results.first
+      rescue Restforce::ErrorCode::InvalidQueryFilterOperator
+        puts 'Invalid SFDC opp link provided'
+        Readiness::SupportSuperFormProcessor::Shared.invalid_opportunity_link(requester, opportunity_link)
       end
       
       ##

data/lib/support_readiness/support_super_form_processor/shared.rb

@@ -206,6 +206,22 @@ module Readiness
         exit 0
       end
 
+      ##
+      # Sends an email if not a valid opportunity link for a gratis request
+      #
+      # @author Jason Colyer
+      # @since 1.0.65
+      def self.invalid_opportunity_link(requester, opportunity_link)
+        email = Readiness::Mailgun::Emails.new
+        email.from = 'GitLab Support <techsupport@gitlab.com>'
+        email.to = requester.email
+        email.subject = 'Invalid Support Super Form submission'
+        email.text = invalid_opportunity_link_message(requester, opportunity_link)
+        Readiness::Mailgun::Emails.send!(mailgun_client, email)
+        puts "Invalid opportunity link provided for gratis request by #{requester.email}"
+        exit 0
+      end
+
       ##
       # Sets a global variable for an instance of {Readiness::Mailgun::Client}
       #
@@ -470,6 +486,30 @@ module Readiness
         STRING
       end
 
+      ##
+      # Returns the email body message when not a valid SFDC opportunity link for gratis requests
+      #
+      # @author Jason Colyer
+      # @since 1.0.65
+      # @return [String]
+      def self.invalid_opportunity_link_message(requester, opportunity_link)
+        <<~STRING
+          Greetings @#{requester.username} ,
+
+          Your recent gratis request was not able to be filed due to the following issues:
+
+          - Invalid SFDC opportunity link provided: #{opportunity_link}
+
+          Please rectify the above issues and re-submit your request via the form.
+
+          Thank you,
+
+          GitLab Support
+
+          Please note this is sent from an unmonitored inbox and replies to it will not be followed up on.
+        STRING
+      end
+
       def self.sfdc_account_string(link)
         id = if link =~ /lightning/
           link.split('/')[-2]

data/lib/support_readiness/ticket_processor/account_blocked.rb

@@ -25,8 +25,10 @@ module Readiness
         exit 0 if @ticket.is_a? Hash
 
         email = @ticket.custom_fields.detect { |t| t['id'] == 4413932829586 }['value']
-        puts 'No email in the field, so nothing to autowork' if email.to_s = ''
-        exit 0 if email.to_s = ''
+        if email.to_s == ''
+          puts 'No email in the field, so nothing to autowork'
+          exit 0
+        end
 
         search = Readiness::GitLab::Users.search_by_email(@gitlab_admin_client, email)
         @user = search.detect { |s| s.email.downcase == email.downcase }
@@ -92,7 +94,7 @@ module Readiness
               issue = Readiness::GitLab::Issues.new
               issue.title = "Account Reinstatement - #{@user.username}"
               issue.description = blocked_issue_body
-              created = Readiness::GitLab::Issues.create!(@gitlab_client, issue)
+              created = Readiness::GitLab::Issues.create!(@gitlab_client, project, issue)
               puts 'done'
               print 'Updating ticket...'
               

data/lib/support_readiness/ticket_processor/link_tagger.rb

@@ -31,6 +31,19 @@ module Readiness
         comments = Readiness::Zendesk::Tickets.comments(@zendesk_client, @ticket)
         public_comments = comments.select { |c| c['public'] }
         comment_to_check = public_comments.select { |c| c['author_id'] == @user.id }.last
+        if comment_to_check.nil?
+          public_comments.reverse.each do |comment|
+            new_user = Readiness::Zendesk::Users.find(@zendesk_client, comment['author_id'])
+            next unless %w[admin agent].include? new_user.role
+
+            comment_to_check = comment
+            break
+          end
+        end
+        if comment_to_check.nil?
+          puts 'Cannot determine a comment to check, so exiting...'
+          exit 0
+        end
         tags_to_add = []
         Nokogiri::HTML(comment_to_check['html_body']).css('a').each do |p|
           link = p['href'].split('?').first.split('#').first

data/lib/support_readiness/ticket_processor/locked_account.rb

@@ -22,7 +22,7 @@ module Readiness
         puts 'No ticket found, so no org notes to add' if @ticket.is_a? Hash
         exit 0 if @ticket.is_a? Hash
 
-        puts 'Ticket is closed, so no org notes to add' if @ticket.status == 'closed'
+        puts 'Ticket is closed, so ticket to process' if @ticket.status == 'closed'
         exit 0 if @ticket.status == 'closed'
 
         new_ticket = Readiness::Zendesk::Tickets.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.64
+  version: 1.0.66
 platform: ruby
 authors:
 - Jason Colyer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-12-05 00:00:00.000000000 Z
+date: 2024-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport