From 2a76b1972f2ee08767d5051f1861dfc1c4d38d0f Mon Sep 17 00:00:00 2001
From: Neal Chambers <macanudo@yahoo.com>
Date: Fri, 28 Jul 2023 16:39:43 +0900
Subject: [PATCH] Safely autocorrect Lint/SafeNavigationChain

Inspecting 1480 files
........................................................................................................................................................................................................................................................................................................................................W............................W..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................

Offenses:

app/models/spree/line_item.rb:283:55: W: [Corrected] Lint/SafeNavigationChain: Do not chain ordinary method call after safe navigation operator.
        self.final_weight_volume = variant&.unit_value * quantity
                                                      ^^^^^^^^^^^
app/models/spree/line_item.rb:283:57: C: [Corrected] Layout/SpaceAroundMethodCallOperator: Avoid using spaces around a method call operator.
        self.final_weight_volume = variant&.unit_value&. * quantity
                                                        ^
app/models/spree/stock/availability_validator.rb:31:77: W: [Corrected] Lint/SafeNavigationChain: Do not chain ordinary method call after safe navigation operator.
        return line_item.order.shipments.first if line_item.order&.shipments.any?
                                                                            ^^^^^

1480 files inspected, 3 offenses detected, 3 offenses corrected
---
 .rubocop_todo.yml                                | 9 ---------
 app/models/spree/line_item.rb                    | 2 +-
 app/models/spree/stock/availability_validator.rb | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index fd8103bcdf..80d87556df 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -141,15 +141,6 @@ Lint/RedundantSafeNavigation:
   Exclude:
     - 'app/models/spree/payment.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: present?, blank?, presence, try, try!, in?
-Lint/SafeNavigationChain:
-  Exclude:
-    - 'app/models/spree/line_item.rb'
-    - 'app/models/spree/stock/availability_validator.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
diff --git a/app/models/spree/line_item.rb b/app/models/spree/line_item.rb
index 0f487a4913..1631832ca5 100644
--- a/app/models/spree/line_item.rb
+++ b/app/models/spree/line_item.rb
@@ -280,7 +280,7 @@ module Spree
       if final_weight_volume.present? && quantity_was > 0
         self.final_weight_volume = final_weight_volume * quantity / quantity_was
       elsif variant&.unit_value.present?
-        self.final_weight_volume = variant&.unit_value * quantity
+        self.final_weight_volume = variant&.unit_value&.* quantity
       end
     end
   end
diff --git a/app/models/spree/stock/availability_validator.rb b/app/models/spree/stock/availability_validator.rb
index fc94efd1c6..513b9fbc61 100644
--- a/app/models/spree/stock/availability_validator.rb
+++ b/app/models/spree/stock/availability_validator.rb
@@ -28,7 +28,7 @@ module Spree
 
       def line_item_shipment(line_item)
         return line_item.target_shipment if line_item.target_shipment
-        return line_item.order.shipments.first if line_item.order&.shipments.any?
+        return line_item.order.shipments.first if line_item.order&.shipments&.any?
       end
 
       # Overrides Spree v2.0.4 validate method version to: