caboose-rets 0.1.172 → 0.1.173

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffe1bb33340eca294f66a11d3b0d30cdb1f3c0bafac94d98f6c9e35cc5b936b6
-  data.tar.gz: 33e44cedfeed2d4dcc0aeff18f51c874617a7dd21b255d09ab883f6adea3c700
+  metadata.gz: d696008a55d4db2c7e4355676577b1125127c58fbda6e18570f02db82b2d5c40
+  data.tar.gz: 8d87073dd33a633bc18ed370fdd5d7211fb7ad8918559062551955be50544a1c
 SHA512:
-  metadata.gz: 5c896ef5ef41cc6747e6ada1d539aa8274f754bcb25874bd7615c82f6f70c255718e9b00118682cf1dc45742031938fb6f9fa120a55c83dbf8dbe34ffeb2ebad
-  data.tar.gz: 3d0ed4a79ab4e28422570891a49c93ff1245fe12047b42f37544e5893e73c88719bff47c1b363ec83d4e18999a333b5a251ea5e021110d0e3cf6b71e1a74d8c9
+  metadata.gz: 7156982635d8c2588036a898809ac2101c975fcb69059b4047c2768186bdfc3d5beaeb2dd9294ed2a245460498bb3019a5531f71777bd2b97262e61f99646034
+  data.tar.gz: a3fafd917d276b72e04752df7c426ea939ad61408a52e26aafc81c0beca79467d8b63e238c06ec88eca5aa96090e1a790e99077f668eb11009f8a9f117f1878b

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

data/app/models/caboose_rets/rets_importer.rb

@@ -724,7 +724,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 		  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
+    CabooseRets::Log.where("timestamp < ?",(DateTime.now - 7.days)).destroy_all
     # Update search options
     CabooseRets::SearchOption.delay(:queue => "rets").update_search_options
   end

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']
     }
@@ -25,20 +26,51 @@ class CabooseRets::SearchOption < ActiveRecord::Base
       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.173'
 end

metadata

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