caboose-rets 0.0.79 → 0.0.80

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTk3NDMxYmE0ZjI5NzNjMWUwMTlmZjQ1MWIzOTIzZTAyYTk4MWI4YQ==
+    NTgwODhiYTYyYjBkZjdmNDk3ZTJmYmMxOWU3MDViOTljZDM5Zjk3ZA==
   data.tar.gz: !binary |-
-    NmE0Mjk2ODdkNTdhZDI1MzEwYzljYTMyMWE3MThkZTM0NDhjMzk0Mg==
+    YjM5YmRhNmFhYzY5ZjQ0YWJhZjRmNjVmZGM4NmJmZTc1M2UyNjdhZQ==
 SHA512:
   metadata.gz: !binary |-
-    NWJlOWM4M2I2YWEwOTVkMDBmNWI1ZDk2ZGFjZmU5OTY4OGYyYzg5ZTU3MjMz
-    M2E3N2VjODRiOTM5NWFhNzNjNWM0OWM2ZGY4ZGUxZDJjNjdiMWQ2MTc4Y2Zi
-    Y2FmZDYwNDVhYTE3ZWEzZWUwYjc1ZDdjNzgzZmMxZWE0NWQzMDA=
+    MzlhOWY2ZDQ0NTY1NTZmNWZlYmQ2OTBiYTM2YTEwYTM5MzY5YTA2NGZlMzkz
+    ZGQxMWNjNDc4NmExNjE4NDVjZGRmMDE0ZDM4ZDQ5ZDI2M2Y5MGMyNzUwMjll
+    ZDk4MGRlMTY3N2I1OTg0MTU2OTE0M2NiZjZjY2NiYjgxOTk4MmQ=
   data.tar.gz: !binary |-
-    MGY1NGZmYTBhNTdmNGU2ZTBhNWY0OTgzYjkwNzY3ZThjNmVjMTJkNThhNjZh
-    MmZiYzdiYjRkNmIzY2ExNDg5MjUyNjQ0YjlmOTcwZGE4NjY3MmIxMWM0ZTI2
-    MjM4NmVmM2JiZWUzODFjYzcxYzdjMTYyNGZmOTc3MjAxOGQwODk=
+    ODlhYjA2Yjg1NDhmNTc0ZTU3OWUwYzE4MTU5ODQxOGY0YTFhOWZiZmY0Mjc2
+    NmNhYjI3YWQ1YThhNGMzZDg1ZjM4NjE0ZDIyMWNjOWE1ZGQ2NDM5ZWZiZDZj
+    ZjdiZDdkOGQwNTY4OTQzZmVhMjQzZjdlNjFmZWQ0MDE3ZWM2Mzc=

data/app/controllers/caboose_rets/land_controller.rb

@@ -80,6 +80,7 @@ module CabooseRets
       @saved = logged_in? && SavedProperty.where(:user_id => logged_in_user.id, :mls_acct => params[:mls_acct]).exists?
       if @property.nil?
         @mls_acct = params[:mls_acct]
+        CabooseRets::RetsImporter.delay.import_property(@mls_acct.to_i)
         render 'land/not_exists'
         return
       end    

data/app/controllers/caboose_rets/multi_family_controller.rb

@@ -61,6 +61,7 @@ module CabooseRets
       @saved = logged_in? && SavedProperty.where(:user_id => logged_in_user.id, :mls_acct => params[:mls_acct]).exists?      
       if @property.nil?
         @mls_acct = params[:mls_acct]
+        CabooseRets::RetsImporter.delay.import_property(@mls_acct.to_i)
         render 'multi_family/not_exists'
         return
       end          

data/app/controllers/caboose_rets/residential_controller.rb

@@ -74,7 +74,8 @@ module CabooseRets
         @agent = Agent.where(:la_code => @property.la_code).first
       end
       if @property.nil?
-        @mls_acct = params[:mls_acct]
+        @mls_acct = params[:mls_acct]        
+        CabooseRets::RetsImporter.delay.import_property(@mls_acct.to_i)      
         render 'residential/residential_not_exists'
         return
       end

data/app/models/caboose_rets/agent.rb

@@ -2,8 +2,7 @@
 class CabooseRets::Agent < ActiveRecord::Base
   self.table_name = "rets_agents"  
   has_many :commercial_properties
-  has_many :residential_properties
-  # attr_accessible :title, :body
+  has_many :residential_properties  
   has_attached_file :image, 
     :path => 'rets/agents/:la_code_:style.:extension', 
     :styles => {
@@ -11,6 +10,7 @@ class CabooseRets::Agent < ActiveRecord::Base
       :large => '200x300>'
     }
   do_not_validate_attachment_file_type :image
+  attr_accessible :id, :la_code
   after_initialize :fix_name
   
   def assistants

data/app/models/caboose_rets/open_house.rb

@@ -2,6 +2,8 @@
 class CabooseRets::OpenHouse < ActiveRecord::Base
   self.table_name = "rets_open_houses"
   
+  attr_accesible :id
+  
   def property
     models = [CabooseRets::ResidentialProperty, CabooseRets::CommercialProperty, CabooseRets::LandProperty, CabooseRets::MultiFamilyProperty]
     models.each do |model|

data/app/models/caboose_rets/rets_importer.rb

@@ -68,7 +68,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 
   def self.import(class_type, query)    
     m = self.meta(class_type)
-    self.log("Importing #{m.search_type}:#{class_type} with query #{query}...")
+    #self.log("Importing #{m.search_type}:#{class_type} with query #{query}...")
     self.get_config if @@config.nil? || @@config['url'].nil?
     params = {
       :search_type => m.search_type,
@@ -126,23 +126,24 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   #=============================================================================
 
   def self.update_after(date_modified, save_images = true)
-    self.update_helper('RES', date_modified, save_images)
-    self.update_helper('COM', date_modified, save_images)
-    self.update_helper('LND', date_modified, save_images)
-    self.update_helper('MUL', date_modified, save_images)
-    self.update_helper('OFF', date_modified, save_images)
-    self.update_helper('AGT', date_modified, save_images)
-    self.update_helper('OPH', date_modified, save_images)
+    self.delay.update_helper('RES', date_modified, save_images)
+    self.delay.update_helper('COM', date_modified, save_images)
+    self.delay.update_helper('LND', date_modified, save_images)
+    self.delay.update_helper('MUL', date_modified, save_images)
+    self.delay.update_helper('OFF', date_modified, save_images)
+    self.delay.update_helper('AGT', date_modified, save_images)
+    self.delay.update_helper('OPH', date_modified, save_images)
   end
 
   def self.update_helper(class_type, date_modified, save_images = true)
     m = self.meta(class_type)
-    k = m.remote_key_field
+    k = m.remote_key_field    
+    d = date_modified.in_time_zone(CabooseRets::timezone).strftime("%FT%T")    
     params = {
       :search_type => m.search_type,
       :class => class_type,
       :select => [m.remote_key_field],
-      :query => "(#{m.date_modified_field}=#{date_modified.strftime("%FT%T")}+)",
+      :query => "(#{m.date_modified_field}=#{d}+)",
       :standard_names_only => true,
       :timeout => -1
     }
@@ -478,8 +479,15 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   # Logging
   #=============================================================================
 
-  def self.log(msg)
+  def self.log(msg)        
+    puts "[rets_importer] #{msg}"    
+    #Rails.logger.info("[rets_importer] #{msg}")
+  end
+  
+  def self.log2(msg)
+    puts "======================================================================"    
     puts "[rets_importer] #{msg}"
+    puts "======================================================================"
     #Rails.logger.info("[rets_importer] #{msg}")
   end
 
@@ -488,7 +496,12 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   #=============================================================================
 
   def self.update_rets
-    return if self.task_is_locked
+    self.log2("Updating rets...")    
+    if self.task_is_locked
+      self.log2("Task is locked, aborting.")
+      return
+    end
+    self.log2("Locking task...")
     task_started = self.lock_task
 
     begin
@@ -499,17 +512,30 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
         # Keep this in here to make sure all updates are caught
         #overlap = 1.month
       end
+      
+      self.log2("Updating after #{self.last_updated.strftime("%FT%T%:z")}...")
       self.update_after(self.last_updated - overlap)
+      
+      self.log2("Saving the timestamp for when we updated...")
 		  self.save_last_updated(task_started)
+		  
+		  self.log2("Unlocking the task...")
 		  self.unlock_task
-		rescue
+		rescue Exception => err
+		  puts err
 		  raise
 		ensure
+		  self.log2("Unlocking task if last updated...")
 		  self.unlock_task_if_last_updated(task_started)
 		end
 
 		# Start the same update process in five minutes
-		self.delay(:run_at => 1.minutes.from_now).update_rets
+		self.log2("Adding the update rets task for 5 minutes from now...")
+		q = "handler like '%update_rets%'"
+		count = Delayed::Job.where(q).count		 
+		if count == 0 || (count == 1 && Delayed::Job.where(q).first.locked_at)
+		  self.delay(:run_at => 5.minutes.from_now).update_rets
+		end
 	end
 
   def self.last_updated
@@ -529,14 +555,14 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
   end
 
   def self.save_last_updated(d)
-    s = Caboose::Setting.where(:name => 'rets_last_updated').first
-    s.value = d.strftime('%FT%T')
+    s = Caboose::Setting.where(:name => 'rets_last_updated').first    
+    s.value = d.in_time_zone(CabooseRets::timezone).strftime("%FT%T%:z")
     s.save
   end
 
   def self.save_last_purged(d)
     s = Caboose::Setting.where(:name => 'rets_last_purged').first
-    s.value = d.strftime('%FT%T')
+    s.value = d.in_time_zone(CabooseRets::timezone).strftime("%FT%T%:z")
     s.save
   end
 
@@ -544,9 +570,9 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
     return Caboose::Setting.exists?(:name => 'rets_update_running')
   end
 
-  def self.lock_task
-    d = DateTime.now.utc - 5.hours
-    Caboose::Setting.create(:name => 'rets_update_running', :value => d.strftime('%F %T'))
+  def self.lock_task    
+    d = DateTime.now.utc.in_time_zone(CabooseRets::timezone)
+    Caboose::Setting.create(:name => 'rets_update_running', :value => d.strftime("%FT%T%:z"))
     return d
   end
 
@@ -556,7 +582,7 @@ class CabooseRets::RetsImporter # < ActiveRecord::Base
 
   def self.unlock_task_if_last_updated(d)
     setting = Caboose::Setting.where(:name => 'rets_update_running').first
-    self.unlock_task if setting && d.strftime('%F %T') == setting.value
+    self.unlock_task if setting && d.in_time_zone.strftime("%FT%T%:z") == setting.value
   end
 
 end

data/lib/caboose-rets.rb

@@ -17,4 +17,7 @@ module CabooseRets
   mattr_accessor :offices_base_url
   @@offices_base_url = ''
   
+  mattr_accessor :timezone
+  @@timezone = 'Central Time (US & Canada)'
+      
 end

data/lib/caboose_rets/version.rb

@@ -1,3 +1,3 @@
 module CabooseRets
-  VERSION = '0.0.79'
+  VERSION = '0.0.80'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-rets
 version: !ruby/object:Gem::Version
-  version: 0.0.79
+  version: 0.0.80
 platform: ruby
 authors:
 - William Barry
@@ -49,7 +49,6 @@ files:
 - app/controllers/caboose_rets/saved_properties_controller.rb
 - app/controllers/caboose_rets/saved_searches_controller.rb
 - app/helpers/caboose_rets/application_helper.rb
-- app/models/caboose_rets/#Untitled-1#
 - app/models/caboose_rets/agent.rb
 - app/models/caboose_rets/commercial_property.rb
 - app/models/caboose_rets/land_property.rb

data/app/models/caboose_rets/#Untitled-1#

@@ -1,6 +0,0 @@
-heroku maintenance:on
-heroku ps:scale worker=0
-heroku pgbackups:transfer DATABASE_URL HEROKU_POSTGRESQL_PURPLE_URL
-heroku pg:promote HEROKU_POSTGRESQL_PURPLE_URL
-heroku ps:scale worker=1
-heroku maintenance:off