harmonia 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20a7d4c57e312c17c812acfaa1d4f31234d291265b0da78cfdfc94037dcd6bc4
-  data.tar.gz: 93288d73a82f3e86f6e5e9130102beeb5db563c5b192c6d981ea9c2c7e79ac68
+  metadata.gz: 28c0e7e7f87cdbf680cb961b01ef7f599af2c662bebe3c8dd857db2b172e43d6
+  data.tar.gz: 6355cba5ee75d3fcca62040079a70342f72bc6f13ca6554d8671b9af53d0218a
 SHA512:
-  metadata.gz: 0da52f204c3f7a03af63ad177a81a79e710e2eb4c5f50f47046ab36eca2afbcf9cd26bd3bea03ecf6ff58a0f4e52c82e98e025d777c339d4bb8b03ed4af66cf0
-  data.tar.gz: 7b6526bbfafa4a0f732d51bf287313e5ceb7f4f7590e99d115f1f1e48eb0c4691d1a1ad84e6bac5acf5153c59cc57e7fefed665de7e1f2c269c548d22a6af543
+  metadata.gz: b258047a77289e9b4dc8c9e5de0096359a927f761bfee5c02105854973b7afa6314e1d1b8496dc1e0bac73c023e373d14562041bb57a3eac6105736d1888f330
+  data.tar.gz: c485199ad2448e3810dc3c09dda6f73b71a55dd17ec4be924cf5d49483f7761dbbb2465b8cafb67adf5c104a46f45dded59ef34aa630cf02b915bef0c34c0e5e

data/lib/generators/harmonia/reverse_sync_generator.rb

@@ -32,7 +32,10 @@ module Harmonia
 
                 desc 'sync #{table_name} from ActiveRecord to FileMaker'
                 task #{task_name}: :environment do
-                  #{class_name}ToFileMakerSyncer.new.sync
+                  dbc = DatabaseConnector.new
+
+                  syncer = #{class_name}Syncer.new(dbc)
+                  syncer.run
                 end
             TASK
 

data/lib/generators/harmonia/sync_generator.rb

@@ -58,7 +58,10 @@ module Harmonia
 
               desc 'sync #{table_name} from FileMaker to ActiveRecord'
               task #{task_name}: :environment do
-                #{class_name}Syncer.new.sync
+                dbc = DatabaseConnector.new
+
+                syncer = #{class_name}Syncer.new(dbc)
+                syncer.run
               end
           TASK
 

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

@@ -10,8 +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.jsonb :failed_fm_ids, default: {}
+      t.jsonb :failed_pg_ids, default: {}
 
       t.timestamps
     end

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

@@ -6,8 +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 = []
+    @failed_fm_ids = {}
+    @failed_pg_ids = {}
   end
 
   # Main sync method
@@ -119,7 +119,7 @@ class <%= class_name %>Syncer
         <%= class_name %>.create!(attributes)
         success_count += 1
       rescue StandardError => e
-        @failed_fm_ids << trophonius_record.record_id
+        @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}")
       end
     end
@@ -142,7 +142,7 @@ class <%= class_name %>Syncer
         )
         success_count += 1
       rescue StandardError => e
-        @failed_fm_ids << trophonius_record.record_id
+        @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}")
       end
     end
@@ -158,7 +158,7 @@ class <%= class_name %>Syncer
       begin
         <%= class_name %>.where(id: pg_id).destroy_all
       rescue StandardError => e
-        @failed_pg_ids << pg_id
+        @failed_pg_ids[pg_id.to_s] = e.message
         Rails.logger.error("Failed to delete record with PostgreSQL ID #{pg_id}: #{e.message}")
       end
     end

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

@@ -46,7 +46,7 @@ module Harmonia
     end
 
     # Mark sync as completed
-    def finish!(records_synced:, records_required:, failed_fm_ids: [], failed_pg_ids: [])
+    def finish!(records_synced:, records_required:, failed_fm_ids: {}, failed_pg_ids: {})
       status = records_synced == records_required ? 'completed' : 'failed'
       update!(
         status: status,
@@ -58,7 +58,7 @@ module Harmonia
     end
 
     # Mark sync as failed
-    def fail!(error_message, failed_fm_ids: [], failed_pg_ids: [])
+    def fail!(error_message, failed_fm_ids: {}, failed_pg_ids: {})
       update!(
         status: 'failed',
         error_message: error_message,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: harmonia
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Kempen Automatisering