gitlab_support_readiness 1.0.63 → 1.0.65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1e57174c750ee75156bc2a08ce18e44cb04cb5a9013362f1191e5d98f96cd87
-  data.tar.gz: '08344544702bc9135a6fe7566263d1c3a41fcc45fe821e2b1b887800ab196d20'
+  metadata.gz: 7b7912aaaceff61c5330ff68593cdb3d02b885234628735b6e021df027290b10
+  data.tar.gz: d6917d2e6e7d9df2df7e6583af3160cdf46782d0d223ef9502ad8efece2f2a5b
 SHA512:
-  metadata.gz: 4749188c898198a2e94a2e0c4cf565d13c634d22f6b7796882beb931fac9e7ea5ec6e777d3958723805a7d7ac29050491415791a0b169e06931fab0830297bb3
-  data.tar.gz: f44809e58873b9128762eff888312ddeb54e33e86dd697085aba7f37f2d03afe90f4670adb0218dfad20315a7dc34ebbe8ead384b79bdf4d9114d7291e7a81c5
+  metadata.gz: ed0d01911c128ee9eb52a814a055e107322816b42041035aabe3ad6d33f21c87b39178d472105a37034143554e90e6d5a01bd0f1a823d2162f29c8c6baaecafd
+  data.tar.gz: '0079272673ae45ce6a8cc899ec621d316b001938fcea7373fd33c64e247cf6c5ab9a9fb7cef024e803715a5580aa8044889db3f720cb61ff979bcd331b23948b'

data/lib/support_readiness/repos/zendesk_salesforce_sync.rb

@@ -1068,10 +1068,7 @@ module Readiness
       end
 
       def self.sfdc_links(sfdc_id)
-        [
-          "<https://gitlab.my.salesforce.com/#{sfdc_id}|Classic>",
-          "<https://gitlab.lightning.force.com/lightning/r/Account/#{sfdc_id}/view|Lightning>"
-        ].join(' | ')
+          "<https://gitlab.lightning.force.com/lightning/r/Account/#{sfdc_id}/view|#{sfdc_id}>"
       end
 
       def self.global_slack_message(org)

data/lib/support_readiness/support_super_form_processor/enable_us_government.rb

@@ -216,8 +216,8 @@ module Readiness
           A request has been filed to enable US Government Support for a SFDC account. The details are as follows:
 
           - Requester: @#{requester.username}
-          - SFDC Account: [#{account.Account_ID_18__c}](https://gitlab.my.salesforce.com/#{account.Account_ID_18__c})
-          - SFDC Opportunity: [#{opportunity.Account_ID_18__c}](https://gitlab.my.salesforce.com/#{opportunity.Account_ID_18__c})
+          - SFDC Account: [#{account.Account_ID_18__c}](https://gitlab.lightning.force.com/lightning/r/Account/#{account.Account_ID_18__c}/view)
+          - SFDC Opportunity: [#{opportunity.Id}](https://gitlab.lightning.force.com/lightning/r/Opportunity/#{opportunity.Id}/view)
           - Product Charges on SFDC account:
           #{account.Zuora__R00N40000001lGjTEAU__r.map { |r| "  - #{r.Name}" }.join("\n")}
 

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,15 +486,38 @@ 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]
         else
           link.split('/').last
         end
-        classic = "<a href='https://gitlab.my.salesforce.com/#{id}' target='_blank'>Classic</a>"
-        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/Account/#{id}/view' target='_blank'>Lightning</a>"
-        "SFDC Account: #{id} (#{classic} | #{lightning})"
+        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/Account/#{id}/view' target='_blank'>#{id}</a>"
+        "SFDC Account: #{lightning}"
       end
 
       def self.sfdc_opportunity_string(link)
@@ -487,9 +526,8 @@ module Readiness
         else
           link.split('/').last
         end
-        classic = "<a href='https://gitlab.my.salesforce.com/#{id}' target='_blank'>Classic</a>"
-        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/Opportunity/#{id}/view' target='_blank'>Lightning</a>"
-        "SFDC Opportunity: #{id} (#{classic} | #{lightning})"
+        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/Opportunity/#{id}/view' target='_blank'>#{id}</a>"
+        "SFDC Opportunity: #{lightning}"
       end
 
       def self.sfdc_upload_string(link)
@@ -498,9 +536,8 @@ module Readiness
         else
           link.split('/').last
         end
-        classic = "<a href='https://gitlab.my.salesforce.com/#{id}' target='_blank'>Classic</a>"
-        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/ContentDocument/#{id}/view' target='_blank'>Lightning</a>"
-        "Customer verification proof: #{id} (#{classic} | #{lightning})"
+        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/ContentDocument/#{id}/view' target='_blank'>#{id}</a>"
+        "Customer verification proof: #{lightning}"
       end
 
       def self.sfdc_chattr_string(link)
@@ -509,9 +546,8 @@ module Readiness
         else
           link.split('/').last
         end
-        classic = "<a href='https://gitlab.my.salesforce.com/#{id}' target='_blank'>Classic</a>"
-        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/#{id}/view' target='_blank'>Lightning</a>"
-        "Chattr link containing approval: #{id} (#{classic} | #{lightning})"
+        lightning = "<a href='https://gitlab.lightning.force.com/lightning/r/#{id}/view' target='_blank'>#{id}</a>"
+        "Chattr link containing approval: #{lightning}"
       end
     end
   end

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 }

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.63
+  version: 1.0.65
 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