Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Proposal] #force_update with valid_from valid_to #93

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[Proposal] #force_update with valid_from valid_to #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9da48
Implement `force_update` with `valid_from` `valid_to`.
osyo-manga Jun 15, 2022
4b60a7f
Fix uniqueness validation.
osyo-manga Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 56 additions & 22 deletions lib/activerecord-bitemporal/bitemporal.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,18 +309,16 @@ def save!(**)
end

def _update_row(attribute_names, attempted_action = 'update')
current_valid_record, before_instance, after_instance = bitemporal_build_update_records(valid_datetime: self.valid_datetime, force_update: self.force_update?)
current_instances, *new_instances = bitemporal_build_update_records(valid_datetime: self.valid_datetime, force_update: self.force_update?)

# MEMO: このメソッドに来るまでに validation が発動しているので、以後 validate は考慮しなくて大丈夫
ActiveRecord::Base.transaction(requires_new: true) do
current_valid_record&.update_transaction_to(current_valid_record.transaction_to)
before_instance&.save!(validate: false)
# NOTE: after_instance always exists
after_instance.save!(validate: false)
current_instances.each { |instance| instance.update_transaction_to(instance.transaction_to) }
new_instances.compact.each { |instance| instance.save!(validate: false) }

# update 後に新しく生成したインスタンスのデータを移行する
@_swapped_id = after_instance.swapped_id
self.valid_from = after_instance.valid_from
@_swapped_id = new_instances.compact.last.swapped_id
self.valid_from = new_instances.compact.last.valid_from

1
# MEMO: Must return false instead of nil, if `#_update_row` failure.
Expand Down Expand Up @@ -467,12 +465,7 @@ def bitemporal_build_update_records(valid_datetime:, current_time: Time.current,

# force_update の場合は既存のレコードを論理削除した上で新しいレコードを生成する
if current_valid_record.present? && force_update
# 有効なレコードは論理削除する
current_valid_record.assign_transaction_to(current_time)
# 以前の履歴データは valid_from/to を更新しないため、破棄する
before_instance = nil
# 以降の履歴データはそのまま保存
after_instance.transaction_from = current_time
return bitemporal_build_force_update_records(current_time: current_time)

# 有効なレコードがある場合
elsif current_valid_record.present?
Expand Down Expand Up @@ -511,7 +504,42 @@ def bitemporal_build_update_records(valid_datetime:, current_time: Time.current,
after_instance.transaction_from = current_time
end

[current_valid_record, before_instance, after_instance]
[[current_valid_record].compact, before_instance, after_instance]
end

def bitemporal_build_force_update_records(from: valid_from, to: valid_to, current_time: Time.current)
current_records = self.class.bitemporal_for(self.bitemporal_id)
.ignore_valid_datetime
.where('? < valid_to AND valid_from < ?', from, to)
.order(:valid_from, :valid_to) # valid_from == valid_to なレコードの存在を考慮してvalid_toでもorderする
.load
current_records.each { |record|
record.id = record.swapped_id
record.clear_changes_information
}

before_record = nil
overwrite_record = build_new_instance
overwrite_record.transaction_from = current_time
after_record = nil

if current_records.first.valid_from < overwrite_record.valid_from && self.swapped_id != current_records.first.swapped_id
before_record = current_records.first.dup
before_record.valid_to = overwrite_record.valid_from
before_record.transaction_from = current_time
end

if overwrite_record.valid_to < current_records.last.valid_to && self.swapped_id != current_records.last.swapped_id
after_record = current_records.last.dup
after_record.valid_from = overwrite_record.valid_to
after_record.transaction_from = current_time
end

current_records.each { |record|
record.assign_transaction_to(current_time)
}

[current_records, before_record, overwrite_record, after_record]
end
end

Expand Down Expand Up @@ -559,13 +587,20 @@ def scope_relation(record, relation)
end
}

valid_at_scope = finder_class.unscoped.ignore_valid_datetime
.valid_from_lt(valid_to).valid_to_gt(valid_from)
.yield_self { |scope|
# MEMO: #dup などでコピーした場合、id は存在しないが swapped_id のみ存在するケースがあるので
# id と swapped_id の両方が存在する場合のみクエリを追加する
record.id && record.swapped_id ? scope.where.not(id: record.swapped_id) : scope
}
if record.force_update?
valid_to = record.valid_to
valid_at_scope = finder_class.unscoped.ignore_valid_datetime
.valid_from_lt(valid_to).valid_to_gt(valid_from)
relation = relation.where.not(bitemporal_id: record.bitemporal_id)
else
valid_at_scope = finder_class.unscoped.ignore_valid_datetime
.valid_from_lt(valid_to).valid_to_gt(valid_from)
.yield_self { |scope|
# MEMO: #dup などでコピーした場合、id は存在しないが swapped_id のみ存在するケースがあるので
# id と swapped_id の両方が存在する場合のみクエリを追加する
record.id && record.swapped_id ? scope.where.not(id: record.swapped_id) : scope
}
end

# MEMO: Must refer Time.current, when not new record
# Because you don't want transaction_from to be rewritten
Expand All @@ -580,7 +615,6 @@ def scope_relation(record, relation)
transaction_at_scope = finder_class.unscoped
.transaction_to_gt(transaction_from)
.transaction_from_lt(transaction_to)

relation.merge(valid_at_scope.with_valid_datetime).merge(transaction_at_scope.with_transaction_datetime)
end
end
Expand Down
12 changes: 6 additions & 6 deletions spec/activerecord-bitemporal/bitemporal_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,7 +2502,7 @@ class EmployeeWithUniquness < Employee
let(:valid_datetime) { from + 5.days }

it "returns the current valid record and before/after records" do
current, before, after = subject
(current, ), before, after = subject

aggregate_failures do
expect(current).to have_attributes(
Expand Down Expand Up @@ -2536,7 +2536,7 @@ class EmployeeWithUniquness < Employee
let(:force_update) { true }

it "returns the current valid record and an after record" do
current, before, after = subject
(current, ), before, after = subject

aggregate_failures do
expect(current).to have_attributes(
Expand Down Expand Up @@ -2572,7 +2572,7 @@ class EmployeeWithUniquness < Employee
let(:valid_datetime) { from - 5.days }

it "returns only an after record" do
current, before, after = subject
(current, ), before, after = subject

aggregate_failures do
expect(current).to be_nil
Expand All @@ -2592,7 +2592,7 @@ class EmployeeWithUniquness < Employee
let(:force_update) { true }

it "returns the current valid record and an after record" do
current, before, after = subject
(current, ), before, after = subject

aggregate_failures do
expect(current).to have_attributes(
Expand Down Expand Up @@ -2626,7 +2626,7 @@ class EmployeeWithUniquness < Employee
let(:valid_datetime) { to + 5.days }

it "returns before/after records" do
current, before, after = subject
(current, ), before, after = subject

aggregate_failures do
expect(current).to be_nil
Expand All @@ -2653,7 +2653,7 @@ class EmployeeWithUniquness < Employee
let(:force_update) { true }

it "returns the current valid record and an after record" do
current, before, after = subject
(current, ), before, after = subject

aggregate_failures do
expect(current).to have_attributes(
Expand Down
Loading