[PM 21889] 500 Response on POST billing/restart-subscription (#5851)

* Resolve the 500 errors on restart subscription

* Rename the variable name

Author: cyprain-okeke

src/Api/Billing/Controllers/OrganizationBillingController.cs

@@ -302,8 +302,12 @@ public async Task<IResult> RestartSubscriptionAsync([FromRoute] Guid organizatio
         Debug.Assert(org is not null, "This organization has already been found via this same ID, this should be fine.");
         var paymentSource = new TokenizedPaymentSource(organizationSignup.PaymentMethodType.Value, organizationSignup.PaymentToken);
         var taxInformation = TaxInformation.From(organizationSignup.TaxInfo);
-        await organizationBillingService.UpdatePaymentMethod(org, paymentSource, taxInformation);
         await organizationBillingService.Finalize(sale);
+        var updatedOrg = await organizationRepository.GetByIdAsync(organizationId);
+        if (updatedOrg != null)
+        {
+            await organizationBillingService.UpdatePaymentMethod(updatedOrg, paymentSource, taxInformation);
+        }
 
         return TypedResults.Ok();
     }