gitlab_support_readiness 1.0.140 → 1.0.142

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/support_readiness/salesforce/accounts.rb +26 -13
  3. data/lib/support_readiness/salesforce/contacts.rb +5 -1
  4. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 58efc340cfc245cc1886767aa1844074e19a71be9e8a6cfee928718f1b232cb7
4
- data.tar.gz: 2770ea8b4ef591ed814f8e5f45dc5b41625592ff5cd765716a444e38a1cb3eaf
3
+ metadata.gz: 67bbc46271453e55eef515cf35a12ee36a3afa63f877d30fd1084e919efbae1d
4
+ data.tar.gz: 86498e7bde800ad8af667b48fd8eb57c92dd8e75c0b8d9ff9f4a5ea2c8213c0e
5
5
  SHA512:
6
- metadata.gz: b7b7438d03598f7afef2e590b327d8e3322b5c6411605ecf8aedec76897bc26af42061c02b5dba86ed9b464281375f7fc98b1a7ba47cda770a9864b2e3e8fde1
7
- data.tar.gz: f1f9f3399befdf52e35c9dcc8f27fb3c2ed5ea7fec4b3880d16b0b59510c8c825f64c4fa886fbba3e4cc2e0a629c77f0b2ccf3d9843f8e7515d02df88c9d4d80
6
+ metadata.gz: 67986e99640f112eb8d22556922cdab2b97d1c98b67a98473ad9bb2be49cdf2020514a38a3a78c3dd67d6b771ff25c265d79dff65f02ca0dc7a689d92cf175bf
7
+ data.tar.gz: 264b5c42310ea4ff5e735f140c890db199b6005bb9a5ec1b2de35a1191ded10274b912c1ac87a161e02029aa9a1aa89d1aaff878013af07b66ced58182266d6c
data/lib/support_readiness/salesforce/accounts.rb CHANGED
@@ -464,15 +464,17 @@ module Readiness
464
464
 
465
465
  if subs.include?('sub_usgov_12x5') || subs.include?('sub_usgov_24x7') || account.Support_Instance__c == 'federal-support'
466
466
  global_subs_present = false
467
- grouped = account.Zuora__R00N40000001lGjTEAU__r.group_by { |z| z.Zuora__ProductName__c }
467
+ grouped = account.Zuora__R00N40000001lGjTEAU__r.group_by { |z| z.Zuora__Subscription__c }
468
468
  grouped.each_value do |charges|
469
- next if charges.detect { |c| SubscriptionDefinitions.usgov_12x5.include? c.Name }
470
- next if charges.detect { |c| SubscriptionDefinitions.usgov_24x7.include? c.Name }
471
- next if charges.detect { |c| SubscriptionDefinitions.fedramp.include? c.Name }
472
- next if charges.detect { |c| SubscriptionDefinitions.sm_ultimate.include? c.Name } && account.Support_Instance__c == 'federal-support'
473
- next if charges.detect { |c| SubscriptionDefinitions.sm_premium.include? c.Name } && account.Support_Instance__c == 'federal-support'
474
- next if charges.detect { |c| SubscriptionDefinitions.sm_starter.include? c.Name } && account.Support_Instance__c == 'federal-support'
475
-
469
+ valid_charges = charges.select { |c| c.Subscription_Status__c == 'Active' && Date.parse(c.Zuora__EffectiveEndDate__c) >= Date.today }
470
+ next if valid_charges.count.zero?
471
+ next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.usgov_12x5.include?(x) }
472
+ next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.usgov_24x7.include?(x) }
473
+ next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.fedramp.include?(x) }
474
+ next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.sm_ultimate.include?(x) } && account.Support_Instance__c == 'federal-support'
475
+ next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.sm_premium.include?(x) } && account.Support_Instance__c == 'federal-support'
476
+ next if valid_charges.map { |a| a.Name }.any? { |x| SubscriptionDefinitions.sm_starter.include?(x) } && account.Support_Instance__c == 'federal-support'
477
+
476
478
  global_subs_present = true
477
479
  end
478
480
  return true unless global_subs_present
@@ -492,7 +494,8 @@ module Readiness
492
494
  SELECT
493
495
  Zuora__Account__r.Account_ID_18__c,
494
496
  Zuora__Account__r.Support_Hold__c,
495
- Zuora__Account__r.Restricted_Account__c
497
+ Zuora__Account__r.Restricted_Account__c,
498
+ Zuora__Subscription__c
496
499
  FROM Zuora__SubscriptionProductCharge__c
497
500
  WHERE
498
501
  Zuora__Account__r.Account_ID_18__c = '#{aid}' AND
@@ -507,7 +510,11 @@ module Readiness
507
510
  '24x7 US Citizen Support - 1 Year',
508
511
  '24x7 US Citizen Support - 2 Year',
509
512
  '24x7 US Citizen Support - 3 Year',
510
- '24x7 US Citizen Support - Monthly'
513
+ '24x7 US Citizen Support - Monthly',
514
+ 'GitLab Dedicated for US Public Sector - Ultimate - 1 Year',
515
+ 'GitLab Dedicated for US Public Sector - Ultimate - 2 Year',
516
+ 'GitLab Dedicated for US Public Sector - Ultimate - 3 Year',
517
+ 'GitLab Dedicated for US Public Sector - Ultimate - Monthly'
511
518
  ) OR
512
519
  Zuora__Account__r.Support_Instance__c = 'federal-support'
513
520
  )
@@ -549,7 +556,8 @@ module Readiness
549
556
  Zuora__EffectiveEndDate__c,
550
557
  Zuora__Quantity__c,
551
558
  Zuora__TotalContractValue__c,
552
- Subscription_Status__c
559
+ Subscription_Status__c,
560
+ Zuora__Subscription__c
553
561
  FROM Zuora__R00N40000001lGjTEAU__r
554
562
  WHERE
555
563
  Zuora__EffectiveEndDate__c != NULL
@@ -606,7 +614,8 @@ module Readiness
606
614
  Zuora__EffectiveEndDate__c,
607
615
  Zuora__Quantity__c,
608
616
  Zuora__TotalContractValue__c,
609
- Subscription_Status__c
617
+ Subscription_Status__c,
618
+ Zuora__Subscription__c
610
619
  FROM Zuora__R00N40000001lGjTEAU__r
611
620
  )
612
621
  FROM Account
@@ -628,7 +637,11 @@ module Readiness
628
637
  '24x7 US Citizen Support - 1 Year',
629
638
  '24x7 US Citizen Support - 2 Year',
630
639
  '24x7 US Citizen Support - 3 Year',
631
- '24x7 US Citizen Support - Monthly'
640
+ '24x7 US Citizen Support - Monthly',
641
+ 'GitLab Dedicated for US Public Sector - Ultimate - 1 Year',
642
+ 'GitLab Dedicated for US Public Sector - Ultimate - 2 Year',
643
+ 'GitLab Dedicated for US Public Sector - Ultimate - 3 Year',
644
+ 'GitLab Dedicated for US Public Sector - Ultimate - Monthly'
632
645
  ) OR
633
646
  Zuora__Account__r.Support_Instance__c = 'federal-support'
634
647
  )
data/lib/support_readiness/salesforce/contacts.rb CHANGED
@@ -91,7 +91,11 @@ module Readiness
91
91
  '24x7 US Citizen Support - 1 Year',
92
92
  '24x7 US Citizen Support - 2 Year',
93
93
  '24x7 US Citizen Support - 3 Year',
94
- '24x7 US Citizen Support - Monthly'
94
+ '24x7 US Citizen Support - Monthly',
95
+ 'GitLab Dedicated for US Public Sector - Ultimate - 1 Year',
96
+ 'GitLab Dedicated for US Public Sector - Ultimate - 2 Year',
97
+ 'GitLab Dedicated for US Public Sector - Ultimate - 3 Year',
98
+ 'GitLab Dedicated for US Public Sector - Ultimate - Monthly'
95
99
  ) OR
96
100
  Zuora__Account__r.Support_Instance__c = 'federal-support'
97
101
  )
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gitlab_support_readiness
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.140
4
+ version: 1.0.142
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jason Colyer
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2025-05-08 00:00:00.000000000 Z
11
+ date: 2025-05-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport