caboose-rets 0.1.172 → 0.1.177

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe1bb33340eca294f66a11d3b0d30cdb1f3c0bafac94d98f6c9e35cc5b936b6
-  data.tar.gz: 33e44cedfeed2d4dcc0aeff18f51c874617a7dd21b255d09ab883f6adea3c700
+  metadata.gz: 91703c4b5ddc0ad895c33f112660b0f3d5d89edb1bfe677783883b24509d0119
+  data.tar.gz: ed94f877eaf291ba16c49f7eca34326a24680bc06845ed8699ec7aa38924c305
 SHA512:
-  metadata.gz: 5c896ef5ef41cc6747e6ada1d539aa8274f754bcb25874bd7615c82f6f70c255718e9b00118682cf1dc45742031938fb6f9fa120a55c83dbf8dbe34ffeb2ebad
-  data.tar.gz: 3d0ed4a79ab4e28422570891a49c93ff1245fe12047b42f37544e5893e73c88719bff47c1b363ec83d4e18999a333b5a251ea5e021110d0e3cf6b71e1a74d8c9
+  metadata.gz: ced91843e6e7a7e85a36a152a030b0bb84ccc159f2b4bfcf8ba4514b41ad9db6a20a3a9ad5d2e8fa42bff357801bea824213c8e706faece75ea9941f2b7d339f
+  data.tar.gz: 51c5ecb850f35e475e69f02b8fa74f6262c5ae7841d9aa7ed6fe96bdb3e68af8915ff8e4e1ead46e5184431b9543d188d2c1daf32d73d3dfff46cdb7181ae66f

data/app/controllers/caboose_rets/agents_controller.rb

@@ -14,12 +14,12 @@ module CabooseRets
       @agent = Agent.where(:mls_id => params[:mls_id]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:mls_id].blank?
       @agent = Agent.where(:slug => params[:slug]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:slug].blank?
       @listings = Property.where("list_agent_mls_id ILIKE ? OR co_list_agent_mls_id ILIKE ?", @agent.mls_id, @agent.mls_id).where(:status => 'Active').order('list_price desc').all
-    end
+    end 
 
     # @route GET /real-estate/agents/:slug/contact
-    # @route GET /agents/:mls_id/contact
+    # @route GET /agents/:id/contact
     def contact
-      @agent = Agent.where(:mls_id => params[:mls_id]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:mls_id].blank?
+      @agent = Agent.where(:id => params[:id]).first if !params[:id].blank?
       @agent = Agent.where(:slug => params[:slug]).where("office_mls_id ILIKE ?", @site.rets_office_id).first if !params[:slug].blank?
     end
 

data/app/controllers/caboose_rets/properties_controller.rb

@@ -2,7 +2,6 @@ module CabooseRets
   class PropertiesController < ApplicationController
 
     # @route GET /properties/search-options
-    # q=rock quary
     def search_options
       count = params[:count_per_name] ? params[:count_per_name] : 10
       arr = SearchOption.results(params[:q], count)
@@ -23,6 +22,7 @@ module CabooseRets
     	end
       where = "(id is not null)"
       search_options = []
+      searched_address = false
 
       if (@site && @site.id == 558) || request.original_fullpath =~ /^\/tuscaloosa-condos-for-sale(.*?)$/
         where = "(style ILIKE '%condo%' OR public_remarks ILIKE '%condo%' OR legal_description ILIKE '%unit%' OR res_style ILIKE '%condo%' OR property_subtype ILIKE '%condo%' OR property_subtype ILIKE '%townhouse%')"
@@ -33,8 +33,14 @@ module CabooseRets
         if lc && lc.count > 0
           lc.each do |lcid|
             so = CabooseRets::SearchOption.where(:id => lcid).first
-            if so
+            if so && so.name == "Street Address"
+              search_options << "( CONCAT(CONCAT(CONCAT(CONCAT(street_number, ' '),street_name),' '),street_suffix) ILIKE '%#{so.value}%' )"
+              searched_address = true
+            elsif so && so.name == "Street Name"
+              search_options << "( CONCAT(CONCAT(street_name,' '),street_suffix) ILIKE '%#{so.value}%' )"
+            elsif so
               search_options << "(#{so.field} = '#{so.value}')"
+              searched_address = true if so.name == 'MLS Number'
             end
           end
         end
@@ -114,6 +120,13 @@ module CabooseRets
         :saved_search => @saved_search,
         :pager        => @pager
       }
+
+      if @properties && @properties.count == 1 && searched_address
+        only_property = @properties.first
+        redirect_to only_property.url and return
+      end
+
+
     end
 
     # @route GET /properties/:mls_number/details
@@ -130,27 +143,19 @@ module CabooseRets
 
       @related = Property.near("#{@property.latitude}, #{@property.longitude}", 50).where(:property_type => @property.property_type, :status => 'Active', :property_subtype => @property.property_subtype).where(price_where,price_min,price_max).where(beds_where,beds_min,beds_max).where("mls_number != ?",@property.mls_number).order('distance asc').limit(3) if @property
 
-      if @property.nil?
-        @mls_number = params[:mls_number]
-      #  CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i) 
-        render 'caboose_rets/properties/property_not_exists'
-        return
-      end
+      render :file => "caboose/extras/error404", :layout => "caboose/application", :status => 404 and return if @property.nil?
 
       @block_options = {
         :mls_number => params[:mls_number],
         :property => @property,
         :saved    => @saved,
-  #      :agent    => @property ? @property.where(:list_agent_mls_id => @property.list_agent_mls_id).first : nil,
         :form_authenticity_token => form_authenticity_token
       }
 
-      if @property.nil?
-       @mls = params[:mls]
-    #   CabooseRets::RetsImporter.delay(:priority => 10, :queue => 'rets').import_property(@mls_number.to_i)
-       render 'caboose_rets/properties/property_not_exists'
-       return
-      end
+      @page.title = @property.full_address
+      @page.meta_description = @property.meta_description(@site)
+      @page.uri = "properties/#{@property.mls_number}/details"
+
     end
 
     #=============================================================================

data/app/models/caboose_rets/property.rb

@@ -41,12 +41,17 @@ class CabooseRets::Property <ActiveRecord::Base
 
     def full_address
         address = "#{self.unit_number.blank? ? '' : 'Unit ' + self.unit_number + ', '}#{self.street_number} #{self.street_dir_prefix.blank? ? '' : self.street_dir_prefix + ' '}#{self.street_name.blank? ? '' : self.street_name.titleize}#{self.street_suffix.blank? ? '' : ' ' + self.street_suffix.titleize}#{self.street_dir_suffix.blank? ? '' : ' ' + self.street_dir_suffix}"
-        return address.blank? ? '' : address.gsub('Mc ','Mc')
+        return address.blank? ? '' : address.gsub('Mc ','Mc').gsub('Mlk',"MLK").gsub(" Us ", " US ").gsub(" Th ", "th ").gsub("Mcfarland","McFarland")
     end
 
     def full_address_city
         address = "#{self.unit_number.blank? ? '' : 'Unit ' + self.unit_number + ', '}#{self.street_number} #{self.street_dir_prefix.blank? ? '' : self.street_dir_prefix + ' '}#{self.street_name.blank? ? '' : self.street_name.titleize}#{self.street_suffix.blank? ? '' : ' ' + self.street_suffix.titleize}#{self.street_dir_suffix.blank? ? '' : ' ' + self.street_dir_suffix}#{self.city.blank? ? '' : '<br />' + self.city.titleize + ', ' + self.state_or_province + ' ' + self.postal_code}"
-        return address.blank? ? '' : address.gsub('Mc ','Mc')
+        return address.blank? ? '' : address.gsub('Mc ','Mc').gsub('Mlk',"MLK").gsub(" Us ", " US ").gsub(" Th ", "th ").gsub("Mcfarland","McFarland")
+    end
+
+    def meta_description(site)
+        fa = self.full_address_city.blank? ? nil : self.full_address_city.gsub("<br />",", ")
+        return "View the property listed for sale at #{fa}. #{site.description}"
     end
 
     def parse(data)

data/app/models/caboose_rets/rets_importer.rb

@@ -723,10 +723,14 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 		if count == 0 || (count == 1 && Delayed::Job.where(q).first.locked_at)
 		  self.delay(:run_at => 20.minutes.from_now, :priority => 10, :queue => 'rets').update_rets
 		end
-    # Delete old logs
-    CabooseRets::Log.where("timestamp < ?",(DateTime.now - 30.days)).destroy_all
+
+    # Delete RETS logs over 7 days old
+    dt = DateTime.now - 7.days
+    sql = "delete from rets_logs where timestamp < '#{dt}';"
+    ActiveRecord::Base.connection.select_all(sql)
+
     # Update search options
-    CabooseRets::SearchOption.delay(:queue => "rets").update_search_options
+    CabooseRets::SearchOption.delay(:queue => "rets", :priority => 15).update_search_options
   end
 
   def self.last_updated

data/app/models/caboose_rets/search_option.rb

@@ -16,6 +16,7 @@ class CabooseRets::SearchOption < ActiveRecord::Base
       'MLS Area'      => ['area'],
       'Neighborhood'  => ['subdivision'],
       'Street Name'   => ['street_name'],
+      'Street Address'   => ['street_address'],
       'Property Type' => ['property_type'],      
       'MLS Number'    => ['mls_number']
     }
@@ -24,21 +25,51 @@ class CabooseRets::SearchOption < ActiveRecord::Base
         self.update_search_options_for_field(name, field)        
       end
     end
-    
+  
     # Delete all flagged
     self.where(:flag_for_delete => true).delete_all        
   end
   
   def self.update_search_options_for_field(name, field)
-    q = ["select distinct(#{field}) from rets_properties where status = ?", 'Active']
-    rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
-    rows.each do |row|
-      so = self.where(:name => name, :field => field, :value => row[0]).first
-      if so.nil? && !field.blank?
-        self.create(:name => name, :field => field, :value => row[0])
-      else      
-        so.flag_for_delete = false
-        so.save
+    if field == 'street_name'
+      CabooseRets::Property.where(:status => "Active", :property_type => "Residential").where("street_name is not null").order(:id).all.each do |prop|
+        add = "#{prop.street_name} #{prop.street_suffix}"
+        val = add.blank? ? nil : add.strip
+        next if val.blank?
+        so = self.where(:name => name, :field => field, :value => val).first
+        if so.nil? && !field.blank?
+          self.create(:name => name, :field => field, :value => val)
+        elsif so
+          so.flag_for_delete = false
+          so.save
+        end
+      end
+    elsif field == 'street_address'
+      CabooseRets::Property.where(:status => "Active", :property_type => "Residential").where("street_name is not null and street_number is not null").order(:id).all.each do |prop|
+        add = "#{prop.street_number} #{prop.street_name} #{prop.street_suffix}"
+        val = add.blank? ? nil : add.strip
+        next if val.blank?
+        so = self.where(:name => name, :field => field, :value => val).first
+        if so.nil? && !field.blank?
+          self.create(:name => name, :field => field, :value => val)
+        elsif so
+          so.flag_for_delete = false
+          so.save
+        end
+      end
+    else
+      q = ["select distinct(#{field}) from rets_properties where status = ? and property_type = ?", 'Active', 'Residential']
+      rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
+      rows.each do |row|
+        val = row[0].blank? ? nil : row[0].titleize.strip
+        next if val.blank?
+        so = self.where(:name => name, :field => field, :value => val).first
+        if so.nil? && !field.blank?
+          self.create(:name => name, :field => field, :value => val)
+        elsif so
+          so.flag_for_delete = false
+          so.save
+        end
       end
     end
   end

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.172'
+  VERSION = '0.1.177'
 end

data/lib/tasks/caboose_rets.rake

@@ -292,7 +292,6 @@ namespace :caboose_rets do
 		ensure
 		  unlock_task_if_last_updated(task_started)
     end
-    CabooseRets::SearchOption.delay(:queue => "rets").update_search_options
   end
 
   def last_updated

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.172
+  version: 0.1.177
 platform: ruby
 authors:
 - William Barry
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2021-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms