caboose-rets 0.1.167 → 0.1.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c9c54d751e273164fdfd0417d2f0627e029f3eb45df52fbe8ccb269f83b3cdb
-  data.tar.gz: d942c23cbd9b2a1b3d4eb1e774892e2707e8674fe532fe18c633bddae88d726f
+  metadata.gz: ffe1bb33340eca294f66a11d3b0d30cdb1f3c0bafac94d98f6c9e35cc5b936b6
+  data.tar.gz: 33e44cedfeed2d4dcc0aeff18f51c874617a7dd21b255d09ab883f6adea3c700
 SHA512:
-  metadata.gz: 69641498cb92cc18e5cc05ef709c5b9a5db1b26dea9cd17347a2fd185e58c36e01715b3b0079c3cb9da6a72c1c8ed9b232559bccb65ca02bc81e359117e9faa0
-  data.tar.gz: 336162f32bbb6c41030fa588c0389e7f954fb2f7a116cac5f67f8a0326e906139285b26ed1f773d55a023145357c750f4867205230d5145bcacd7f1b56f709a7
+  metadata.gz: 5c896ef5ef41cc6747e6ada1d539aa8274f754bcb25874bd7615c82f6f70c255718e9b00118682cf1dc45742031938fb6f9fa120a55c83dbf8dbe34ffeb2ebad
+  data.tar.gz: 3d0ed4a79ab4e28422570891a49c93ff1245fe12047b42f37544e5893e73c88719bff47c1b363ec83d4e18999a333b5a251ea5e021110d0e3cf6b71e1a74d8c9

data/app/controllers/caboose_rets/properties_controller.rb

@@ -1,4 +1,3 @@
-
 module CabooseRets
   class PropertiesController < ApplicationController
 
@@ -22,7 +21,27 @@ module CabooseRets
     			params[:street_name_like][0] = '' if params[:street_name_like][0].to_i == 0
     		end
     	end
-      where = @site && @site.id == 558 ? "(style ILIKE '%condo%' OR res_style ILIKE '%condo%' OR property_subtype ILIKE '%condo%' OR property_subtype ILIKE '%townhouse%')" : "(id is not null)"
+      where = "(id is not null)"
+      search_options = []
+
+      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%')"
+      end
+
+      if params[:location_query] && !params[:location_query].blank?
+        lc = params[:location_query]
+        if lc && lc.count > 0
+          lc.each do |lcid|
+            so = CabooseRets::SearchOption.where(:id => lcid).first
+            if so
+              search_options << "(#{so.field} = '#{so.value}')"
+            end
+          end
+        end
+      end
+
+      where2 = search_options.blank? ? "(id is not null)" : ("(" + search_options.join(' OR ') + ")")
+
       sortby = @site && @site.id == 558 ? "original_entry_timestamp" : CabooseRets::default_property_sort
       @saved_properties = CabooseRets::SavedProperty.where(:user_id => logged_in_user.id).pluck(:mls_number)
       @pager = Caboose::PageBarGenerator.new(params, {
@@ -60,32 +79,35 @@ module CabooseRets
         'foreclosure_yn'           => '',
         'address_like'             => '',
         'street_name_like'         => '',
-        'street_number_like'          => '',
+        'street_number_like'       => '',
         'postal_code'              => '',
-        'postal_code_like'         => '',        
+        'postal_code_like'         => '',
         'status'                   => 'Active'
       },{
         'model'           => 'CabooseRets::Property',
         'sort'            => sortby,
         'desc'            => true,
         'abbreviations'   => {
-        'address_like'    => 'street_number_concat_street_dir_prefix_concat_street_name_concat_street_suffix_concat_street_dir_suffix_like'
+          'address_like'    => 'street_number_concat_street_dir_prefix_concat_street_name_concat_street_suffix_concat_street_dir_suffix_like'
         },
         'skip'            => ['status'],
+        'additional_params' => ['location_query'],
         'base_url'        => base_url,
         'items_per_page'  => 10,
-        'additional_where' => [ where ]
+        'additional_where' => [ where, where2 ]
       })
 
+      @pager.original_params[:test] == "hey"
+
       @properties = @pager.items
-      if params[:waterfronts].present?   then @properties.reject!{|p| p.waterfronts.blank?} end
+      if params[:waterfronts].present?   then @properties = @properties.reject{|p| p.waterfronts.blank?} end
       # if params[:ftr_lotdesc] == 'golf' then @properties.reject!{|p| p.ftr_lotdesc != 'golf'} end 
-      if params[:foreclosure_yn] then @properties.reject!{|p| p.foreclosure_yn != "Y"} end
+      if params[:foreclosure_yn] then @properties = @properties.reject{|p| p.foreclosure_yn != "Y"} end
 
-      @saved_search = nil
-      if CabooseRets::SavedSearch.exists?(:uri => request.fullpath)
-        @saved_search = CabooseRets::SavedSearch.where(:uri => request.fullpath).first
-      end
+      # @saved_search = nil
+      # if CabooseRets::SavedSearch.exists?(:uri => request.fullpath)
+      #   @saved_search = CabooseRets::SavedSearch.where(:uri => request.fullpath).first
+      # end
 
       @block_options = {
         :properties   => @properties,

data/app/models/caboose_rets/property.rb

@@ -161,7 +161,7 @@ class CabooseRets::Property <ActiveRecord::Base
         self.matrix_unique_id                 = data['ListingKey']
         self.matrix_modified_dt               = data['ModificationTimestamp']
         self.max_sqft                         = data['LivingArea']
-        self.middle_school                    = data['MiddleSchool']
+        self.middle_school                    = data['MiddleOrJuniorSchool']
     #    self.mineral_rights                   = data['MineralRights']
         self.min_sqft                         = data['LivingArea']
         self.misc_indoor_featuresa            = data['BuildingFeatures']

data/app/models/caboose_rets/rets_importer.rb

@@ -696,7 +696,6 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     end
     self.log2("Locking task...")
     task_started = self.lock_task
-
     begin
       overlap = 2.hours
       if (DateTime.now - self.last_purged).to_f >= 0.5
@@ -717,7 +716,6 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 		  self.log2("Unlocking task if last updated...")
 		  self.unlock_task_if_last_updated(task_started)
     end
-
 		# Start the same update process in 20 minutes
 		self.log3(nil,nil,"Adding the update rets task for 20 minutes from now...")
 		q = "handler like '%update_rets%'"
@@ -727,6 +725,8 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 		end
     # Delete old logs
     CabooseRets::Log.where("timestamp < ?",(DateTime.now - 30.days)).destroy_all
+    # Update search options
+    CabooseRets::SearchOption.delay(:queue => "rets").update_search_options
   end
 
   def self.last_updated

data/app/models/caboose_rets/search_option.rb

@@ -17,9 +17,7 @@ class CabooseRets::SearchOption < ActiveRecord::Base
       'Neighborhood'  => ['subdivision'],
       'Street Name'   => ['street_name'],
       'Property Type' => ['property_type'],      
-      'MLS Number'    => ['mls_number']      
-      #'feature',            
-      #'location',
+      'MLS Number'    => ['mls_number']
     }
     names.each do |name, fields|
       fields.each do |field|
@@ -32,11 +30,11 @@ class CabooseRets::SearchOption < ActiveRecord::Base
   end
   
   def self.update_search_options_for_field(name, field)
-    q = ["select distinct(#{field}) from rets_properties where (status = ? or status = ?)", 'Pending', 'Active']
+    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?
+      if so.nil? && !field.blank?
         self.create(:name => name, :field => field, :value => row[0])
       else      
         so.flag_for_delete = false
@@ -47,12 +45,12 @@ class CabooseRets::SearchOption < ActiveRecord::Base
   
   def self.results(str, count_per_name = 10)      
     q = ["select * from (        
-        select name, field, value, row_number() over (partition by name order by field) as rownum 
+        select id, name, field, value, row_number() over (partition by name order by field) as rownum 
         from rets_search_options        
         where lower(value) like ?        
       ) tmp where rownum < #{count_per_name}", "%#{str}%"]      
     rows = ActiveRecord::Base.connection.select_rows(ActiveRecord::Base.send(:sanitize_sql_array, q))
-    arr = rows.collect{ |row| { :name => row[0], :field => row[1], :value => row[2] }}    
+    arr = rows.collect{ |row| { :id => row[0].to_i, :name => row[1], :field => row[2], :text => row[3] }}    
     return arr    
   end
     

data/app/views/caboose_rets/properties/facebook_listings_feed.rss.builder

@@ -1,5 +1,4 @@
 domain = Caboose::Domain.where(:site_id => @site.id, :primary => true).first.domain
-hp = Caboose::Page.where(:site_id => @site.id, :title => "Home").first
 xml.instruct! :xml, :version => "1.0"
   xml.listings do
     xml.title @site.id == 558 ? "The Gray Group" : @site.description
@@ -39,7 +38,8 @@ xml.instruct! :xml, :version => "1.0"
         elsif !property.alternate_link.blank? && @use_alternate_link == true
           xml.url(property.alternate_link)
         else
-          xml.url("https://" + domain + "/properties/#{property.mls_number}/details?utm_source=Nine&utm_medium=Facebook&utm_campaign=Retargeting")
+          url = "https://" + domain + "/properties/#{property.mls_number}/details?utm_source=Nine&utm_medium=Facebook&utm_campaign=Retargeting"
+          xml.url( url )
         end
         xml.year_built(property.year_built)
         if !property.property_type.blank?

data/app/views/caboose_rets/properties/facebook_products_feed.rss.builder

@@ -12,12 +12,12 @@ xml.rss :version => "2.0", "xmlns:g" => "http://base.google.com/ns/1.0" do
         xml.g(:id, property.mls_number)
         xml.g(:title, property.full_address)
         xml.g(:description, property.public_remarks)
-        xml.g(:link, "https://" + domain + "/properties/#{property.mls_number}/details?utm_source=Nine&utm_medium=Facebook&utm_campaign=Retargeting")
+        xml.g(:link, "https://" + domain + "/properties/#{property.mls_number}/details")
         first_image = property.images.first if property.images
         m = Caboose::Media.where(:id => first_image.media_id).first if first_image && !first_image.media_id.blank?
         if m && m.image
           xml.g(:image_link, "https:" + m.image.url(:large))
-        else 
+        else
           xml.g(:image_link, 'https://cabooseit.s3.amazonaws.com/rets/house.png')
         end
         if !property.construction_status.blank?

data/lib/caboose_rets/version.rb

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

data/lib/tasks/caboose_rets.rake

@@ -283,9 +283,7 @@ namespace :caboose_rets do
     end
     CabooseRets::RetsImporter.log("Updating rets data...")
     task_started = lock_task
-
     begin
-      # RetsImporter.update_all_after(last_updated - Rational(1,86400))
       CabooseRets::RetsImporter.update_after(last_updated, true)
 		  save_last_updated(task_started)
 		  unlock_task
@@ -294,6 +292,7 @@ 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.167
+  version: 0.1.172
 platform: ruby
 authors:
 - William Barry
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms
@@ -162,7 +162,7 @@ homepage: http://github.com/williambarry007/caboose-rets
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -177,9 +177,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.7.8
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Library to download RETS data to a local website.
 test_files: