harmonia 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6855db28daa85553fa8479d6dd6217c43ae5c008be01c0b5f92b3154ce183f9c
-  data.tar.gz: 9b44c5dd79d2a5626053541bcc0a869025e37ecee53c97018eae853a4004d440
+  metadata.gz: ff38a571aee521e8a4fd4018627f507e8926e3a64418c86bd746a62bab592ca1
+  data.tar.gz: f6932e0ddcbad20fee54dfa868a964b1048824d97ef55b71a965cb6a9d10e7e9
 SHA512:
-  metadata.gz: 03056f3bafcbae9a2b69251fe7de63af424fe8bc216c5f18c228b390f47a6baaef8f041b9f1f66ed51f0f0be8ccf1c6e5653649ff55312be10feca45cf71f0c4
-  data.tar.gz: bf9bde1fd412e5af7b04a5e583fef2441e12ffb20bd55822d33e41f8bfa9e59afce719e5435d6732ee9885492aca376321e9028224c436d6004af7f726337255
+  metadata.gz: 7e7c249cf80c9a00c73120d418f683761fffb4bdbbf78b03e6abe56469ee02bc9ecd9e848f7edaa6bfed3b03396890afe35f2c513df22563ffef8b396dd1b89c
+  data.tar.gz: 7babd9a72937dfe80c9b3dfe060672c678ac7008c9236f8193e93c37ea435846c9604dd89745a3d4b842505c7ead25451ed03b01a6a0ec652b68dc2e6a7b7f30

data/README.md

@@ -169,14 +169,14 @@ class ProductSyncer
     @total_create_required = filemaker_records.length
 
     existing_ids = Product.pluck(:filemaker_id)
-    filemaker_records.reject { |record| existing_ids.include?(record.record_id) }
+    filemaker_records.reject { |record| existing_ids.include?(record.id) }
   end
 
   def records_to_update
     filemaker_records = Trophonius::Product.all
 
     records_needing_update = filemaker_records.select { |fm_record|
-      pg_record = Product.find_by(filemaker_id: fm_record.record_id)
+      pg_record = Product.find_by(filemaker_id: fm_record.id)
       pg_record && needs_update?(fm_record, pg_record)
     }
 
@@ -185,7 +185,7 @@ class ProductSyncer
   end
 
   def records_to_delete
-    filemaker_ids = Trophonius::Product.all.map(&:record_id)
+    filemaker_ids = Trophonius::Product.all.map(&:id)
     Product.where.not(filemaker_id: filemaker_ids).pluck(:id)
   end
 
@@ -393,7 +393,7 @@ module Trophonius
     # Converts FileMaker record to PostgreSQL attributes
     def self.to_pg(record)
       {
-        filemaker_id: record.record_id,
+        filemaker_id: record.id,
         name: record.field_data['ProductName'],
         price: record.field_data['Price'].to_f,
         # ... map other fields
@@ -432,8 +432,8 @@ add_index :products, :filemaker_id, unique: true
 
 This column serves as the bridge between your ActiveRecord records and FileMaker records:
 
-- **FileMaker to ActiveRecord**: Stores the FileMaker `record_id` to identify which FileMaker record corresponds to each Rails record
-- **ActiveRecord to FileMaker**: Can store the FileMaker `record_id` after creation, or you can use a separate field in FileMaker (like `PostgreSQLID`) to maintain the relationship
+- **FileMaker to ActiveRecord**: Stores the FileMaker `id` to identify which FileMaker record corresponds to each Rails record
+- **ActiveRecord to FileMaker**: Can store the FileMaker `id` after creation, or you can use a separate field in FileMaker (like `PostgreSQLID`) to maintain the relationship
 
 **Important Notes**:
 - The column is indexed with a unique constraint for performance and data integrity
@@ -601,15 +601,15 @@ RSpec.describe ProductSyncer do
     it 'returns records not in PostgreSQL' do
       # Mock FileMaker records
       allow(Trophonius::Product).to receive(:all).and_return([
-        double(record_id: 1),
-        double(record_id: 2)
+        double(id: 1),
+        double(id: 2)
       ])
 
       # Mock existing PostgreSQL records
       allow(Product).to receive(:pluck).with(:filemaker_id).and_return([1])
 
       result = syncer.send(:records_to_create)
-      expect(result.map(&:record_id)).to eq([2])
+      expect(result.map(&:id)).to eq([2])
     end
   end
 end

data/lib/generators/harmonia/templates/activerecord_to_filemaker_syncer_template.rb

@@ -81,7 +81,7 @@ class <%= class_name %>ToFileMakerSyncer
     # pg_ids = <%= class_name %>.pluck(:id).map(&:to_s)
     # YourTrophoniusModel.all.select { |fm_record|
     #   !pg_ids.include?(fm_record.field_data['PostgreSQLID'])
-    # }.map(&:record_id)
+    # }.map(&:id)
     []
   end
 
@@ -115,11 +115,11 @@ class <%= class_name %>ToFileMakerSyncer
   end
 
   def delete_records
-    record_ids = records_to_delete
-    return if record_ids.empty?
+    ids = records_to_delete
+    return if ids.empty?
 
-    record_ids.each do |record_id|
-      fm_record = YourTrophoniusModel.find(record_id)
+    ids.each do |id|
+      fm_record = YourTrophoniusModel.find(id)
       fm_record.destroy
     rescue Trophonius::RecordNotFoundError
       # Record already deleted, skip

data/lib/generators/harmonia/templates/filemaker_to_activerecord_syncer_template.rb

@@ -3,9 +3,14 @@
 class <%= class_name %>Syncer
   attr_accessor :database_connector
 
-  def initialize(database_connector)
+  def initialize(database_connector, update_only: false)
     @database_connector = database_connector
-    @last_synced_on = Harmonia::Sync.last_sync_for('<%= table_name %>', 'FileMaker to ActiveRecord')&.ran_on || (Time.now - 15.year)
+    @last_synced_on = if update_only
+                        Time.now - 100.year
+                      else
+                        Harmonia::Sync.last_sync_for('<%= table_name %>', 'FileMaker to ActiveRecord')&.ran_on || (Time.now - 15.year)
+                      end
+    @update_only = update_only
     @failed_fm_ids = {}
     @failed_pg_ids = {}
   end
@@ -30,8 +35,8 @@ class <%= class_name %>Syncer
 
   def sync_records(sync_record)
     updated_count = update_records
-    created_count = create_records
-    delete_records
+    created_count = @update_only ? 0 : create_records
+    delete_records unless @update_only
 
     total_synced = created_count + updated_count
     total_required = (@total_create_required || 0) + (@total_update_required || 0)
@@ -51,7 +56,7 @@ class <%= class_name %>Syncer
   def records_to_create
     # TODO: Implement logic to fetch records from FileMaker that need to be created in PostgreSQL
     # Example:
-    filemaker_records = FileMaker::<%= class_name %>.where(creation_timestamp: ">= #{@last_synced_on.to_fm}").not
+    filemaker_records = FileMaker::<%= class_name %>.where(creation_timestamp: ">= #{@last_synced_on.to_fm}")
     @total_create_required = filemaker_records.length
     existing_ids = <%= class_name %>.pluck(:filemaker_id)
     filemaker_records.reject { |record| existing_ids.include?(record.id) }
@@ -66,7 +71,7 @@ class <%= class_name %>Syncer
     # Example:
     filemaker_records = FileMaker::<%= class_name %>.where(modification_timestamp: ">= #{@last_synced_on.to_fm}")
     records_needing_update = filemaker_records.select { |fm_record|
-      pg_record = <%= class_name %>.find_by(filemaker_id: fm_record.record_id)
+      pg_record = <%= class_name %>.find_by(filemaker_id: fm_record.id)
       pg_record && needs_update?(fm_record, pg_record)
     }
     @total_update_required = records_needing_update.length
@@ -78,7 +83,7 @@ class <%= class_name %>Syncer
   def records_to_delete
     # Get all modified FileMaker record IDs
     filemaker_records = FileMaker::<%= class_name %>.where(modification_timestamp: ">= #{@last_synced_on.to_fm}")
-    fm_ids = filemaker_records.map(&:record_id)
+    fm_ids = filemaker_records.map(&:id)
 
     # Find PostgreSQL records whose FileMaker IDs aren't in the modified set
     # These might have been deleted in FileMaker
@@ -86,13 +91,13 @@ class <%= class_name %>Syncer
     return [] if fm_ids_no_update_needed.empty?
 
     # Query FileMaker to check if these records still exist
-    possibly_deleted_query = FileMaker::<%= class_name %>.where(record_id: fm_ids_no_update_needed.first)
+    possibly_deleted_query = FileMaker::<%= class_name %>.where(id: fm_ids_no_update_needed.first)
     fm_ids_no_update_needed.count > 1 && fm_ids_no_update_needed[1..].each do |fm_id|
-      possibly_deleted_query.or(record_id: fm_id)
+      possibly_deleted_query.or(id: fm_id)
     end
 
     # Find IDs that exist in PostgreSQL but not in FileMaker (truly deleted)
-    deleted_fm_ids = fm_ids_no_update_needed - possibly_deleted_query.map(&:record_id)
+    deleted_fm_ids = fm_ids_no_update_needed - possibly_deleted_query.map(&:id)
 
     # Return PostgreSQL IDs for records with these FileMaker IDs
     <%= class_name %>.where(filemaker_id: deleted_fm_ids).pluck(:id)
@@ -119,8 +124,8 @@ class <%= class_name %>Syncer
         <%= class_name %>.create!(attributes)
         success_count += 1
       rescue StandardError => e
-        @failed_fm_ids[trophonius_record.record_id.to_s] = e.message
-        Rails.logger.error("Failed to create record from FileMaker ID #{trophonius_record.record_id}: #{e.message}")
+        @failed_fm_ids[trophonius_record.id.to_s] = e.message
+        Rails.logger.error("Failed to create record from FileMaker ID #{trophonius_record.id}: #{e.message}")
       end
     end
 
@@ -137,13 +142,13 @@ class <%= class_name %>Syncer
       begin
         pg_attributes = FileMaker::<%= class_name %>.to_pg(trophonius_record)
 
-        <%= class_name %>.where(filemaker_id: trophonius_record.record_id).update_all(
+        <%= class_name %>.where(filemaker_id: trophonius_record.id).update_all(
           pg_attributes.merge(updated_at: Time.current)
         )
         success_count += 1
       rescue StandardError => e
-        @failed_fm_ids[trophonius_record.record_id.to_s] = e.message
-        Rails.logger.error("Failed to update record from FileMaker ID #{trophonius_record.record_id}: #{e.message}")
+        @failed_fm_ids[trophonius_record.id.to_s] = e.message
+        Rails.logger.error("Failed to update record from FileMaker ID #{trophonius_record.id}: #{e.message}")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harmonia
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-17 00:00:00.000000000 Z
+date: 2026-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trophonius