Fix geocode UserGroup (#14)

* Fix geocode UserGroup

* Refactor thanks to review

* Update version

app/forms/decidim/user_group_form.rb

@@ -21,7 +21,6 @@ class UserGroupForm < Form
     validates :nickname, presence: true
     validates :document_number, presence: true
     validates :phone, presence: true
-    validates :url, presence: true
     validates :scope_id, presence: true
     validates :address, presence: true
 
@@ -32,6 +31,7 @@ class UserGroupForm < Form
     validate :unique_email
     validate :unique_name
     validate :unique_nickname
+    validate :valid_url
 
     private
 
@@ -83,5 +83,19 @@ def unique_nickname
       errors.add :nickname, :taken
       false
     end
+
+    def valid_url
+      return unless url
+      errors.add(:url, :invalid) unless uri?(url)
+    end
+
+    def uri?(string)
+      uri = URI.parse(string)
+      %w(http https).include?(uri.scheme)
+    rescue URI::BadURIError
+      false
+    rescue URI::InvalidURIError
+      false
+    end
   end
 end

app/models/decidim/user_group.rb

@@ -16,9 +16,7 @@ class UserGroup < UserBaseEntity
     validate :correct_state
     validate :unique_document_number
 
-    geocoded_by :address
-
-    after_validation :geocode
+    after_validation :geocode!
 
     scope :verified, -> { where.not("extended_data->>'verified_at' IS ?", nil) }
     scope :rejected, -> { where.not("extended_data->>'rejected_at' IS ?", nil) }
@@ -106,6 +104,20 @@ def verify!
 
     private
 
+    # To automatically geocode objects with Geocoder
+    # they have to have two attributes/columns (float or decimal)
+    # called latitude and longitude (that we don't have)
+    # Here we search for the address without using ActiveRecord
+    def geocode!
+      result = Geocoder.search(address).first
+      return unless result
+
+      coordinates = result.data['Location']['DisplayPosition']
+      extended_data['latitude'] = coordinates["Latitude"]
+      extended_data['longitude'] =  coordinates["Longitude"]
+      save!
+    end
+
     # Private: Checks if the state user group is correct.
     def correct_state
       errors.add(:base, :invalid) if verified? && rejected?

app/views/decidim/sabarca/shared/_user_group.html.erb

@@ -8,7 +8,7 @@
       <br/>
       <%= user_group.phone %>
       </br>
-      <%= user_group.users.first.email %>
+      <%= user_group.email %>
     </div>
   </div>
 </div>

lib/decidim/sabarca/version.rb

@@ -2,6 +2,6 @@
 
 module Decidim
   module Sabarca
-    VERSION = "0.11.1"
+    VERSION = "0.11.2"
   end
 end