Fix attribute locking namespace conflict, duplicate syncs

app/models/concerns/enrichable.rb

@@ -42,17 +42,17 @@ module Enrichable
     !locked?(attr)
   end
 
-  def lock!(attr)
+  def lock_attr!(attr)
     update!(locked_attributes: locked_attributes.merge(attr.to_s => Time.current))
   end
 
-  def unlock!(attr)
+  def unlock_attr!(attr)
     update!(locked_attributes: locked_attributes.except(attr.to_s))
   end
 
   def lock_saved_attributes!
     saved_changes.keys.reject { |attr| ignored_enrichable_attributes.include?(attr) }.each do |attr|
-      lock!(attr)
+      lock_attr!(attr)
     end
   end
 

app/models/concerns/syncable.rb

@@ -9,20 +9,28 @@ module Syncable
     raise NotImplementedError, "Subclasses must implement the syncing? method"
   end
 
+  # Schedules a sync for syncable.  If there is an existing sync pending/syncing for this syncable,
+  # we do not create a new sync, and attempt to expand the sync window if needed.
   def sync_later(parent_sync: nil, window_start_date: nil, window_end_date: nil)
     Sync.transaction do
-      # Since we're scheduling a new sync, mark old syncs for this syncable as stale
-      self.syncs.incomplete.find_each(&:mark_stale!)
+      with_lock do
+        sync = self.syncs.incomplete.first
 
-      new_sync = self.syncs.create!(
-        parent: parent_sync,
-        window_start_date: window_start_date,
-        window_end_date: window_end_date
-      )
+        if sync
+          Rails.logger.info("There is an existing sync, expanding window if needed (#{sync.id})")
+          sync.expand_window_if_needed(window_start_date, window_end_date)
+        else
+          sync = self.syncs.create!(
+            parent: parent_sync,
+            window_start_date: window_start_date,
+            window_end_date: window_end_date
+          )
 
-      SyncJob.perform_later(new_sync)
+          SyncJob.perform_later(sync)
+        end
 
-      new_sync
+        sync
+      end
     end
   end