V2/V3 Compability Changes (#10127)

* add new routes

* use new has_paid field

* add history entry in payment controller

* add route file that distinguishes between v2 and v3 routes

* rename paymentStatus to paymentStatuses to indicate array

* eslint

* add V3 Polling Url

* add competition to all routes

* make available_refunds compatible with v3

* eslint

* add missing comma

* set V2_REGISTRATIONS_POLL_URL as optional in local

* move add_history_entry to record_payment and refund_payment

* fix comparison whoopsie

* use better way to load registration in available_refunds

* fix tests

* fix v2 registration breaking

* move order so we still return the right thing

* fix v3

* Make V3 use the V1 export

* expose routes in staging

* allow routes to be exposed during asset compilation and on staging

* fix acting user not being set for bulk update

* fix acting user not loading properly

* Fix form resetting V3 comps to V2 implicitly

* fix registration deletion in v3

* fix waiting lists

* don't remove if we are moving

* fix tests for cancelled

* fixed tests

* added event ids to validate_update_status

* fix rubocop

* fix typo

* fix another typo

* fix pending scope

* added test for registration count

* fix polling

* fix v3 polling

* fix typo

* add ? in registration?.payment

* use new boolean

* don't mark registration as finished if user has paid, but their registration is cancelled

---------

Co-authored-by: Gregor Billing <gbilling@worldcubeassociation.org>
Co-authored-by: Duncan <duncanonthejob@gmail.com>

Author: 3 people

.env.assets.production

@@ -1,3 +1,4 @@
 WCA_REGISTRATIONS_URL=https://registration.worldcubeassociation.org
-WCA_REGISTRATIONS_POLL_URL=https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/prod
+V2_REGISTRATIONS_POLL_URL=https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/prod
+V3_REGISTRATIONS_POLL_URL=https://t7ni46t9jd.execute-api.us-west-2.amazonaws.com/v1/prod
 ROOT_URL=https://www.worldcubeassociation.org

.env.assets.staging

@@ -1,3 +1,4 @@
 WCA_REGISTRATIONS_URL=https://staging.registration.worldcubeassociation.org
-WCA_REGISTRATIONS_POLL_URL=https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/staging
+V2_REGISTRATIONS_POLL_URL=https://1rq8d7dif3.execute-api.us-west-2.amazonaws.com/v1/staging
+V3_REGISTRATIONS_POLL_URL=https://t7ni46t9jd.execute-api.us-west-2.amazonaws.com/v1/staging
 ROOT_URL=https://staging.worldcubeassociation.org

app/controllers/api/v1/registrations/registrations_controller.rb

@@ -77,7 +77,7 @@ def bulk_update
     competition = Competition.find(params[:competition_id])
 
     update_requests.each do |update|
-      updated_registrations[update['user_id']] = Registrations::Lanes::Competing.update!(update, competition, @current_user)
+      updated_registrations[update['user_id']] = Registrations::Lanes::Competing.update!(update, competition, @current_user.id)
     end
 
     render json: { status: 'ok', updated_registrations: updated_registrations }

app/controllers/payment_controller.rb

@@ -5,15 +5,16 @@ def available_refunds
     if current_user
       attendee_id = params.require(:attendee_id)
       competition_id, user_id = attendee_id.split("-")
+      competition = Competition.find(competition_id)
 
-      ms_registration = MicroserviceRegistration.includes(:competition, :payment_intents)
-                                                .find_by(competition_id: competition_id, user_id: user_id)
-      return render status: :bad_request, json: { error: "Registration not found" } unless ms_registration.present?
+      registration_scope = competition.uses_microservice_registrations? ? MicroserviceRegistration : Registration
+      registration = registration_scope.includes(:payment_intents).find_by(competition: competition, user_id: user_id)
+
+      return render status: :bad_request, json: { error: "Registration not found" } unless registration.present?
 
-      competition = ms_registration.competition
       return render status: :unauthorized, json: { error: 'unauthorized' } unless current_user.can_manage_competition?(competition)
 
-      intents = ms_registration.payment_intents
+      intents = registration.payment_intents
 
       charges = intents.flat_map { |intent|
         payment_provider = CompetitionPaymentIntegration::INTEGRATION_RECORD_TYPES.invert[intent.payment_record_type]

app/models/competition.rb

@@ -1878,7 +1878,7 @@ def to_competition_info
                force_comment_in_registration use_wca_registration external_registration_page guests_entry_fee_lowest_denomination guest_entry_status
                information events_per_registration_limit],
       methods: %w[url website short_name city venue_address venue_details latitude_degrees longitude_degrees country_iso2 event_ids registration_currently_open?
-                  main_event_id number_of_bookmarks using_payment_integrations? uses_qualification? uses_cutoff? competition_series_ids registration_full?],
+                  main_event_id number_of_bookmarks using_payment_integrations? uses_qualification? uses_cutoff? competition_series_ids registration_full? registration_version],
       include: %w[delegates organizers],
     }
     self.as_json(options)
@@ -2569,10 +2569,31 @@ def set_form_data(form_data, current_user)
         self.championships = []
       end
 
+      # TODO: V3-Reg Remove this line and method implementation below
+      migration_reg_version = self.form_to_registration_version(form_data)
+
       assign_attributes(Competition.form_data_to_attributes(form_data))
 
-      # TODO: Remove once v3 registrations (monolith integration) are implemented by default
-      self.registration_version = :v1 unless self.use_wca_registration
+      # TODO: V3-Reg Remove once v3 registrations (monolith integration) are implemented by default
+      self.registration_version = self.use_wca_registration? ? migration_reg_version : :v1
+    end
+  end
+
+  private def form_to_registration_version(form_data)
+    form_uses_new_registrations = form_data.dig('admin', 'usesNewRegistrationSystem')
+
+    if !form_uses_new_registrations
+      # If the form explicitly requested the old system, that's what you're gonna get.
+      :v1
+    elsif self.uses_new_registration_system?
+      # If we reached this point, we know that the form did not request the old system
+      #   so that means the form requested the new version. Use whatever new version
+      #   we're already on, to make sure the form doesn't ping-pong between V2 and V3
+      self.registration_version
+    else
+      # The form requested the new system, but we're not on the new system yet.
+      #   Upgrade to whatever system works best
+      NEW_REG_SYSTEM_DEFAULT
     end
   end
 

app/models/registration.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 class Registration < ApplicationRecord
-  scope :pending, -> { where(accepted_at: nil).where(deleted_at: nil).where(is_competing: true) }
+  scope :pending, -> { where(accepted_at: nil).where(deleted_at: nil).where(rejected_at: nil).where(waitlisted_at: nil).where(is_competing: true) }
   scope :accepted, -> { where.not(accepted_at: nil).where(deleted_at: nil) }
   scope :deleted, -> { where.not(deleted_at: nil) }
   scope :rejected, -> { where.not(rejected_at: nil) }
+  scope :waitlisted, -> { where.not(waitlisted_at: nil) }
   scope :non_competing, -> { where(is_competing: false) }
   scope :not_deleted, -> { where(deleted_at: nil) }
   scope :with_payments, -> { joins(:registration_payments).distinct }
@@ -177,6 +178,7 @@ def record_payment(
     receipt,
     user_id
   )
+    add_history_entry({ payment_status: receipt.determine_wca_status, iso_amount: amount_lowest_denomination }, "user", user_id, 'Payment')
     registration_payments.create!(
       amount_lowest_denomination: amount_lowest_denomination,
       currency_code: currency_code,
@@ -192,6 +194,7 @@ def record_refund(
     refunded_registration_payment_id,
     user_id
   )
+    add_history_entry({ payment_status: "refund", iso_amount: paid_entry_fees.cents - amount_lowest_denomination }, "user", user_id, 'Refund')
     registration_payments.create!(
       amount_lowest_denomination: amount_lowest_denomination.abs * -1,
       currency_code: currency_code,
@@ -238,7 +241,7 @@ def competing_status
     if accepted? || !is_competing?
       Registrations::Helper::STATUS_ACCEPTED
     elsif deleted?
-      Registrations::Helper::STATUS_DELETED
+      Registrations::Helper::STATUS_CANCELLED
     elsif rejected?
       Registrations::Helper::STATUS_REJECTED
     elsif pending?

app/webpacker/components/RegistrationsV2/Register/CompetingStep.jsx

@@ -55,7 +55,7 @@ export default function CompetingStep({
 }) {
   const maxEvents = competitionInfo.events_per_registration_limit ?? Infinity;
   const isRegistered = Boolean(registration);
-  const hasPaid = registration?.payment.payment_status === 'succeeded';
+  const hasPaid = registration?.payment?.has_paid;
   const dispatch = useDispatch();
 
   const confirm = useConfirm();
@@ -89,7 +89,7 @@ export default function CompetingStep({
 
   const queryClient = useQueryClient();
   const { mutate: updateRegistrationMutation, isPending: isUpdating } = useMutation({
-    mutationFn: updateRegistration,
+    mutationFn: (body) => updateRegistration(competitionInfo, body),
     onError: (data) => {
       const { error } = data.json;
       dispatch(setMessage(
@@ -117,7 +117,7 @@ export default function CompetingStep({
   });
 
   const { mutate: createRegistrationMutation, isLoading: isCreating } = useMutation({
-    mutationFn: submitEventRegistration,
+    mutationFn: (body) => submitEventRegistration(competitionInfo, body),
     onError: (data) => {
       const { error } = data.json;
       dispatch(setMessage(

app/webpacker/components/RegistrationsV2/Register/PaymentStep.jsx

@@ -10,15 +10,15 @@ import {
   Label,
   Segment,
 } from 'semantic-ui-react';
-import { paymentFinishUrl, wcaRegistrationUrl } from '../../../lib/requests/routes.js.erb';
+import { paymentFinishUrl, paymentTicketUrl } from '../../../lib/requests/routes.js.erb';
 import { useDispatch } from '../../../lib/providers/StoreProvider';
 import { setMessage } from './RegistrationMessage';
 import fetchWithJWTToken from '../../../lib/requests/fetchWithJWTToken';
 import Loading from '../../Requests/Loading';
 import i18n from '../../../lib/i18n';
 import useCheckboxState from '../../../lib/hooks/useCheckboxState';
 import AutonumericField from '../../wca/FormBuilder/input/AutonumericField';
-import RegistrationOverview from './RegistrationOverview';
+import getPaymentTicket from "../api/payment/get/getPaymentTicket";
 
 export default function PaymentStep({
   competitionInfo,
@@ -37,7 +37,7 @@ export default function PaymentStep({
 
   useEffect(() => {
     // TODO When we add per Event Payment this logic needs to also check if an additional payment is needed
-    if (registration?.payment?.payment_status === 'succeeded') {
+    if (registration?.payment?.has_paid) {
       nextStep();
     }
   }, [nextStep, registration]);
@@ -57,9 +57,7 @@ export default function PaymentStep({
     await elements.submit();
 
     // Create the PaymentIntent and obtain clientSecret
-    const { data } = await fetchWithJWTToken(`${wcaRegistrationUrl}/api/v1/${competitionInfo.id}/payment?donation_iso=${donationAmount}`, {
-      method: 'GET',
-    });
+    const data = await getPaymentTicket(competitionInfo, donationAmount);
 
     const { client_secret: clientSecret } = data;
 

app/webpacker/components/RegistrationsV2/Register/Processing.jsx

@@ -11,23 +11,21 @@ export default function Processing({ competitionInfo, user, onProcessingComplete
 
   const { data } = useQuery({
     queryKey: ['registration-status-polling', user.id, competitionInfo.id],
-    queryFn: async () => pollRegistrations(user.id, competitionInfo.id),
+    queryFn: async () => pollRegistrations(user.id, competitionInfo),
     refetchInterval: REFETCH_INTERVAL,
     onSuccess: () => {
       setPollCounter(pollCounter + 1);
     },
   });
   useEffect(() => {
     if (
-      data
-      && (data.status.payment === 'initialized'
-        || data.status.competing === 'pending')
+      data && (data.status?.competing === 'pending' || !data.processing)
     ) {
       onProcessingComplete();
     }
   }, [data, onProcessingComplete]);
   return (
-    <Modal open={data?.status?.competing !== 'pending'} dimmer="blurring">
+    <Modal open={data?.status?.competing !== 'pending' || !data?.processing} dimmer="blurring">
       <Modal.Header>
         {I18n.t('competitions.registration_v2.register.processing')}
       </Modal.Header>
@@ -37,7 +35,7 @@ export default function Processing({ competitionInfo, user, onProcessingComplete
             {I18n.t('competitions.registration_v2.register.processing_longer')}
           </Message>
         )}
-        {data && data.queueCount > 500 && (
+        {data && data.queueCount > 50 && (
           <Message warning>
             {I18n.t('competitions.registration_v2.register.processing_queue', {
               queueCount: data.queueCount,

app/webpacker/components/RegistrationsV2/Register/RegistrationOverview.jsx

@@ -44,7 +44,7 @@ export default function RegistrationOverview({
   const queryClient = useQueryClient();
 
   const { mutate: deleteRegistrationMutation, isPending: isDeleting } = useMutation({
-    mutationFn: () => updateRegistration({
+    mutationFn: () => updateRegistration(competitionInfo, {
       user_id: registration.user_id,
       competition_id: competitionInfo.id,
       competing: {