From 1b1475540162ffa89cd6167a0b07501fad663307 Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 9 Apr 2021 12:15:47 +1000
Subject: [PATCH] Reduce AbcSize for rubocop

---
 app/services/address_geocoder.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/services/address_geocoder.rb b/app/services/address_geocoder.rb
index b090afb569..ba63715667 100644
--- a/app/services/address_geocoder.rb
+++ b/app/services/address_geocoder.rb
@@ -18,13 +18,17 @@ class AddressGeocoder
   attr_reader :address
 
   def geocode_address
+    address_parts.select(&:present?).join(', ')
+  end
+
+  def address_parts
     [
       address.address1,
       address.address2,
       address.zipcode,
       address.city,
-      address.country.andand.name,
-      address.state.andand.name
-    ].select(&:present?).join(', ')
+      address.country&.name,
+      address.state&.name
+    ]
   end
 end