harmonia 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe5daefb15ce5ef2a2cc7a90a66123967ade8300f08b8f017220d5919c9aebe4
-  data.tar.gz: f826c905f2192dd472ab849108afebda80282b1af0050b400ddcd15402dc2ae8
+  metadata.gz: 9b3d138727a59279aa27d27f45c4f829b6fb579aaff1fcb1f96f8c9af4de7a2c
+  data.tar.gz: 11efb0c921eaa4d3781b475e386cd617f3bc029bc463e67f1c7be544caf4cdbe
 SHA512:
-  metadata.gz: 40ec19a556c1f7fe3251f4f8d2885a6f5f4480098df2bac9654473b55870457029133abc013434cbdf99859873b51317266037c06432bbbd343a82a6afeec92a
-  data.tar.gz: 5e2d1d49a203f0c5b415413a577665f0ab1f2fe90bec8b22a70cbdf1d5b96f4f1259f3817baeff760505e16c4474f61f5e5d6850d9402429ec991862f97a7344
+  metadata.gz: 85bc5b955d18ffdc0e86b276d43de07589909517cb28dd1bdaeddb6039380d4987c2f8db02d6a429cb9ad5b75221ca5b23eb0e7f9f2c674482ab6c7b4ff428cb
+  data.tar.gz: 0727cc7e6b2c6e8dcb2ebaf2a2934aa2e5cad18c3f6cfd8b4438dbc0ac6ccf5caf3b4774c6e482a51f75732c0b96e864f75ab19ee1c95fb43103bd980f09968a

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

@@ -10,6 +10,8 @@ class CreateHarmoniaSyncs < ActiveRecord::Migration[<%= Rails::VERSION::MAJOR %>
       t.string :status, default: 'pending'
       t.string :direction
       t.text :error_message
+      t.string :failed_fm_ids, array: true
+      t.integer :failed_pg_ids, array: true
 
       t.timestamps
     end

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

@@ -6,6 +6,8 @@ class <%= class_name %>Syncer
   def initialize(database_connector)
     @database_connector = database_connector
     @last_synced_on = Harmonia::Sync.last_sync_for('<%= table_name %>', 'FileMaker to ActiveRecord')&.ran_on || (Time.now - 15.year)
+    @failed_fm_ids = []
+    @failed_pg_ids = []
   end
 
   # Main sync method
@@ -20,7 +22,7 @@ class <%= class_name %>Syncer
       sync_records(sync_record)
     end
   rescue StandardError => e
-    sync_record&.fail!(e.message)
+    sync_record&.fail!(e.message, failed_fm_ids: @failed_fm_ids, failed_pg_ids: @failed_pg_ids)
     raise
   end
 
@@ -36,55 +38,68 @@ class <%= class_name %>Syncer
 
     sync_record.finish!(
       records_synced: total_synced,
-      records_required: total_required
+      records_required: total_required,
+      failed_fm_ids: @failed_fm_ids,
+      failed_pg_ids: @failed_pg_ids
     )
   end
 
   # Returns an array of Trophonius records that need to be created
-  # Use YourTrophoniusModel.to_pg(record) to convert to PostgreSQL attributes
+  # Use FileMaker::<%= class_name %>.to_pg(record) to convert to PostgreSQL attributes
   # Set @total_create_required to the total number of records that should exist after creation
   # @return [Array<Trophonius::Record>] Array of Trophonius records
   def records_to_create
     # TODO: Implement logic to fetch records from FileMaker that need to be created in PostgreSQL
     # Example:
-    # filemaker_records = YourTrophoniusModel.all
-    # @total_create_required = filemaker_records.length
-    # existing_ids = <%= class_name %>.pluck(:filemaker_id)
-    # filemaker_records.reject { |record| existing_ids.include?(record.record_id) }
-    @total_create_required = 0
-    []
+    filemaker_records = FileMaker::<%= class_name %>.where(creation_timestamp: ">= #{@last_synced_on.to_fm}").not
+    @total_create_required = filemaker_records.length
+    existing_ids = <%= class_name %>.pluck(:filemaker_id)
+    filemaker_records.reject { |record| existing_ids.include?(record.id) }
   end
 
   # Returns an array of Trophonius records that need to be updated
-  # Use YourTrophoniusModel.to_pg(record) to convert to PostgreSQL attributes
+  # Use FileMaker::<%= class_name %>.to_pg(record) to convert to PostgreSQL attributes
   # Set @total_update_required to the total number of records that should be updated
   # @return [Array<Trophonius::Record>] Array of Trophonius records
   def records_to_update
     # TODO: Implement logic to fetch records from FileMaker that need to be updated in PostgreSQL
     # Example:
-    # filemaker_records = YourTrophoniusModel.all
-    # records_needing_update = filemaker_records.select { |fm_record|
-    #   pg_record = <%= class_name %>.find_by(filemaker_id: fm_record.record_id)
-    #   pg_record && needs_update?(fm_record, pg_record)
-    # }
-    # @total_update_required = records_needing_update.length
-    # records_needing_update
-    @total_update_required = 0
-    []
+    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 && needs_update?(fm_record, pg_record)
+    }
+    @total_update_required = records_needing_update.length
+    records_needing_update
   end
 
   # Returns an array of record identifiers that need to be deleted
   # @return [Array] Array of record identifiers
   def records_to_delete
-    # TODO: Implement logic to determine which PostgreSQL records should be deleted
-    # Example:
-    # filemaker_ids = YourTrophoniusModel.all.map(&:record_id)
-    # <%= class_name %>.where.not(filemaker_id: filemaker_ids).pluck(:id)
-    []
+    # 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)
+
+    # Find PostgreSQL records whose FileMaker IDs aren't in the modified set
+    # These might have been deleted in FileMaker
+    fm_ids_no_update_needed = <%= class_name %>.where.not(filemaker_id: fm_ids).pluck(:filemaker_id)
+    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)
+    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)
+    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)
+
+    # Return PostgreSQL IDs for records with these FileMaker IDs
+    <%= class_name %>.where(filemaker_id: deleted_fm_ids).pluck(:id)
   end
 
   def needs_update?(fm_record, pg_record)
-    pg_attributes = YourTrophoniusModel.to_pg(fm_record)
+    pg_attributes = FileMaker::<%= class_name %>.to_pg(fm_record)
 
     pg_attributes.any? { |key, value| pg_record.send(key) != value }
   end
@@ -93,37 +108,60 @@ class <%= class_name %>Syncer
     records = records_to_create
     return 0 if records.empty?
 
-    attributes_array = records.map do |trophonius_record|
-      YourTrophoniusModel.to_pg(trophonius_record).merge(
-        created_at: Time.current,
-        updated_at: Time.current
-      )
+    success_count = 0
+
+    records.each do |trophonius_record|
+      begin
+        attributes = FileMaker::<%= class_name %>.to_pg(trophonius_record).merge(
+          created_at: Time.current,
+          updated_at: Time.current
+        )
+        <%= class_name %>.create!(attributes)
+        success_count += 1
+      rescue StandardError => e
+        @failed_fm_ids << trophonius_record.record_id
+        Rails.logger.error("Failed to create record from FileMaker ID #{trophonius_record.record_id}: #{e.message}")
+      end
     end
 
-    <%= class_name %>.insert_all(attributes_array)
-    records.size
+    success_count
   end
 
   def update_records
     records = records_to_update
     return 0 if records.empty?
 
-    records.each do |trophonius_record|
-      pg_attributes = YourTrophoniusModel.to_pg(trophonius_record)
+    success_count = 0
 
-      <%= class_name %>.where(filemaker_id: trophonius_record.record_id).update_all(
-        pg_attributes.merge(updated_at: Time.current)
-      )
+    records.each do |trophonius_record|
+      begin
+        pg_attributes = FileMaker::<%= class_name %>.to_pg(trophonius_record)
+
+        <%= class_name %>.where(filemaker_id: trophonius_record.record_id).update_all(
+          pg_attributes.merge(updated_at: Time.current)
+        )
+        success_count += 1
+      rescue StandardError => e
+        @failed_fm_ids << trophonius_record.record_id
+        Rails.logger.error("Failed to update record from FileMaker ID #{trophonius_record.record_id}: #{e.message}")
+      end
     end
 
-    records.size
+    success_count
   end
 
   def delete_records
     ids = records_to_delete
     return if ids.empty?
 
-    <%= class_name %>.where(id: ids).destroy_all
+    ids.each do |pg_id|
+      begin
+        <%= class_name %>.where(id: pg_id).destroy_all
+      rescue StandardError => e
+        @failed_pg_ids << pg_id
+        Rails.logger.error("Failed to delete record with PostgreSQL ID #{pg_id}: #{e.message}")
+      end
+    end
   end
 
   def create_sync_record

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

@@ -24,9 +24,9 @@ module Harmonia
     scope :completed, -> { where(status: 'completed') }
     scope :failed, -> { where(status: 'failed') }
 
-    # Get the most recent sync for a table in a given direction
+    # Get the most recent successful sync for a table in a given direction
     def self.last_sync_for(table_name, direction)
-      for_direction(direction).for_table(table_name).recent.first
+      completed.for_direction(direction).for_table(table_name).recent.first
     end
 
     # Calculate sync completion percentage
@@ -46,19 +46,23 @@ module Harmonia
     end
 
     # Mark sync as completed
-    def finish!(records_synced:, records_required:)
+    def finish!(records_synced:, records_required:, failed_fm_ids: [], failed_pg_ids: [])
       update!(
         status: 'completed',
         records_synced: records_synced,
-        records_required: records_required
+        records_required: records_required,
+        failed_fm_ids: failed_fm_ids,
+        failed_pg_ids: failed_pg_ids
       )
     end
 
     # Mark sync as failed
-    def fail!(error_message)
+    def fail!(error_message, failed_fm_ids: [], failed_pg_ids: [])
       update!(
         status: 'failed',
-        error_message: error_message
+        error_message: error_message,
+        failed_fm_ids: failed_fm_ids,
+        failed_pg_ids: failed_pg_ids
       )
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: harmonia
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Kempen Automatisering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-11 00:00:00.000000000 Z
+date: 2025-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trophonius