gitlab_support_readiness 1.0.94 → 1.0.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0efdf1a5044eb63d59e75b1e33031f2bda552a260e14f0f21d197352b775a636
-  data.tar.gz: d38913632e80d586b547ec097dd04ed0994adf1062d1315e1e2926e24e979d90
+  metadata.gz: 754610e153f321d1eadcbd227ef10672ba943d7432cc8c3604d7a82553cf0777
+  data.tar.gz: 06d952982516a7dd04590b2c0217518e052d9d10989a8a5aa229e915d300c3fb
 SHA512:
-  metadata.gz: 2a05908eb47230f799c3760d42b7d269e682f824593a0296ffd8294787369ecc6f4fbd5ecb5ca531990428b7f46e5944689922f06b9ce26836dbbcbeb859407b
-  data.tar.gz: baf32e622e56a63b9126235969697f76eda9a990d303e2fb0fd8963194b0f8d0a59e7b1c583629303c252fcb9d33c4246a0d2605ddd55794f8d1d11455d7a6e0
+  metadata.gz: 83274d91d5ab5c61ad276e26afed4b3f8b4cdccc9bd29ef7105978b8a3533efc690ade271bf88af70a4a72a77e6781baf39c7b3d18afc6cd551ea81051f1065a
+  data.tar.gz: bd40779668abdcd1658cca7d7bd57edbcb8322767e5b51d4d61eda7617145cd8e1e7a964a2507571f1de41d09a57b93c3cff45823c265b19aaad9b69bb081804

data/lib/support_readiness/repos/zendesk_salesforce_sync.rb

@@ -90,6 +90,7 @@ module Readiness
           org = Readiness::Zendesk::Organizations.find!(zendesk_client, diff['id'])
           print "Marking #{org.name} as not being in SFDC..."
           org.organization_fields['not_in_sfdc'] = true
+          org.organization_fields['date_marked_not_in_sfdc'] = Date.today.iso8601
           update = Readiness::Zendesk::Organizations.update!(zendesk_client, org)
           puts 'done'
           index = @organizations.index { |o| o['id'] == update.id }
@@ -751,6 +752,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => org.organization_fields['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => org.organization_fields['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => org.organization_fields['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => org.organization_fields['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => org.organization_fields['sub_consumption_eap'],
           'sub_consumption_storage' => org.organization_fields['sub_consumption_storage'],
           'sub_proserv' => org.organization_fields['sub_proserv'],
@@ -805,6 +807,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => org.organization_fields['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => org.organization_fields['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => org.organization_fields['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => org.organization_fields['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => org.organization_fields['sub_consumption_eap'],
           'sub_consumption_storage' => org.organization_fields['sub_consumption_storage'],
           'sub_proserv' => org.organization_fields['sub_proserv'],
@@ -822,7 +825,8 @@ module Readiness
           'sub_ss_ase' => org.organization_fields['sub_ss_ase'],
           'sub_other' => org.organization_fields['sub_other'],
           'not_in_sfdc' => org.organization_fields['not_in_sfdc'],
-          'support_hold' => org.organization_fields['support_hold']
+          'support_hold' => org.organization_fields['support_hold'],
+          'date_marked_not_in_sfdc' => org.organization_fields['date_marked_not_in_sfdc'],
         }
       end
 
@@ -999,6 +1003,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => account['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => account['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => account['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => account['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => account['sub_consumption_eap'],
           'sub_consumption_storage' => account['sub_consumption_storage'],
           'sub_dotcom_premium' => account['sub_dotcom_premium'],
@@ -1038,6 +1043,7 @@ module Readiness
           'expiration_date' => account['expiration_date'],
           'greatly_expired' => account['greatly_expired'],
           'health_score' => account['health_score'],
+          'market_segment' => account['market_segment'],
           'not_in_sfdc' => account['not_in_sfdc'],
           'restricted_account' => account['restricted_account'],
           'salesforce_id' => account['salesforce_id'],
@@ -1050,6 +1056,7 @@ module Readiness
           'sub_consumption_cicd_minutes' => account['sub_consumption_cicd_minutes'],
           'sub_consumption_duo_enterprise' => account['sub_consumption_duo_enterprise'],
           'sub_consumption_duo_premium' => account['sub_consumption_duo_premium'],
+          'sub_consumption_duo_amazon_q' => account['sub_consumption_duo_amazon_q'],
           'sub_consumption_eap' => account['sub_consumption_eap'],
           'sub_consumption_storage' => account['sub_consumption_storage'],
           'sub_dotcom_premium' => account['sub_dotcom_premium'],
@@ -1067,7 +1074,8 @@ module Readiness
           'sub_usgov_24x7' => account['sub_usgov_24x7'],
           'support_hold' => account['support_hold'],
           'support_level' => account['support_level'],
-          'technical_account_manager' => account['technical_account_manager']
+          'technical_account_manager' => account['technical_account_manager'],
+          'date_marked_not_in_sfdc' => account['date_marked_not_in_sfdc']
         }
       end
 

data/lib/support_readiness/salesforce/accounts.rb

@@ -62,16 +62,10 @@ module Readiness
         query = Queries.new(us_gov_check_query_string(aid))
         results = Queries.run!(client, query)
         return false if results.count.zero?
-        return false if results.first.Support_Hold__c
-        return false unless results.first.Restricted_Account__c.nil?
-        return true if results.first.Support_Instance__c == 'federal-support'
-
-        if results.first.Account_Demographics_Territory__c =~ /^PUBSEC/
-          if results.first.Account_Demographics_Territory__c != 'PUBSEC_'
-            return true unless results.first.Account_Demographics_Territory__c =~ /SLED/
-          end
-        end
-        false
+        return false if results.first.Zuora__Account__r.Support_Hold__c
+        return false unless results.first.Zuora__Account__r.Restricted_Account__c.nil?
+
+        true
       end
 
       ##
@@ -155,6 +149,7 @@ module Readiness
           "sub_consumption_cicd_minutes" => subscriptions.include?('sub_consumption_cicd_minutes'),
           "sub_consumption_duo_enterprise" => subscriptions.include?('sub_consumption_duo_enterprise'),
           "sub_consumption_duo_premium" => subscriptions.include?('sub_consumption_duo_premium'),
+          "sub_consumption_duo_amazon_q" => subscriptions.include?('sub_consumption_duo_amazon_q'),
           "sub_consumption_eap" => subscriptions.include?('sub_consumption_eap'),
           "sub_consumption_storage" => subscriptions.include?('sub_consumption_storage'),
           "sub_proserv" => subscriptions.include?('sub_proserv'),
@@ -211,6 +206,7 @@ module Readiness
           "sub_consumption_cicd_minutes" => subscriptions.include?('sub_consumption_cicd_minutes'),
           "sub_consumption_duo_enterprise" => subscriptions.include?('sub_consumption_duo_enterprise'),
           "sub_consumption_duo_premium" => subscriptions.include?('sub_consumption_duo_premium'),
+          "sub_consumption_duo_amazon_q" => subscriptions.include?('sub_consumption_duo_amazon_q'),
           "sub_consumption_eap" => subscriptions.include?('sub_consumption_eap'),
           "sub_consumption_storage" => subscriptions.include?('sub_consumption_storage'),
           "sub_proserv" => subscriptions.include?('sub_proserv'),
@@ -228,7 +224,8 @@ module Readiness
           "sub_ss_ase" => subscriptions.include?('sub_ss_ase'),
           "sub_other" => subscriptions.include?('sub_other'),
           "not_in_sfdc" => false,
-          "support_hold" => account.Support_Hold__c
+          "support_hold" => account.Support_Hold__c,
+          "date_marked_not_in_sfdc" => nil
         }
       end
 
@@ -453,24 +450,27 @@ module Readiness
       def self.us_gov_check_query_string(aid)
         <<~STRING
           SELECT
-            Restricted_Account__c,
-            Support_Hold__c,
-            Support_Instance__c,
-            Account_Demographics_Territory__c,
+            Zuora__Account__r.Account_ID_18__c,
+            Zuora__Account__r.Support_Hold__c,
+            Zuora__Account__r.Restricted_Account__c
+          FROM Zuora__SubscriptionProductCharge__c
+          WHERE
+            Zuora__Account__r.Account_ID_18__c = '#{aid}' AND
+            Subscription_Status__c = 'Active' AND
+            Zuora__EffectiveEndDate__c >= #{(Date.today - 91.days).iso8601} AND
             (
-              SELECT
-                Id,
-                Name,
-                Zuora__ProductName__c,
-                Zuora__EffectiveEndDate__c,
-                Zuora__Quantity__c,
-                Zuora__TotalContractValue__c,
-                Subscription_Status__c
-              FROM Zuora__R00N40000001lGjTEAU__r
+              Name IN (
+                '12x5 US Citizen Support - 1 Year',
+                '12x5 US Citizen Support - 2 Year',
+                '12x5 US Citizen Support - 3 Year',
+                '12x5 US Citizen Support - Monthly',
+                '24x7 US Citizen Support - 1 Year',
+                '24x7 US Citizen Support - 2 Year',
+                '24x7 US Citizen Support - 3 Year',
+                '24x7 US Citizen Support - Monthly'
+              ) OR
+              Zuora__Account__r.Support_Instance__c = 'federal-support'
             )
-          FROM Account
-          WHERE
-          Account_ID_18__c = '#{aid}'
         STRING
       end
 
@@ -569,17 +569,28 @@ module Readiness
             )
           FROM Account
           WHERE
-            Type IN ('Customer', 'Former Customer') AND
-            (
+            Id IN
               (
-                Account_Demographics_Territory__c LIKE 'PUBSEC%' AND
-                Account_Demographics_Territory__c != 'PUBSEC_' AND
-                (
-                  NOT Account_Demographics_Territory__c LIKE '%SLED%'
-                )
-              ) OR
-              Support_Instance__c = 'federal-support'
-            )
+                SELECT
+                  Zuora__Account__c
+                FROM Zuora__SubscriptionProductCharge__c
+                WHERE
+                  Subscription_Status__c = 'Active' AND
+                  Zuora__EffectiveEndDate__c >= #{(Date.today - 91.days).iso8601} AND
+                  (
+                    Name IN (
+                      '12x5 US Citizen Support - 1 Year',
+                      '12x5 US Citizen Support - 2 Year',
+                      '12x5 US Citizen Support - 3 Year',
+                      '12x5 US Citizen Support - Monthly',
+                      '24x7 US Citizen Support - 1 Year',
+                      '24x7 US Citizen Support - 2 Year',
+                      '24x7 US Citizen Support - 3 Year',
+                      '24x7 US Citizen Support - Monthly'
+                    ) OR
+                    Zuora__Account__r.Support_Instance__c = 'federal-support'
+                  )
+              )
         QUERY
       end
     end

data/lib/support_readiness/salesforce/contacts.rb

@@ -64,9 +64,7 @@ module Readiness
             Name,
             Email,
             Account.Account_ID_18__c,
-            Account.Type,
-            Account.Name,
-            Role__c
+            Account.Name
           FROM Contact
           WHERE
             Inactive_Contact__c = false AND
@@ -77,16 +75,27 @@ module Readiness
               NOT Email LIKE '%gitlab.com'
             ) AND
             Account.Type IN ('Customer', 'Former Customer') AND
-            (
-              (
-                Account.Account_Demographics_Territory__c LIKE 'PUBSEC%' AND
-                Account.Account_Demographics_Territory__c != 'PUBSEC_' AND
+            AccountId IN (
+              SELECT
+                Zuora__Account__c
+              FROM Zuora__SubscriptionProductCharge__c
+              WHERE
+                Subscription_Status__c = 'Active' AND
+                Zuora__EffectiveEndDate__c >= #{(Date.today - 91.days).iso8601} AND
                 (
-                  NOT Account.Account_Demographics_Territory__c LIKE '%SLED%'
+                  Name IN (
+                    '12x5 US Citizen Support - 1 Year',
+                    '12x5 US Citizen Support - 2 Year',
+                    '12x5 US Citizen Support - 3 Year',
+                    '12x5 US Citizen Support - Monthly',
+                    '24x7 US Citizen Support - 1 Year',
+                    '24x7 US Citizen Support - 2 Year',
+                    '24x7 US Citizen Support - 3 Year',
+                    '24x7 US Citizen Support - Monthly'
+                  ) OR
+                  Zuora__Account__r.Support_Instance__c = 'federal-support'
                 )
-              ) OR
-              Account.Support_Instance__c = 'federal-support'
-            )
+            )      
         QUERY
       end
     end

data/lib/support_readiness/salesforce/subscription_definitions.rb

@@ -78,6 +78,25 @@ module Readiness
         ]
       end
 
+      ##
+      # Defines Consumption => GitLab Duo with Amazon Q subscriptions
+      #
+      # @author Jason Colyer
+      # @since 1.0.40
+      # @return [Array]
+      def self.consumption_duo_amazon_q
+        [
+          'Dedicated - GitLab Duo with Amazon Q - 1 Year',
+          'Dedicated - GitLab Duo with Amazon Q - 2 Year',
+          'Dedicated - GitLab Duo with Amazon Q - 3 Year',
+          'Dedicated - GitLab Duo with Amazon Q - Monthly',
+          'Self-Managed - GitLab Duo with Amazon Q - 1 Year',
+          'Self-Managed - GitLab Duo with Amazon Q - 2 Year',
+          'Self-Managed - GitLab Duo with Amazon Q - 3 Year',
+          'Self-Managed - GitLab Duo with Amazon Q - Monthly'
+        ]
+      end
+
       ##
       # Defines Consumption => CI/CD Minutes subscriptions
       #

data/lib/support_readiness/ticket_processor/organization_notes.rb

@@ -359,6 +359,7 @@ module Readiness
         addons.push('AI') if @organization.organization_fields['sub_consumption_ai']
         addons.push('GitLab Duo Premium') if @organization.organization_fields['sub_consumption_duo_premium']
         addons.push('GitLab Duo Enterprise') if @organization.organization_fields['sub_consumption_duo_enterprise']
+        addons.push('GitLab Duo with Amazon Q') if @organization.organization_fields['sub_consumption_duo_amazon_q']
         addons.push('AI addon') if @organization.organization_fields['sub_consumption_ai']
         addons.push('Success Advanced') if @organization.organization_fields['sub_ss_success_growth']
         addons.push('Success Signature') if @organization.organization_fields['sub_ss_success_enterprise']

metadata

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