caboose-rets 0.1.41 → 0.1.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 797cfd1b91e89149b9fdb0230e37a0f1161874a7
-  data.tar.gz: a78bce9795e10d4211b958b2fc590175dee3749f
+  metadata.gz: 084c9f620a345eab5f77d03cd5c2fbe4302bc595
+  data.tar.gz: 2b077bd12c128c7e497f338d928522b672405236
 SHA512:
-  metadata.gz: 0ae933b766f267a4d30e62349d74e8b793845dd5d8ee17eabd26e2b5a2fafe1b8bf7b63b3cdbc7ff2bac6d8799e7206c92c5cd0029090e45aa387a95f0cd4d61
-  data.tar.gz: bb70b439366533694fcc71344ac4b113358e2aea2b7b92f6f4ed8d6e952526cdba6456e269c46e5f5d7b864b35c7fd6a7cdca428de7ff5aa41f1a77878e0fe59
+  metadata.gz: 61ea5917a85940109654b4616f8891cb3b03edb18be919eb9531804d93e2d661a767f5ad093f43f700677f3a934365af46a116860ec8c406deecae75ba1b129a
+  data.tar.gz: 60af3840905cda8184b8328b4bfb1b947620d6863aa08b91b729c8e6502b8cacfd0515b496e1d90ae9f44682281a10491aec96b6a0fae29063100419ab35556a

data/app/models/caboose_rets/rets_importer.rb

@@ -120,9 +120,9 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   def self.update_after(date_modified, save_images = true)
     self.log "Updating after #{date_modified}"
     self.delay(:priority => 10, :queue => 'rets').update_helper('Property'  , date_modified, save_images)
-    self.delay(:priority => 10, :queue => 'rets').update_helper('Office'   , date_modified, save_images)
-    self.delay(:priority => 10, :queue => 'rets').update_helper('Member'    , date_modified, save_images)
-    self.delay(:priority => 10, :queue => 'rets').update_helper('OpenHouse', date_modified, save_images)
+    self.delay(:priority => 10, :queue => 'rets').update_helper('Office'   , date_modified, false)
+    self.delay(:priority => 10, :queue => 'rets').update_helper('Member'    , date_modified, false)
+    self.delay(:priority => 10, :queue => 'rets').update_helper('OpenHouse', date_modified, false)
   end
 
   def self.update_helper(class_type, date_modified, save_images = true)
@@ -156,9 +156,9 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
       self.log data
       case class_type
         when 'Property'  then self.delay(:priority => 10, :queue => 'rets').import_properties(data[k], save_images)
-        when 'Office'    then self.delay(:priority => 10, :queue => 'rets').import_office(    data[k], save_images)
-        when 'Member'    then self.delay(:priority => 10, :queue => 'rets').import_agent(     data[k], save_images)
-        when 'OpenHouse' then self.delay(:priority => 10, :queue => 'rets').import_open_house(data[k], save_images)
+        when 'Office'    then self.delay(:priority => 10, :queue => 'rets').import_office(    data[k], false)
+        when 'Member'    then self.delay(:priority => 10, :queue => 'rets').import_agent(     data[k], false)
+        when 'OpenHouse' then self.delay(:priority => 10, :queue => 'rets').import_open_house(data[k], false)
       end
     end
   end
@@ -302,6 +302,12 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     end
   end
 
+  def self.download_missing_images
+    CabooseRets::Property.where("photo_count = ? OR photo_count is null", '').all.each do |p|
+      self.delay(:priority => 10, :queue => 'rets').import_properties(p.mls_number, true)
+    end
+  end
+
   def self.download_agent_image(agent)
     # self.log "Saving image for #{agent.first_name} #{agent.last_name}..."
     # begin
@@ -468,53 +474,53 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     end
   end
 
-  def self.get_media_urls
-    m = self.meta(class_type)
+  # def self.get_media_urls
+  #   m = self.meta(class_type)
 
-    # Get the total number of records
-    params = {
-      :search_type => m.search_type,
-      :class => class_type,
-      :query => "(#{m.matrix_modified_dt}=#{date_modified}T00:00:01+)",
-      :standard_names_only => true,
-      :timeout => -1
-    }
-    self.client.search(params.merge({ :count => 1 }))
-    count = self.client.rets_data[:code] == "20201" ? 0 : self.client.rets_data[:count]
-    batch_count = (count.to_f/5000.0).ceil
+  #   # Get the total number of records
+  #   params = {
+  #     :search_type => m.search_type,
+  #     :class => class_type,
+  #     :query => "(#{m.matrix_modified_dt}=#{date_modified}T00:00:01+)",
+  #     :standard_names_only => true,
+  #     :timeout => -1
+  #   }
+  #   self.client.search(params.merge({ :count => 1 }))
+  #   count = self.client.rets_data[:code] == "20201" ? 0 : self.client.rets_data[:count]
+  #   batch_count = (count.to_f/5000.0).ceil
 
-    ids = []
-    k = m.remote_key_field
-    (0...batch_count).each do |i|
-      self.client.search(params.merge({ :select => [k], :limit => 5000, :offset => 5000*i })) do |data|
-        ids << data[k]
-      end
-    end
+  #   ids = []
+  #   k = m.remote_key_field
+  #   (0...batch_count).each do |i|
+  #     self.client.search(params.merge({ :select => [k], :limit => 5000, :offset => 5000*i })) do |data|
+  #       ids << data[k]
+  #     end
+  #   end
 
-    if ids.count > 0
-      # Delete any records in the local database that shouldn't be there
-      t = m.local_table
-      k = m.local_key_field
-      query = ["delete from #{t} where #{k} not in (?)", ids]
-      ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
+  #   if ids.count > 0
+  #     # Delete any records in the local database that shouldn't be there
+  #     t = m.local_table
+  #     k = m.local_key_field
+  #     query = ["delete from #{t} where #{k} not in (?)", ids]
+  #     ActiveRecord::Base.connection.execute(ActiveRecord::Base.send(:sanitize_sql_array, query))
 
-      # Find any ids in the remote database that should be in the local database
-      query = "select distinct #{k} from #{t}"      
-      rows = ActiveRecord::Base.connection.select_all(ActiveRecord::Base.send(:sanitize_sql_array, query))
-      local_ids = rows.collect{ |row| row[k] }
-      ids_to_add = ids - local_ids
-      ids_to_add.each do |id|
-        self.log("Importing #{id}...")
-        case class_type
-          when "Property"  then self.delay(:priority => 10, :queue => 'rets').import_properties(id, true)
-          when "Office"    then self.delay(:priority => 10, :queue => 'rets').import_office(id, false)
-          when "Member"    then self.delay(:priority => 10, :queue => 'rets').import_agent(id, false)
-          when "OpenHouse" then self.delay(:priority => 10, :queue => 'rets').import_open_house(id, false)
-        end
-      end
-    end
+  #     # Find any ids in the remote database that should be in the local database
+  #     query = "select distinct #{k} from #{t}"      
+  #     rows = ActiveRecord::Base.connection.select_all(ActiveRecord::Base.send(:sanitize_sql_array, query))
+  #     local_ids = rows.collect{ |row| row[k] }
+  #     ids_to_add = ids - local_ids
+  #     ids_to_add.each do |id|
+  #       self.log("Importing #{id}...")
+  #       case class_type
+  #         when "Property"  then self.delay(:priority => 10, :queue => 'rets').import_properties(id, true)
+  #         when "Office"    then self.delay(:priority => 10, :queue => 'rets').import_office(id, false)
+  #         when "Member"    then self.delay(:priority => 10, :queue => 'rets').import_agent(id, false)
+  #         when "OpenHouse" then self.delay(:priority => 10, :queue => 'rets').import_open_house(id, false)
+  #       end
+  #     end
+  #   end
 
-  end
+  # end
 
   #=============================================================================
   # Logging
@@ -547,7 +553,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 
     begin
       overlap = 30.seconds
-      if (DateTime.now - self.last_purged).to_i >= 1
+      if (DateTime.now - self.last_purged).to_f >= 0.5
         self.purge
         self.save_last_purged(task_started)
         # Keep this in here to make sure all updates are caught
@@ -556,7 +562,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 
       self.log2("Updating after #{self.last_updated.strftime("%FT%T%:z")}...")
       self.update_after(self.last_updated - overlap)
-
+      self.download_missing_images
       self.log2("Saving the timestamp for when we updated...")
 		  self.save_last_updated(task_started)
 

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.1.41'
+  VERSION = '0.1.42'
 end

data/lib/tasks/caboose_rets.rake

@@ -64,8 +64,7 @@ namespace :caboose_rets do
 
   desc "Import Image"
   task :img => :environment do 
-    p = CabooseRets::Property.where(:matrix_unique_id => "9233280").first
-    CabooseRets::RetsImporter.download_property_images(p)
+    CabooseRets::RetsImporter.download_missing_images
   end
 
   desc "Reimports Property Images"
@@ -142,7 +141,7 @@ namespace :caboose_rets do
 
     begin
       # RetsImporter.update_all_after(last_updated - Rational(1,86400))
-      CabooseRets::RetsImporter.update_after(last_updated)
+      CabooseRets::RetsImporter.update_after(last_updated, true)
 		  save_last_updated(task_started)
 		  unlock_task
 		rescue

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.1.41
+  version: 0.1.42
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caboose-cms