gitlab_support_readiness 1.0.140 → 1.0.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58efc340cfc245cc1886767aa1844074e19a71be9e8a6cfee928718f1b232cb7
-  data.tar.gz: 2770ea8b4ef591ed814f8e5f45dc5b41625592ff5cd765716a444e38a1cb3eaf
+  metadata.gz: 6c22707bbc72baf4c49f86148cd62aad4a0d2caeabba21ffe396da4badd00cce
+  data.tar.gz: a572730c97a17cf5973bbb6c8eb9348b0faf794acf9a24380b6a52c45efb24d4
 SHA512:
-  metadata.gz: b7b7438d03598f7afef2e590b327d8e3322b5c6411605ecf8aedec76897bc26af42061c02b5dba86ed9b464281375f7fc98b1a7ba47cda770a9864b2e3e8fde1
-  data.tar.gz: f1f9f3399befdf52e35c9dcc8f27fb3c2ed5ea7fec4b3880d16b0b59510c8c825f64c4fa886fbba3e4cc2e0a629c77f0b2ccf3d9843f8e7515d02df88c9d4d80
+  metadata.gz: f17ac283e6a3acced8d3f32a696701010be42a6975b3119abafa04c6e255ac9ec080d58681733fd52b95429071736b135691ec5f7c491415d401e479a7fb37dc
+  data.tar.gz: ecb62953393ffd331fa80aea271e167f1fb064ae8a9ec0e343cad128fccc8d5982e4cdb2322a6d523c0e724a29644984653ce9b2958abd4bb7010a5889a0b72b

data/lib/support_readiness/salesforce/accounts.rb

@@ -464,15 +464,17 @@ module Readiness
       
         if subs.include?('sub_usgov_12x5') || subs.include?('sub_usgov_24x7') || account.Support_Instance__c == 'federal-support'
           global_subs_present = false
-          grouped = account.Zuora__R00N40000001lGjTEAU__r.group_by { |z| z.Zuora__ProductName__c }
+          grouped = account.Zuora__R00N40000001lGjTEAU__r.group_by { |z| z.Zuora__Subscription__c }
           grouped.each_value do |charges|
-            next if charges.detect { |c| SubscriptionDefinitions.usgov_12x5.include? c.Name }
-            next if charges.detect { |c| SubscriptionDefinitions.usgov_24x7.include? c.Name }
-            next if charges.detect { |c| SubscriptionDefinitions.fedramp.include? c.Name }
-            next if charges.detect { |c| SubscriptionDefinitions.sm_ultimate.include? c.Name } && account.Support_Instance__c == 'federal-support'
-            next if charges.detect { |c| SubscriptionDefinitions.sm_premium.include? c.Name } && account.Support_Instance__c == 'federal-support'
-            next if charges.detect { |c| SubscriptionDefinitions.sm_starter.include? c.Name } && account.Support_Instance__c == 'federal-support'
-      
+            valid_charges = charges.select { |c| c.Subscription_Status__c == 'Active' && Date.parse(c.Zuora__EffectiveEndDate__c) >= Date.today }
+            next if valid_charges.count.zero?
+            next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.usgov_12x5.include?(x) }
+            next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.usgov_24x7.include?(x) }
+            next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.fedramp.include?(x) }
+            next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.sm_ultimate.include?(x) } && account.Support_Instance__c == 'federal-support'
+            next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.sm_premium.include?(x) } && account.Support_Instance__c == 'federal-support'
+            next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.sm_starter.include?(x) } && account.Support_Instance__c == 'federal-support'            
+
             global_subs_present = true
           end
           return true unless global_subs_present
@@ -492,7 +494,8 @@ module Readiness
           SELECT
             Zuora__Account__r.Account_ID_18__c,
             Zuora__Account__r.Support_Hold__c,
-            Zuora__Account__r.Restricted_Account__c
+            Zuora__Account__r.Restricted_Account__c,
+            Zuora__Subscription__c
           FROM Zuora__SubscriptionProductCharge__c
           WHERE
             Zuora__Account__r.Account_ID_18__c = '#{aid}' AND
@@ -549,7 +552,8 @@ module Readiness
                 Zuora__EffectiveEndDate__c,
                 Zuora__Quantity__c,
                 Zuora__TotalContractValue__c,
-                Subscription_Status__c
+                Subscription_Status__c,
+                Zuora__Subscription__c
               FROM Zuora__R00N40000001lGjTEAU__r
               WHERE
                 Zuora__EffectiveEndDate__c != NULL
@@ -606,7 +610,8 @@ module Readiness
                 Zuora__EffectiveEndDate__c,
                 Zuora__Quantity__c,
                 Zuora__TotalContractValue__c,
-                Subscription_Status__c
+                Subscription_Status__c,
+                Zuora__Subscription__c
               FROM Zuora__R00N40000001lGjTEAU__r
             )
           FROM Account

metadata

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