further work on #173

Author: catmando

ruby/hyper-model/lib/reactive_record/active_record/reactive_record/isomorphic_base.rb

@@ -453,6 +453,8 @@ def self.save_records(models, associations, acting_user, validate, save)
             elsif parent.class.reflect_on_association(association[:attribute].to_sym).collection?
               #puts ">>>>>>>>>> #{parent.class.name}.send('#{association[:attribute]}') << #{reactive_records[association[:child_id]]})"
               dont_save_list.delete(parent)
+
+
               if reactive_records[association[:child_id]]&.new_record?
                 dont_save_list << reactive_records[association[:child_id]]
               end
@@ -465,14 +467,14 @@ def self.save_records(models, associations, acting_user, validate, save)
             else
               #puts ">>>>ASSOCIATION>>>> #{parent.class.name}.send('#{association[:attribute]}=', #{reactive_records[association[:child_id]]})"
               parent.send("#{association[:attribute]}=", reactive_records[association[:child_id]])
-
               dont_save_list.delete(parent)
-              if reactive_records[association[:child_id]]&.new_record? && parent.class.reflect_on_association(association[:attribute].to_sym).macro == :has_one
+
+              if parent.class.reflect_on_association(association[:attribute].to_sym).macro == :has_one &&
+                 reactive_records[association[:child_id]]&.new_record?
                 dont_save_list << reactive_records[association[:child_id]]
               end
             end
           end if associations
-
           # get rid of any records that don't require further processing, as a side effect
           # we also save any records that need to be saved (these may be rolled back later.)
 
@@ -481,6 +483,7 @@ def self.save_records(models, associations, acting_user, validate, save)
             next true  if record.frozen?  # skip (but process later) frozen records
             next true  if dont_save_list.include?(record) # skip if the record is on the don't save list
             next true  if record.changed.include?(record.class.primary_key)  # happens on an aggregate
+            next true  if record.persisted? # record may be have been saved as result of has_one assignment
             next false if record.id && !record.changed? # throw out any existing records with no changes
             # if we get to here save the record and return true to keep it
             op = new_models.include?(record) ? :create_permitted? : :update_permitted?
@@ -505,7 +508,6 @@ def self.save_records(models, associations, acting_user, validate, save)
             attributes[model.class.primary_key] = model[model.class.primary_key]
             [reactive_record_id, model.class.name, attributes, messages]
           end
-
           # if we are not saving (i.e. just validating) then we rollback the transaction
 
           raise ActiveRecord::Rollback, 'This Rollback is intentional!' unless save

ruby/hyper-model/spec/batch2/one_to_one_spec.rb

@@ -85,6 +85,8 @@ def compare_to_server(model, expression, expected_result, load=true)
   end
 
   before(:each) do
+    Parent.delete_all
+    Child.delete_all
     @parent1 = Parent.create(name: 'parent1')
     @child1 = Child.create(name: 'child1', parent: @parent1)
   end
@@ -96,4 +98,12 @@ def compare_to_server(model, expression, expected_result, load=true)
   it 'will load the child' do
     compare_to_server @parent1, 'child.name', 'child1'
   end
+
+  it 'saving parent and child from client' do
+    expect_promise do
+      Parent.new(name: 'parent', child: Child.new(name: 'child')).save.then do |response|
+        response[:saved_models].collect { |m| m[1] }
+      end
+    end.to contain_exactly('Parent', 'Child')
+  end
 end