gitlab_support_readiness 1.0.93 → 1.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710aadd328be6b90bbde373f19ebe37ad8089aac5edf48b7515c155a80a08460
-  data.tar.gz: 5ab1fffc4616ed8ed02d5b243b845f0d060524e17a8cba9a893eb30d355abd34
+  metadata.gz: 7535177c20ccf51d51d851d1de39ac41637dd84909df860ec3a9fc526ee55e00
+  data.tar.gz: f9a495ad819800df0f3d38216d8643f7d0f14d987f204e9b69dca531c39a0d8b
 SHA512:
-  metadata.gz: c9eb9816acaa208ee8a7036037a13b2384f0de34c1198c1becd9fa674f5d35d64f5e8974ed250a8ed94a5e9c6594ae10e4f49e5a13a8f07b09f3ecefde488da8
-  data.tar.gz: 8cd5b9c2dc406c93c1707125dab200e621306797468d045d64c99f14cc4ed645246b82f421e50d1a3dac37eaab051bc68e3ba79a08136f0924aa5a525fb63c12
+  metadata.gz: fccf094da0fa1e9e834243ff3dc1b3fc412f89b481210709328719e30e15ad7e88bdff0e7dea4f6e1cf5e80c4d1904d08c947c4d9c181eef178a769ee8ba06e8
+  data.tar.gz: 2ae62ba826f27b9cc9b2b529b1574df63c465ab219a53cfbef6a33972ac2245767a0f88657ff01ae47c972eba718ede743ff986d775777e80ca2158ee8b8fc84

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 }
@@ -822,7 +823,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
 
@@ -1038,6 +1040,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'],
@@ -1067,7 +1070,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
 
       ##
@@ -228,7 +222,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 +448,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 +567,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/ticket_processor/account_blocked.rb

@@ -59,7 +59,7 @@ module Readiness
             elsif @user.note =~ /^User blocked as part of GitLab PS user migration/
               @requester = Readiness::Zendesk::Users.find!(@zendesk_client, @ticket.submitter_id)
               search = Readiness::GitLab::Users.search_by_email(@gitlab_admin_client, @requester.email)
-              @requster_gitlab = search.detect { |s| s.email.downcase == @requester.email.downcase }
+              @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'])
@@ -271,7 +271,7 @@ module Readiness
 
           To process the removal, an Owner of a top-level paid subscription must make the request.
 
-          Please consider having an Owner of a top-level paid subscription must make the request submit a new ticket to have this automted process unblock the requested user.
+          Please consider having an Owner of a top-level paid subscription must make the request submit a new ticket to have this automated process unblock the requested user.
 
           Thank you,
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_support_readiness
 version: !ruby/object:Gem::Version
-  version: 1.0.93
+  version: 1.0.95
 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