Merge pull request #118 from wata727/assign_updated_bitemporal_times

Assign updated bitemporal times to the receiver after update/destroy

Author: wata727

lib/activerecord-bitemporal/bitemporal.rb

@@ -326,6 +326,8 @@ def _update_row(attribute_names, attempted_action = 'update')
           @_swapped_id = after_instance.swapped_id
           self.valid_from = after_instance.valid_from
           self.valid_to = after_instance.valid_to
+          self.transaction_from = after_instance.transaction_from
+          self.transaction_to = after_instance.transaction_to
 
           1
         # MEMO: Must return false instead of nil, if `#_update_row` failure.
@@ -352,6 +354,10 @@ def destroy(force_delete: false)
             if @destroyed
               @_swapped_id_previously_was = swapped_id
               @_swapped_id = duplicated_instance.swapped_id
+              self.valid_from = duplicated_instance.valid_from
+              self.valid_to = duplicated_instance.valid_to
+              self.transaction_from = duplicated_instance.transaction_from
+              self.transaction_to = duplicated_instance.transaction_to
             end
           }
           raise ActiveRecord::RecordInvalid unless @destroyed

spec/activerecord-bitemporal/bitemporal_spec.rb

@@ -1040,15 +1040,15 @@ class EmployeeWithUniquness < Employee
       @swapped_id_before_destroy = employee.swapped_id
     end
 
-    it { is_expected.not_to change(employee, :valid_to) }
     it { is_expected.to change(Employee, :call_before_destroy_count).by(1) }
     it { is_expected.to change(Employee, :call_after_destroy_count).by(1) }
     it { is_expected.to change(Employee, :call_after_save_count) }
     it { is_expected.to change(Employee, :count).by(-1) }
     it { is_expected.to change(employee, :destroyed?).from(false).to(true) }
     it { is_expected.not_to change(employee, :valid_from) }
-    it { is_expected.not_to change(employee, :valid_to) }
-    it { is_expected.to change(employee, :transaction_to).from(ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_TO).to(destroyed_time) }
+    it { is_expected.to change(employee, :valid_to).from(ActiveRecord::Bitemporal::DEFAULT_VALID_TO).to(destroyed_time) }
+    it { is_expected.to change(employee, :transaction_from).from(updated_time).to(destroyed_time) }
+    it { is_expected.not_to change(employee, :transaction_to) }
     it { is_expected.to change { Employee.ignore_valid_datetime.within_deleted.count }.by(1) }
     it { is_expected.to change(employee, :swapped_id).from(@swapped_id_before_destroy).to(kind_of(Integer)) }
     it { is_expected.to change(employee, :swapped_id_previously_was).from(kind_of(Integer)).to(@swapped_id_before_destroy) }
@@ -1174,7 +1174,7 @@ class EmployeeWithUniquness < Employee
         employee.define_singleton_method(:on_after_destroy){
           valid_to = self.valid_to
           # After update valid_to
-          self_.instance_exec { expect(valid_to).to eq before_time }
+          self_.instance_exec { expect(valid_to).to eq destroyed_time }
         }
         subject.call
       end
@@ -1190,8 +1190,11 @@ class EmployeeWithUniquness < Employee
     end
 
     context "with `#valid_at`" do
-      subject { -> { Timecop.freeze(destroyed_time) { employee.valid_at(destroyed_time + 1.days, &:destroy) } } }
-      it { is_expected.to change(employee, :transaction_to).from(ActiveRecord::Bitemporal::DEFAULT_TRANSACTION_TO).to(destroyed_time) }
+      subject { -> { Timecop.freeze(destroyed_time) { employee.valid_at(destroyed_time + 1.day, &:destroy) } } }
+      it { is_expected.not_to change(employee, :valid_from) }
+      it { is_expected.to change(employee, :valid_to).from(ActiveRecord::Bitemporal::DEFAULT_VALID_TO).to(destroyed_time + 1.day) }
+      it { is_expected.to change(employee, :transaction_from).from(updated_time).to(destroyed_time) }
+      it { is_expected.not_to change(employee, :transaction_to) }
     end
   end
 

spec/activerecord-bitemporal/visualizer_spec.rb

@@ -297,15 +297,15 @@
                         |                   | 2022-06-23 18:06:06.712
                         |                   |                   | 9999-12-31 00:00:00.000
 2022-05-23 18:06:06.712 +---------------------------------------+
-                        |***************************************|
-                        |***************************************|
-                        |***************************************|
-                        |***************************************|
-2022-06-23 18:06:06.712 +---------------------------------------+
-                        |                   |
-                        |                   |
-                        |                   |
-                        |                   |
+                        |                                       |
+                        |                                       |
+                        |                                       |
+                        |                                       |
+2022-06-23 18:06:06.712 +-------------------+-------------------+
+                        |*******************|
+                        |*******************|
+                        |*******************|
+                        |*******************|
 9999-12-31 00:00:00.000 +-------------------+
 EOS
       end