table_sync 4.0.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d56abd7c8729d7301e24bf4da9b6e1b8f4a44c387f3041a746398ed1bb381e
-  data.tar.gz: 10344d248c85c9effc5f25ef1442b176a2c90f2135efea3dfaf653df2c53d408
+  metadata.gz: 73b565f881f6ae36dd659dd4d99d04bf0a739aa0456410c5b730eb7f0b107492
+  data.tar.gz: 95dee1cf9f11e6a05c04f3edd4cb5845e3819ea5aab694b3939b5b6e7e4b114d
 SHA512:
-  metadata.gz: 1c2dc57d1e62c294ffab4e2ec32361b1bcecdc06f3037f6944fb044e19f3fe6f9efe1409b086ab6b8bbe0f5ac801cc609896a5750733bc4536a0f4c11806a008
-  data.tar.gz: edb939c55898245a92ac762adbbf933cfd4fb7fc6ebf8e4c0bc1a18398ecd2d354f7604f851206c0c1c7a6b1f2eab4af987a0505a204a6cbdff2966e37257800
+  metadata.gz: a5af5e1a66865f69ff220151e64649813c99af9a32323d7c3d246ae08a6e5962314bb911041b648898b02c6fc684f6312ce187647d5e0c0db8cbf9bef52cc435
+  data.tar.gz: 45b02a9f461b7cd406084bfe6fe2cd643bb43045f560cd06f2d4521e44067b1795a6ce231fbe6095a81d4ecfbf7bb678c8d05a61e4c369affd71a0abc6dd0d1c

data/CHANGELOG.md

@@ -1,6 +1,27 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [4.2.1] - 2020-11-20
+### Fixed
+- bug with sorting data in handler, it was bad idea to use `.hash` replaced to `.to_s` 
+
+## [4.2.0] - 2020-11-19
+
+- No changes. Just stabilization release.
+
+## [4.1.2] - 2020-11-19
+### Fixed
+- bug with sorting data in handler
+
+## [4.1.1] - 2020-11-06
+### Fixed
+- dead locks in receiving module (see: `spec/receiving/handler_spec.rb#avoid dead locks`)
+
+## [4.1.0] - 2020-11-02
+### Changed
+- move `TableSync::Instrument.notify` from models to the handler
+- fire `TableSync::Instrument.notify` after commit insted of in transaction
+
 ## [4.0.0] - 2020-10-23
 ### Returned
 - config inheritance

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    table_sync (4.0.0)
+    table_sync (4.2.1)
       memery
       rabbit_messaging (~> 0.3)
       rails
@@ -84,7 +84,7 @@ GEM
     crass (1.0.6)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    erubi (1.9.0)
+    erubi (1.10.0)
     exception_notification (4.4.3)
       actionmailer (>= 4.0, < 7)
       activesupport (>= 4.0, < 7)
@@ -119,11 +119,11 @@ GEM
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rabbit_messaging (0.7.1)
+    rabbit_messaging (0.9.0)
       bunny (~> 2.0)
       exception_notification
       lamian
-      rails
+      rails (>= 5.2)
       sneakers (~> 2.0)
       tainbox
     rack (2.2.3)

data/docs/receiving.md

@@ -22,7 +22,7 @@ class Rabbit::Handler::MainProject::TableSync < TableSync::ReceivingHandler
   receive "User", to_table: :clients, events: %i[update destroy] do
     mapping_overrides email: :project_user_email, id: :project_user_id
 
-    only :project_user_email, :project_user_id
+    only :project_user_email, :project_user_id, :project_id
     target_keys :project_id, :project_user_id
     rest_key :project_user_rest
     version_key :project_user_version
@@ -37,7 +37,7 @@ class Rabbit::Handler::MainProject::TableSync < TableSync::ReceivingHandler
   end
 
   receive "User", to_model: CustomModel.new(:users) do
-    rest_key nil
+    rest_key false
   end
 end
 ```

data/lib/table_sync/receiving/handler.rb

@@ -23,6 +23,8 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
 
       validate_data(data, target_keys: target_keys)
 
+      data.sort_by! { |row| row.values_at(*target_keys).to_s }
+
       params = { data: data, target_keys: target_keys, version_key: version_key }
 
       if event == :update
@@ -53,16 +55,20 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
   end
 
   def configs
-    @configs ||= self.class.configs[model]&.map do |config|
-      ::TableSync::Receiving::ConfigDecorator.new(
-        config: config,
-        # next parameters will be send to each proc-options from config
-        event: event,
-        model: model,
-        version: version,
-        project_id: project_id,
-        raw_data: data,
-      )
+    @configs ||= begin
+      configs = self.class.configs[model]
+      configs = configs.sort_by { |config| "#{config.model.schema}.#{config.model.table}" }
+      configs.map do |config|
+        ::TableSync::Receiving::ConfigDecorator.new(
+          config: config,
+          # next parameters will be send to each proc-options from config
+          event: event,
+          model: model,
+          version: version,
+          project_id: project_id,
+          raw_data: data,
+        )
+      end
     end
   end
 
@@ -99,9 +105,7 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
     end
 
     if data.uniq { |row| row.slice(*target_keys) }.size != data.size
-      raise TableSync::DataError.new(
-        data, target_keys, "Duplicate rows found!"
-      )
+      raise TableSync::DataError.new(data, target_keys, "Duplicate rows found!")
     end
   end
 
@@ -109,22 +113,23 @@ class TableSync::Receiving::Handler < Rabbit::EventHandler
     model = config.model
 
     model.transaction do
-      if event == :update
-        config.before_update(**params)
-
-        results = model.upsert(**params)
+      results = if event == :update
+                  config.before_update(**params)
+                  model.upsert(**params)
+                else
+                  config.before_destroy(**params)
+                  model.destroy(**params)
+                end
+
+      model.after_commit do
+        TableSync::Instrument.notify table: model.table, schema: model.schema,
+                                     count: results.count, event: event, direction: :receive
+      end
 
-        model.after_commit do
-          config.after_commit_on_update(**params.merge(results: results))
-        end
+      if event == :update
+        model.after_commit { config.after_commit_on_update(**params.merge(results: results)) }
       else
-        config.before_destroy(**params)
-
-        results = model.destroy(**params)
-
-        model.after_commit do
-          config.after_commit_on_destroy(**params.merge(results: results))
-        end
+        model.after_commit { config.after_commit_on_destroy(**params.merge(results: results)) }
       end
     end
   end

data/lib/table_sync/receiving/model/active_record.rb

@@ -18,11 +18,18 @@ module TableSync::Receiving::Model
       def trigger_transactional_callbacks?(*); end
     end
 
+    attr_reader :table, :schema
+
     def initialize(table_name)
       @raw_model = Class.new(::ActiveRecord::Base) do
         self.table_name = table_name
         self.inheritance_column = nil
       end
+
+      model_naming = ::TableSync::NamingResolver::ActiveRecord.new(table_name: table_name)
+
+      @table = model_naming.table.to_sym
+      @schema = model_naming.schema.to_sym
     end
 
     def columns
@@ -45,15 +52,15 @@ module TableSync::Receiving::Model
           AND kcu.constraint_name = tc.constraint_name
         WHERE
           t.table_schema NOT IN ('pg_catalog', 'information_schema')
-          AND t.table_schema = '#{model_naming.schema}'
-          AND t.table_name = '#{model_naming.table}'
+          AND t.table_schema = '#{schema}'
+          AND t.table_name = '#{table}'
         ORDER BY
           kcu.ordinal_position
       SQL
     end
 
     def upsert(data:, target_keys:, version_key:, default_values:)
-      result = data.map do |datum|
+      data.map do |datum|
         conditions = datum.select { |k| target_keys.include?(k) }
 
         row = raw_model.lock("FOR NO KEY UPDATE").where(conditions)
@@ -75,11 +82,6 @@ module TableSync::Receiving::Model
 
         row_to_hash(row)
       end.compact
-
-      TableSync::Instrument.notify(table: model_naming.table, schema: model_naming.schema,
-                                   event: :update, count: result.count, direction: :receive)
-
-      result
     end
 
     def destroy(data:, target_keys:, version_key:)
@@ -100,11 +102,6 @@ module TableSync::Receiving::Model
         raise TableSync::DestroyError.new(data: data, target_keys: target_keys, result: result)
       end
 
-      TableSync::Instrument.notify(
-        table: model_naming.table, schema: model_naming.schema,
-        event: :destroy, count: result.count, direction: :receive
-      )
-
       result
     end
 
@@ -121,11 +118,7 @@ module TableSync::Receiving::Model
     attr_reader :raw_model
 
     def db
-      @raw_model.connection
-    end
-
-    def model_naming
-      ::TableSync::NamingResolver::ActiveRecord.new(table_name: raw_model.table_name)
+      raw_model.connection
     end
 
     def row_to_hash(row)

data/lib/table_sync/receiving/model/sequel.rb

@@ -2,8 +2,18 @@
 
 module TableSync::Receiving::Model
   class Sequel
+    attr_reader :table, :schema
+
     def initialize(table_name)
       @raw_model = Class.new(::Sequel::Model(table_name)).tap(&:unrestrict_primary_key)
+
+      model_naming = ::TableSync::NamingResolver::Sequel.new(
+        table_name: table_name,
+        db: @raw_model.db,
+      )
+
+      @table = model_naming.table.to_sym
+      @schema = model_naming.schema.to_sym
     end
 
     def columns
@@ -15,7 +25,7 @@ module TableSync::Receiving::Model
     end
 
     def upsert(data:, target_keys:, version_key:, default_values:)
-      qualified_version = ::Sequel.qualify(table_name, version_key)
+      qualified_version = ::Sequel.qualify(raw_model.table_name, version_key)
       version_condition = ::Sequel.function(:coalesce, qualified_version, 0) <
                           ::Sequel.qualify(:excluded, version_key)
 
@@ -24,18 +34,10 @@ module TableSync::Receiving::Model
 
       insert_data = type_cast(data)
 
-      result = dataset.returning
-                      .insert_conflict(
-                        target: target_keys,
-                        update: upd_spec,
-                        update_where: version_condition,
-                      )
-                      .multi_insert(insert_data)
-
-      TableSync::Instrument.notify table: model_naming.table, schema: model_naming.schema,
-                                   count: result.count, event: :update, direction: :receive
-
-      result
+      dataset
+        .returning
+        .insert_conflict(target: target_keys, update: upd_spec, update_where: version_condition)
+        .multi_insert(insert_data)
     end
 
     def destroy(data:, target_keys:, version_key:)
@@ -47,10 +49,6 @@ module TableSync::Receiving::Model
         raise TableSync::DestroyError.new(data: data, target_keys: target_keys, result: result)
       end
 
-      TableSync::Instrument.notify table: model_naming.table, schema: model_naming.schema,
-                                   count: result.count,
-                                   event: :destroy, direction: :receive
-
       result
     end
 
@@ -66,14 +64,6 @@ module TableSync::Receiving::Model
 
     attr_reader :raw_model
 
-    def table_name
-      raw_model.table_name
-    end
-
-    def model_naming
-      ::TableSync::NamingResolver::Sequel.new(table_name: table_name, db: db)
-    end
-
     def dataset
       raw_model.dataset
     end

data/lib/table_sync/utils/interface_checker.rb

@@ -95,3 +95,9 @@ __END__
   :primary_keys:
     :parameters: []
     :description: "returns an array with the primary_keys"
+  :table:
+    :parameters: []
+    :description: "returns an instance of Symbol"
+  :schema:
+    :parameters: []
+    :description: "returns an instance of Symbol"

data/lib/table_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TableSync
-  VERSION = "4.0.0"
+  VERSION = "4.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: table_sync
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Umbrellio
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -302,7 +302,7 @@ homepage: https://github.com/umbrellio/table_sync
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.0.rc.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: DB Table synchronization between microservices based on Model's event system
   and RabbitMQ messaging