iknow_view_models 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90ccbf1e2c6cbd490de913f189646e01fbb2b0cda22c6530d9d0794667a6650d
-  data.tar.gz: 2ed2d34f0d09e4ee4c295a92ef5cf34b0054062ae8dbdc433e33c10840b9e2c5
+  metadata.gz: ec9588bf18a627cee4ffefc47ca45c430d733121aa093809cdd366cb8d167d50
+  data.tar.gz: 7ff4fe90c65d67251282626bc9ed5d367c6679b879e138fea8cc0b7b32ecfcf0
 SHA512:
-  metadata.gz: c3f08635ca1378a44fbd2a9dcade0cf3f8f7edb2169b46f8c1c13c3869d4453f64d5dd96e9f1c91018d466a078ff63d3bce1e892cc938a5a45fe89979f89cacc
-  data.tar.gz: f02a6f45243e40fb54d7fd0ac146667c6673116b83eb93795b7b454d1ee286bb4d2d797587b9a35662a09f5f3e7ee616b2086aa1a24dc963ade74e22a1e70f92
+  metadata.gz: f57f01263cc27d284e31d484f07b56960e5cf743380f912b223e62ceee28dff69fa061f6bdb58c7ac005e5e8b7d0421d8da319ac7debd61160787718f5f77c6e
+  data.tar.gz: 76cd1b4f2a14748200b27a704299d7b8a6a610af8e2f32c5517f3d92791793de08257627c1bb6a0ee36785b925ee64af233eab859addc01871ad5165b332ebe3

data/lib/iknow_view_models/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IknowViewModels
-  VERSION = '3.1.3'
+  VERSION = '3.1.4'
 end

data/lib/view_model/active_record/update_context.rb

@@ -94,11 +94,16 @@ class ViewModel::ActiveRecord
       # won't yet include through a polymorphic boundary: for now we become
       # lazy-loading and slow every time that happens.
 
-      # Combine our root and referenced updates, and separate by viewmodel type
+      # Combine our root and referenced updates, and separate by viewmodel type.
+      # Sort by id where possible to obtain as close to possible a deterministic
+      # update order to avoid database write deadlocks. This can't be entirely
+      # comprehensive, since we can't control the order that shared references
+      # are referred to from roots (and therefore visited).
       updates_by_viewmodel_class =
         root_updates.lazily
           .map { |root_update| [nil, root_update] }
           .concat(referenced_updates)
+          .sort_by { |_, update_data| update_data.metadata.id.to_s }
           .group_by { |_, update_data| update_data.viewmodel_class }
 
       # For each viewmodel type, look up referenced models and construct viewmodels to update
@@ -115,7 +120,7 @@ class ViewModel::ActiveRecord
 
             if models.size < model_ids.size
               missing_model_ids = model_ids - models.map(&:id)
-              missing_viewmodel_refs = missing_model_ids.map  { |id| ViewModel::Reference.new(viewmodel_class, id) }
+              missing_viewmodel_refs = missing_model_ids.map { |id| ViewModel::Reference.new(viewmodel_class, id) }
               raise ViewModel::DeserializationError::NotFound.new(missing_viewmodel_refs)
             end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iknow_view_models
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - iKnow Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord