gitlab_support_readiness 1.0.94 → 1.0.95

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0efdf1a5044eb63d59e75b1e33031f2bda552a260e14f0f21d197352b775a636
4
- data.tar.gz: d38913632e80d586b547ec097dd04ed0994adf1062d1315e1e2926e24e979d90
3
+ metadata.gz: 7535177c20ccf51d51d851d1de39ac41637dd84909df860ec3a9fc526ee55e00
4
+ data.tar.gz: f9a495ad819800df0f3d38216d8643f7d0f14d987f204e9b69dca531c39a0d8b
5
5
  SHA512:
6
- metadata.gz: 2a05908eb47230f799c3760d42b7d269e682f824593a0296ffd8294787369ecc6f4fbd5ecb5ca531990428b7f46e5944689922f06b9ce26836dbbcbeb859407b
7
- data.tar.gz: baf32e622e56a63b9126235969697f76eda9a990d303e2fb0fd8963194b0f8d0a59e7b1c583629303c252fcb9d33c4246a0d2605ddd55794f8d1d11455d7a6e0
6
+ metadata.gz: fccf094da0fa1e9e834243ff3dc1b3fc412f89b481210709328719e30e15ad7e88bdff0e7dea4f6e1cf5e80c4d1904d08c947c4d9c181eef178a769ee8ba06e8
7
+ data.tar.gz: 2ae62ba826f27b9cc9b2b529b1574df63c465ab219a53cfbef6a33972ac2245767a0f88657ff01ae47c972eba718ede743ff986d775777e80ca2158ee8b8fc84
@@ -90,6 +90,7 @@ module Readiness
90
90
  org = Readiness::Zendesk::Organizations.find!(zendesk_client, diff['id'])
91
91
  print "Marking #{org.name} as not being in SFDC..."
92
92
  org.organization_fields['not_in_sfdc'] = true
93
+ org.organization_fields['date_marked_not_in_sfdc'] = Date.today.iso8601
93
94
  update = Readiness::Zendesk::Organizations.update!(zendesk_client, org)
94
95
  puts 'done'
95
96
  index = @organizations.index { |o| o['id'] == update.id }
@@ -822,7 +823,8 @@ module Readiness
822
823
  'sub_ss_ase' => org.organization_fields['sub_ss_ase'],
823
824
  'sub_other' => org.organization_fields['sub_other'],
824
825
  'not_in_sfdc' => org.organization_fields['not_in_sfdc'],
825
- 'support_hold' => org.organization_fields['support_hold']
826
+ 'support_hold' => org.organization_fields['support_hold'],
827
+ 'date_marked_not_in_sfdc' => org.organization_fields['date_marked_not_in_sfdc'],
826
828
  }
827
829
  end
828
830
 
@@ -1038,6 +1040,7 @@ module Readiness
1038
1040
  'expiration_date' => account['expiration_date'],
1039
1041
  'greatly_expired' => account['greatly_expired'],
1040
1042
  'health_score' => account['health_score'],
1043
+ 'market_segment' => account['market_segment'],
1041
1044
  'not_in_sfdc' => account['not_in_sfdc'],
1042
1045
  'restricted_account' => account['restricted_account'],
1043
1046
  'salesforce_id' => account['salesforce_id'],
@@ -1067,7 +1070,8 @@ module Readiness
1067
1070
  'sub_usgov_24x7' => account['sub_usgov_24x7'],
1068
1071
  'support_hold' => account['support_hold'],
1069
1072
  'support_level' => account['support_level'],
1070
- 'technical_account_manager' => account['technical_account_manager']
1073
+ 'technical_account_manager' => account['technical_account_manager'],
1074
+ 'date_marked_not_in_sfdc' => account['date_marked_not_in_sfdc']
1071
1075
  }
1072
1076
  end
1073
1077
 
@@ -62,16 +62,10 @@ module Readiness
62
62
  query = Queries.new(us_gov_check_query_string(aid))
63
63
  results = Queries.run!(client, query)
64
64
  return false if results.count.zero?
65
- return false if results.first.Support_Hold__c
66
- return false unless results.first.Restricted_Account__c.nil?
67
- return true if results.first.Support_Instance__c == 'federal-support'
68
-
69
- if results.first.Account_Demographics_Territory__c =~ /^PUBSEC/
70
- if results.first.Account_Demographics_Territory__c != 'PUBSEC_'
71
- return true unless results.first.Account_Demographics_Territory__c =~ /SLED/
72
- end
73
- end
74
- false
65
+ return false if results.first.Zuora__Account__r.Support_Hold__c
66
+ return false unless results.first.Zuora__Account__r.Restricted_Account__c.nil?
67
+
68
+ true
75
69
  end
76
70
 
77
71
  ##
@@ -228,7 +222,8 @@ module Readiness
228
222
  "sub_ss_ase" => subscriptions.include?('sub_ss_ase'),
229
223
  "sub_other" => subscriptions.include?('sub_other'),
230
224
  "not_in_sfdc" => false,
231
- "support_hold" => account.Support_Hold__c
225
+ "support_hold" => account.Support_Hold__c,
226
+ "date_marked_not_in_sfdc" => nil
232
227
  }
233
228
  end
234
229
 
@@ -453,24 +448,27 @@ module Readiness
453
448
  def self.us_gov_check_query_string(aid)
454
449
  <<~STRING
455
450
  SELECT
456
- Restricted_Account__c,
457
- Support_Hold__c,
458
- Support_Instance__c,
459
- Account_Demographics_Territory__c,
451
+ Zuora__Account__r.Account_ID_18__c,
452
+ Zuora__Account__r.Support_Hold__c,
453
+ Zuora__Account__r.Restricted_Account__c
454
+ FROM Zuora__SubscriptionProductCharge__c
455
+ WHERE
456
+ Zuora__Account__r.Account_ID_18__c = '#{aid}' AND
457
+ Subscription_Status__c = 'Active' AND
458
+ Zuora__EffectiveEndDate__c >= #{(Date.today - 91.days).iso8601} AND
460
459
  (
461
- SELECT
462
- Id,
463
- Name,
464
- Zuora__ProductName__c,
465
- Zuora__EffectiveEndDate__c,
466
- Zuora__Quantity__c,
467
- Zuora__TotalContractValue__c,
468
- Subscription_Status__c
469
- FROM Zuora__R00N40000001lGjTEAU__r
460
+ Name IN (
461
+ '12x5 US Citizen Support - 1 Year',
462
+ '12x5 US Citizen Support - 2 Year',
463
+ '12x5 US Citizen Support - 3 Year',
464
+ '12x5 US Citizen Support - Monthly',
465
+ '24x7 US Citizen Support - 1 Year',
466
+ '24x7 US Citizen Support - 2 Year',
467
+ '24x7 US Citizen Support - 3 Year',
468
+ '24x7 US Citizen Support - Monthly'
469
+ ) OR
470
+ Zuora__Account__r.Support_Instance__c = 'federal-support'
470
471
  )
471
- FROM Account
472
- WHERE
473
- Account_ID_18__c = '#{aid}'
474
472
  STRING
475
473
  end
476
474
 
@@ -569,17 +567,28 @@ module Readiness
569
567
  )
570
568
  FROM Account
571
569
  WHERE
572
- Type IN ('Customer', 'Former Customer') AND
573
- (
570
+ Id IN
574
571
  (
575
- Account_Demographics_Territory__c LIKE 'PUBSEC%' AND
576
- Account_Demographics_Territory__c != 'PUBSEC_' AND
577
- (
578
- NOT Account_Demographics_Territory__c LIKE '%SLED%'
579
- )
580
- ) OR
581
- Support_Instance__c = 'federal-support'
582
- )
572
+ SELECT
573
+ Zuora__Account__c
574
+ FROM Zuora__SubscriptionProductCharge__c
575
+ WHERE
576
+ Subscription_Status__c = 'Active' AND
577
+ Zuora__EffectiveEndDate__c >= #{(Date.today - 91.days).iso8601} AND
578
+ (
579
+ Name IN (
580
+ '12x5 US Citizen Support - 1 Year',
581
+ '12x5 US Citizen Support - 2 Year',
582
+ '12x5 US Citizen Support - 3 Year',
583
+ '12x5 US Citizen Support - Monthly',
584
+ '24x7 US Citizen Support - 1 Year',
585
+ '24x7 US Citizen Support - 2 Year',
586
+ '24x7 US Citizen Support - 3 Year',
587
+ '24x7 US Citizen Support - Monthly'
588
+ ) OR
589
+ Zuora__Account__r.Support_Instance__c = 'federal-support'
590
+ )
591
+ )
583
592
  QUERY
584
593
  end
585
594
  end
@@ -64,9 +64,7 @@ module Readiness
64
64
  Name,
65
65
  Email,
66
66
  Account.Account_ID_18__c,
67
- Account.Type,
68
- Account.Name,
69
- Role__c
67
+ Account.Name
70
68
  FROM Contact
71
69
  WHERE
72
70
  Inactive_Contact__c = false AND
@@ -77,16 +75,27 @@ module Readiness
77
75
  NOT Email LIKE '%gitlab.com'
78
76
  ) AND
79
77
  Account.Type IN ('Customer', 'Former Customer') AND
80
- (
81
- (
82
- Account.Account_Demographics_Territory__c LIKE 'PUBSEC%' AND
83
- Account.Account_Demographics_Territory__c != 'PUBSEC_' AND
78
+ AccountId IN (
79
+ SELECT
80
+ Zuora__Account__c
81
+ FROM Zuora__SubscriptionProductCharge__c
82
+ WHERE
83
+ Subscription_Status__c = 'Active' AND
84
+ Zuora__EffectiveEndDate__c >= #{(Date.today - 91.days).iso8601} AND
84
85
  (
85
- NOT Account.Account_Demographics_Territory__c LIKE '%SLED%'
86
+ Name IN (
87
+ '12x5 US Citizen Support - 1 Year',
88
+ '12x5 US Citizen Support - 2 Year',
89
+ '12x5 US Citizen Support - 3 Year',
90
+ '12x5 US Citizen Support - Monthly',
91
+ '24x7 US Citizen Support - 1 Year',
92
+ '24x7 US Citizen Support - 2 Year',
93
+ '24x7 US Citizen Support - 3 Year',
94
+ '24x7 US Citizen Support - Monthly'
95
+ ) OR
96
+ Zuora__Account__r.Support_Instance__c = 'federal-support'
86
97
  )
87
- ) OR
88
- Account.Support_Instance__c = 'federal-support'
89
- )
98
+ )
90
99
  QUERY
91
100
  end
92
101
  end
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.94
4
+ version: 1.0.95
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-01-06 00:00:00.000000000 Z
11
+ date: 2025-01-08 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport