gitlab_support_readiness 1.0.139 → 1.0.141

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 23fed8b2cfd4e5e3aa98f3eb31716442e1892be031f2deaf9280a2d65f643689
4
- data.tar.gz: 86f2ed10556f1b83e776409018bc19245f6cf3a3e3630f796d4d79fff42a0cab
3
+ metadata.gz: 6c22707bbc72baf4c49f86148cd62aad4a0d2caeabba21ffe396da4badd00cce
4
+ data.tar.gz: a572730c97a17cf5973bbb6c8eb9348b0faf794acf9a24380b6a52c45efb24d4
5
5
  SHA512:
6
- metadata.gz: 248d13cc2f45f0d01822eaceb2d0091f32b64f52d384131ae29536b5001f90c896e7a3c0476f7a40251e11c87284e5ea943fa78c56ac682b964bc660c91d21be
7
- data.tar.gz: ab58f3fdc1c5f029367c329101be7ea61d593c1928db043131d7e5b4c3487c3739215cdbbd50e8494a92d28e95f6a6e61413b617f65386bbf75db6e6c91c1297
6
+ metadata.gz: f17ac283e6a3acced8d3f32a696701010be42a6975b3119abafa04c6e255ac9ec080d58681733fd52b95429071736b135691ec5f7c491415d401e479a7fb37dc
7
+ data.tar.gz: ecb62953393ffd331fa80aea271e167f1fb064ae8a9ec0e343cad128fccc8d5982e4cdb2322a6d523c0e724a29644984653ce9b2958abd4bb7010a5889a0b72b
@@ -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
@@ -549,7 +552,8 @@ module Readiness
549
552
  Zuora__EffectiveEndDate__c,
550
553
  Zuora__Quantity__c,
551
554
  Zuora__TotalContractValue__c,
552
- Subscription_Status__c
555
+ Subscription_Status__c,
556
+ Zuora__Subscription__c
553
557
  FROM Zuora__R00N40000001lGjTEAU__r
554
558
  WHERE
555
559
  Zuora__EffectiveEndDate__c != NULL
@@ -606,7 +610,8 @@ module Readiness
606
610
  Zuora__EffectiveEndDate__c,
607
611
  Zuora__Quantity__c,
608
612
  Zuora__TotalContractValue__c,
609
- Subscription_Status__c
613
+ Subscription_Status__c,
614
+ Zuora__Subscription__c
610
615
  FROM Zuora__R00N40000001lGjTEAU__r
611
616
  )
612
617
  FROM Account
@@ -148,14 +148,6 @@ module Readiness
148
148
  # @return [Array]
149
149
  def self.consumption_storage
150
150
  [
151
- 'Dedicated - Storage 10GB - 1 Year',
152
- 'Dedicated - Storage 10GB - 2 Year',
153
- 'Dedicated - Storage 10GB - 3 Year',
154
- 'Dedicated - Storage 10GB - Monthly',
155
- 'GitLab Dedicated for US Public Sector - Storage 10GB - 1 Year',
156
- 'GitLab Dedicated for US Public Sector - Storage 10GB - 2 Year',
157
- 'GitLab Dedicated for US Public Sector - Storage 10GB - 3 Year',
158
- 'GitLab Dedicated for US Public Sector - Storage 10GB - Monthly',
159
151
  'Gitlab Storage 10GB - 1 Year'
160
152
  ]
161
153
  end
@@ -542,6 +534,10 @@ module Readiness
542
534
  # @return [Array]
543
535
  def self.gitlab_dedicated
544
536
  [
537
+ 'Dedicated - Storage 10GB - 1 Year',
538
+ 'Dedicated - Storage 10GB - 2 Year',
539
+ 'Dedicated - Storage 10GB - 3 Year',
540
+ 'Dedicated - Storage 10GB - Monthly',
545
541
  'Dedicated - Ultimate - 1 Year',
546
542
  'Dedicated - Ultimate - 2 Year',
547
543
  'Dedicated - Ultimate - 3 Year',
@@ -559,6 +555,10 @@ module Readiness
559
555
  # @return [Array]
560
556
  def self.fedramp
561
557
  [
558
+ 'GitLab Dedicated for US Public Sector - Storage 10GB - 1 Year',
559
+ 'GitLab Dedicated for US Public Sector - Storage 10GB - 2 Year',
560
+ 'GitLab Dedicated for US Public Sector - Storage 10GB - 3 Year',
561
+ 'GitLab Dedicated for US Public Sector - Storage 10GB - Monthly',
562
562
  'GitLab Dedicated for US Public Sector - Ultimate - 1 Year',
563
563
  'GitLab Dedicated for US Public Sector - Ultimate - 2 Year',
564
564
  'GitLab Dedicated for US Public Sector - Ultimate - 3 Year',
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.139
4
+ version: 1.0.141
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-06 00:00:00.000000000 Z
11
+ date: 2025-05-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport