mas-rad_core 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb9db5a0fd81f696ed5a1c6dcbba990bf24fe66a
-  data.tar.gz: 9009e02c96124243e412f337f430b95ae7dd9633
+  metadata.gz: 40e538321611ab43bde99c5560d783c4e6cc94c0
+  data.tar.gz: 13f3492b04b69563e8a295a43fda7bb8b89b91ba
 SHA512:
-  metadata.gz: 4ca3c8152dcf16dde34f242369c84f6caf4889a6c02d7e7c7b060d5a4072a7b4744e17bb05f5650a8ef790cc57c46a89190fc45d71ae50e788ffed5e4dafa43f
-  data.tar.gz: 7bd5a3a224682504174a4205364b10ffb64309c0e76b5fedf71480fceadcc46bbbafea32a0a6c4a29e8085cdc5411800a1b65b8a803dbd23bf3b19d2f9ab014f
+  metadata.gz: 6fe763a16a30a53637db0b054185aa2f454b8ac71fe9e0cd325935a73cf2424fcf9280f6bc682f045375b2082121bc0ad3b0bea96f3e3f466aab96c7f583b128
+  data.tar.gz: 6cbed78f68d63f29bf9caccc59befd8bf5a7e94ba47830233549bb02ef3b0dd366b5f7ba710580f4e4786c6fdcda3e8d54f376e4e3abbb71fd1a9770f855fa21

data/app/jobs/geocode_adviser_job.rb

@@ -1,8 +1,15 @@
 class GeocodeAdviserJob < ActiveJob::Base
   def perform(adviser)
-    coordinates = Geocoder.coordinates(adviser.full_street_address)
-    coordinates ? stat(:success) : stat(:failed)
-    adviser.geocode!(coordinates)
+    Geocoder.coordinates(adviser.full_street_address).tap do |coords|
+      adviser.geocode!(coords)
+
+      if coords
+        IndexFirmJob.perform_later(adviser.firm)
+        stat :success
+      else
+        stat :failed
+      end
+    end
   end
 
   private

data/app/models/adviser.rb

@@ -12,8 +12,6 @@ class Adviser < ActiveRecord::Base
 
   before_validation :upcase_postcode
 
-  after_save :schedule_indexing, if: -> { valid? && geocoded? }
-
   validates_acceptance_of :confirmed_disclaimer, accept: true
 
   validates :travel_distance,
@@ -40,7 +38,11 @@ class Adviser < ActiveRecord::Base
   end
 
   def geocoded?
-    latitude.present? && longitude.present?
+    coordinates.compact.present?
+  end
+
+  def coordinates
+    [latitude, longitude]
   end
 
   def field_order
@@ -60,10 +62,6 @@ class Adviser < ActiveRecord::Base
     end
   end
 
-  def schedule_indexing
-    IndexFirmJob.perform_later(firm)
-  end
-
   def upcase_postcode
     postcode.upcase! if postcode.present?
   end

data/app/models/geocodable.rb

@@ -1,4 +1,8 @@
 module Geocodable
+  def self.included(model)
+    model.scope :geocoded, -> { model.where.not(latitude: nil, longitude: nil) }
+  end
+
   def latitude=(value)
     value = value.to_f.round(6) unless value.nil?
     write_attribute(:latitude, value)

data/app/serializers/firm_serializer.rb

@@ -12,6 +12,10 @@ class FirmSerializer < ActiveModel::Serializer
 
   has_many :advisers
 
+  def advisers
+    object.advisers.geocoded
+  end
+
   def postcode_searchable
     object.postcode_searchable?
   end

data/lib/mas/rad_core/version.rb

@@ -1,5 +1,5 @@
 module MAS
   module RadCore
-    VERSION = '0.0.12'
+    VERSION = '0.0.13'
   end
 end