mas-rad_core 0.0.12 → 0.0.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/jobs/geocode_adviser_job.rb +10 -3
- data/app/models/adviser.rb +5 -7
- data/app/models/geocodable.rb +4 -0
- data/app/serializers/firm_serializer.rb +4 -0
- data/lib/mas/rad_core/version.rb +1 -1
- data/spec/dummy/log/test.log +146883 -0
- data/spec/jobs/geocode_adviser_job_spec.rb +13 -3
- data/spec/models/adviser_spec.rb +0 -18
- data/spec/serializers/firm_serializer_spec.rb +8 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 40e538321611ab43bde99c5560d783c4e6cc94c0
|
4
|
+
data.tar.gz: 13f3492b04b69563e8a295a43fda7bb8b89b91ba
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 6fe763a16a30a53637db0b054185aa2f454b8ac71fe9e0cd325935a73cf2424fcf9280f6bc682f045375b2082121bc0ad3b0bea96f3e3f466aab96c7f583b128
|
7
|
+
data.tar.gz: 6cbed78f68d63f29bf9caccc59befd8bf5a7e94ba47830233549bb02ef3b0dd366b5f7ba710580f4e4786c6fdcda3e8d54f376e4e3abbb71fd1a9770f855fa21
|
@@ -1,8 +1,15 @@
|
|
1
1
|
class GeocodeAdviserJob < ActiveJob::Base
|
2
2
|
def perform(adviser)
|
3
|
-
|
4
|
-
|
5
|
-
|
3
|
+
Geocoder.coordinates(adviser.full_street_address).tap do |coords|
|
4
|
+
adviser.geocode!(coords)
|
5
|
+
|
6
|
+
if coords
|
7
|
+
IndexFirmJob.perform_later(adviser.firm)
|
8
|
+
stat :success
|
9
|
+
else
|
10
|
+
stat :failed
|
11
|
+
end
|
12
|
+
end
|
6
13
|
end
|
7
14
|
|
8
15
|
private
|
data/app/models/adviser.rb
CHANGED
@@ -12,8 +12,6 @@ class Adviser < ActiveRecord::Base
|
|
12
12
|
|
13
13
|
before_validation :upcase_postcode
|
14
14
|
|
15
|
-
after_save :schedule_indexing, if: -> { valid? && geocoded? }
|
16
|
-
|
17
15
|
validates_acceptance_of :confirmed_disclaimer, accept: true
|
18
16
|
|
19
17
|
validates :travel_distance,
|
@@ -40,7 +38,11 @@ class Adviser < ActiveRecord::Base
|
|
40
38
|
end
|
41
39
|
|
42
40
|
def geocoded?
|
43
|
-
|
41
|
+
coordinates.compact.present?
|
42
|
+
end
|
43
|
+
|
44
|
+
def coordinates
|
45
|
+
[latitude, longitude]
|
44
46
|
end
|
45
47
|
|
46
48
|
def field_order
|
@@ -60,10 +62,6 @@ class Adviser < ActiveRecord::Base
|
|
60
62
|
end
|
61
63
|
end
|
62
64
|
|
63
|
-
def schedule_indexing
|
64
|
-
IndexFirmJob.perform_later(firm)
|
65
|
-
end
|
66
|
-
|
67
65
|
def upcase_postcode
|
68
66
|
postcode.upcase! if postcode.present?
|
69
67
|
end
|
data/app/models/geocodable.rb
CHANGED
data/lib/mas/rad_core/version.rb
CHANGED