From c0b048bc9bc023c7b4d4b421286910da89fea651 Mon Sep 17 00:00:00 2001 From: FinnIckler Date: Fri, 25 Oct 2024 14:52:00 +0200 Subject: [PATCH 1/2] V2 -> V3 migration payload --- app/controllers/registration_controller.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/registration_controller.rb b/app/controllers/registration_controller.rb index 82d3fc06..ff3a8c7f 100644 --- a/app/controllers/registration_controller.rb +++ b/app/controllers/registration_controller.rb @@ -304,6 +304,7 @@ def get_registrations(competition_id, only_attending: false) end else Registration.where(competition_id: competition_id).all.map do |x| + payment_status = x.payment_status { user_id: x['user_id'], competing: { event_ids: x.event_ids, @@ -313,7 +314,9 @@ def get_registrations(competition_id, only_attending: false) admin_comment: x.admin_comment, }, payment: { - payment_status: x.payment_status, + payment_status: payment_status, + payment_statuses: [payment_status], + has_paid: payment_status == "succeeded", payment_amount_iso: x.payment_amount, payment_amount_human_readable: x.payment_amount_human_readable, updated_at: x.payment_date, From 14a5fdc731084b24922d7853cffea4f2a094bdd4 Mon Sep 17 00:00:00 2001 From: FinnIckler Date: Fri, 25 Oct 2024 15:10:18 +0200 Subject: [PATCH 2/2] rubocop --- app/controllers/registration_controller.rb | 2 +- lib/competition_info.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/registration_controller.rb b/app/controllers/registration_controller.rb index ff3a8c7f..389ff23a 100644 --- a/app/controllers/registration_controller.rb +++ b/app/controllers/registration_controller.rb @@ -316,7 +316,7 @@ def get_registrations(competition_id, only_attending: false) payment: { payment_status: payment_status, payment_statuses: [payment_status], - has_paid: payment_status == "succeeded", + has_paid: payment_status == 'succeeded', payment_amount_iso: x.payment_amount, payment_amount_human_readable: x.payment_amount_human_readable, updated_at: x.payment_date, diff --git a/lib/competition_info.rb b/lib/competition_info.rb index 47b944f0..301c2c7b 100644 --- a/lib/competition_info.rb +++ b/lib/competition_info.rb @@ -45,7 +45,7 @@ def guest_limit end def registration_open? - @competition_json['registration_open'] <= Time.now && @competition_json['registration_close'] > Time.now + @competition_json['registration_open'] <= Time.now.utc && @competition_json['registration_close'] > Time.now.utc end def using_wca_payment?