Handle nil exception with price override

killbill · Nov 28, 2024 · 72d188f · 72d188f
1 parent 53acbc1
commit 72d188f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -8,6 +8,7 @@ AllCops:
     - 'app/controllers/kaui/engine_controller.rb' # Too much magic going on
   NewCops: enable
   SuggestExtensions: false
+  TargetRubyVersion: 3.2
 
 Gemspec/RequiredRubyVersion:
   Enabled: false

diff --git a/app/controllers/kaui/account_timelines_controller.rb b/app/controllers/kaui/account_timelines_controller.rb
@@ -34,20 +34,16 @@ def show
 
     def download
       timeline = Kaui::AccountTimeline.find_by_account_id(params.require(:account_id), 'FULL', options_for_klient)
-      start_date = params[:startDate]
-      end_date = params[:endDate]
       start_date = begin
-        Date.parse(start_date)
+        Date.parse(params[:startDate])
       rescue StandardError
         nil
       end
       end_date = begin
-        Date.parse(end_date)
+        Date.parse(params[:endDate])
       rescue StandardError
         nil
       end
-      start_date = params[:startDate].present? ? Date.parse(params[:startDate]) : nil
-      end_date = params[:endDate].present? ? Date.parse(params[:endDate]) : nil
 
       event_type = params[:eventType]
       @account = timeline.account

diff --git a/app/helpers/kaui/subscription_helper.rb b/app/helpers/kaui/subscription_helper.rb
@@ -98,7 +98,7 @@ def humanized_price_override(sub, separation = ', ', open_bracket = '', close_br
         ''
       else
         current_plan = sub.prices.select { |price| price['phaseType'] == sub.phase_type && price['planName'] == sub.plan_name }
-        price_override = current_plan.last['fixedPrice'] || current_plan.last['recurringPrice']
+        price_override = current_plan.last ? (current_plan.last['fixedPrice'] || current_plan.last['recurringPrice']) : nil
 
         if price_override.blank?
           ''