mas-rad_core 0.0.39 → 0.0.40
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/models/firm.rb +6 -0
- data/lib/mas/firm_result.rb +11 -3
- data/lib/mas/rad_core/version.rb +1 -1
- data/spec/dummy/log/test.log +30341 -0
- data/spec/lib/mas/firm_result_spec.rb +9 -5
- data/spec/models/firm_spec.rb +16 -0
- metadata +16 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 4d2bf5991c9ce155d2e82753809377384105ab58
|
|
4
|
+
data.tar.gz: ef0b1eefcc08437b80a7d552352905274ed0042f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 75f47ba4680d399f13383da8a108f35addada2ce1eeda77d8e6d7984f9559b1c358b6e7ddae58fd73ef8f99c8093e14d56d8da828f08109012a4858d4c756414
|
|
7
|
+
data.tar.gz: 8d11d700fae2ff2f1801b49ebd0debba28ab6f56f26e0bc741f731a2d34a5ccb0fd5392ce69ed094b553b652e5deeddb3f74c90af42dbb434287d3ef001006ca
|
data/app/models/firm.rb
CHANGED
|
@@ -89,6 +89,12 @@ class Firm < ActiveRecord::Base
|
|
|
89
89
|
|
|
90
90
|
after_commit :geocode, if: :valid?
|
|
91
91
|
|
|
92
|
+
def telephone_number
|
|
93
|
+
return nil unless self[:telephone_number]
|
|
94
|
+
|
|
95
|
+
self[:telephone_number].gsub(' ', '')
|
|
96
|
+
end
|
|
97
|
+
|
|
92
98
|
def full_street_address
|
|
93
99
|
[address_line_one, address_line_two, address_postcode, 'United Kingdom'].delete_if(&:blank?).join(', ')
|
|
94
100
|
end
|
data/lib/mas/firm_result.rb
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
require 'uk_phone_numbers'
|
|
2
|
+
|
|
1
3
|
class FirmResult
|
|
2
4
|
DIRECTLY_MAPPED_FIELDS = [
|
|
3
5
|
:address_line_one,
|
|
@@ -5,7 +7,6 @@ class FirmResult
|
|
|
5
7
|
:address_town,
|
|
6
8
|
:address_county,
|
|
7
9
|
:address_postcode,
|
|
8
|
-
:telephone_number,
|
|
9
10
|
:website_address,
|
|
10
11
|
:email_address,
|
|
11
12
|
:free_initial_meeting,
|
|
@@ -36,8 +37,9 @@ class FirmResult
|
|
|
36
37
|
source = data['_source']
|
|
37
38
|
@id = source['_id']
|
|
38
39
|
@name = source['registered_name']
|
|
39
|
-
@total_advisers
|
|
40
|
-
@closest_adviser
|
|
40
|
+
@total_advisers = source['advisers'].count
|
|
41
|
+
@closest_adviser = data['sort'].last
|
|
42
|
+
@telephone_number = source['telephone_number']
|
|
41
43
|
|
|
42
44
|
(DIRECTLY_MAPPED_FIELDS + TYPES_OF_ADVICE_FIELDS).each do |field|
|
|
43
45
|
instance_variable_set("@#{field}", source[field.to_s])
|
|
@@ -64,5 +66,11 @@ class FirmResult
|
|
|
64
66
|
end
|
|
65
67
|
end
|
|
66
68
|
|
|
69
|
+
def telephone_number
|
|
70
|
+
return nil unless @telephone_number
|
|
71
|
+
|
|
72
|
+
UKPhoneNumbers.format(@telephone_number)
|
|
73
|
+
end
|
|
74
|
+
|
|
67
75
|
alias :free_initial_meeting? :free_initial_meeting
|
|
68
76
|
end
|
data/lib/mas/rad_core/version.rb
CHANGED