Nat Dean-Lewis
5 days ago
61 changed files with 1176 additions and 866 deletions
@ -1,9 +1,13 @@ |
|||||||
<%= govuk_header( |
<%= govuk_header( |
||||||
classes: "app-header app-header--orange", |
classes: "app-header", |
||||||
homepage_url: Rails.application.routes.url_helpers.root_path, |
homepage_url: Rails.application.routes.url_helpers.root_path, |
||||||
navigation_classes: "govuk-header__navigation--end", |
) %> |
||||||
) do |component| |
|
||||||
component.with_product_name(name: t("service_name")) |
<%= govuk_service_navigation( |
||||||
component.with_navigation_item(text: "Your account", href: Rails.application.routes.url_helpers.account_path) |
service_name: t("service_name"), |
||||||
component.with_navigation_item(text: "Sign out", href: Rails.application.routes.url_helpers.destroy_user_session_path) |
service_url: Rails.application.routes.url_helpers.root_path, |
||||||
end %> |
classes: "app-main-service-navigation app-service-navigation--orange", |
||||||
|
) do |component| %> |
||||||
|
<%= component.with_navigation_item(text: "Your account", href: Rails.application.routes.url_helpers.account_path) %> |
||||||
|
<%= component.with_navigation_item(text: "Sign out", href: Rails.application.routes.url_helpers.destroy_user_session_path) %> |
||||||
|
<% end %> |
||||||
|
|||||||
@ -1,13 +1,15 @@ |
|||||||
desc "We tightened the validation in 2026 between initial purchase date, last transaction date and sale date so that no two can be equal and initial purchase date < last transaction date < sale date. To avoid invalid logs we clear lasttransaction if it equals saledate and if initialpurchase = lasttransaction we clear both" |
desc "We tightened the validation between initial purchase date in 2026, last transaction date and sale date so the two can no longer be equal. To avoid invalid logs we clear initialpurchase if it equals saledate and if initialpurchase = lasttransaction we clear both" |
||||||
task fix_sales_logs_with_invalid_initialpurchase_lasttransaction: :environment do |
task fix_sales_logs_with_invalid_initialpurchase_lasttransaction: :environment do |
||||||
lasttransaction_equal_saledate_logs = SalesLog.filter_by_year_or_later(2026).where("lasttransaction = saledate") |
|
||||||
initial_purchase_equal_lasttransaction_logs = SalesLog.filter_by_year_or_later(2026).where("initialpurchase = lasttransaction") |
initial_purchase_equal_lasttransaction_logs = SalesLog.filter_by_year_or_later(2026).where("initialpurchase = lasttransaction") |
||||||
|
lasttransaction_equal_saledate_logs = SalesLog.filter_by_year_or_later(2026).where("lasttransaction = saledate") |
||||||
|
|
||||||
puts "Updating #{lasttransaction_equal_saledate_logs.count} logs where lasttransaction = saledate, #{lasttransaction_equal_saledate_logs.map(&:id)}" |
# this one must happen first since this will always result in a log that passes date validations |
||||||
lasttransaction_equal_saledate_logs.update!(lasttransaction: nil) |
|
||||||
|
|
||||||
puts "Updating #{initial_purchase_equal_lasttransaction_logs.count} logs where initialpurchase = lasttransaction, #{initial_purchase_equal_lasttransaction_logs.map(&:id)}" |
puts "Updating #{initial_purchase_equal_lasttransaction_logs.count} logs where initialpurchase = lasttransaction, #{initial_purchase_equal_lasttransaction_logs.map(&:id)}" |
||||||
initial_purchase_equal_lasttransaction_logs.update!(initialpurchase: nil, lasttransaction: nil) |
initial_purchase_equal_lasttransaction_logs.update!(initialpurchase: nil, lasttransaction: nil) |
||||||
|
|
||||||
|
# this one could fail if lasttransaction == saledate == initialpurchase, but the above case will have already reset these logs |
||||||
|
puts "Updating #{lasttransaction_equal_saledate_logs.count} logs where lasttransaction = saledate, #{lasttransaction_equal_saledate_logs.map(&:id)}" |
||||||
|
lasttransaction_equal_saledate_logs.update!(lasttransaction: nil) |
||||||
|
|
||||||
puts "Done" |
puts "Done" |
||||||
end |
end |
||||||
|
|||||||
Loading…
Reference in new issue