[AC-2313] Add Gateway fields to Provider edit in Admin #4057
+198
−150
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4057 +/- ##
==========================================
- Coverage 38.44% 38.43% -0.01%
==========================================
Files 1209 1209
Lines 58545 58557 +12
Branches 5585 5593 +8
==========================================
Hits 22509 22509
- Misses 34991 35002 +11
- Partials 1045 1046 +1 ☔ View full report in Codecov by Sentry. |
|
New Issues
Fixed Issues
|
eliykat
requested changes
May 10, 2024
Comment on lines
187
to
191
| model.ToProvider(provider); | ||
| provider.BillingEmail = model.BillingEmail?.ToLowerInvariant().Trim(); | ||
| provider.BillingPhone = model.BillingPhone?.ToLowerInvariant().Trim(); | ||
| provider.Gateway = model.Gateway; | ||
| provider.GatewayCustomerId = model.GatewayCustomerId; | ||
| provider.GatewaySubscriptionId = model.GatewaySubscriptionId; |
There was a problem hiding this comment.
What's wrong with model.ToProvider? :(
To expand slightly - I like putting this kind of mapping/update logic inside models, it makes sense to me from a general OOP perspective, and it removes boilerplate from the controller or service. We also still use it on the CreateProviderModel, so it's inconsistent to change it here.
There was a problem hiding this comment.
I personally just find the signature public virtual Provider ToProvider(Provider existingProvider) and the practice of passing around mutable object properties in general somewhat confusing, but I've reset it back to its original state and added the new Gateway fields to the existing method.
There was a problem hiding this comment.
That's reasonable - do you think it would be better if it was on the object being mutated instead, e.g. existingProvider.Update(editProviderModel)? That way the object is updating itself and not mutating its argument. (I suspect we've done it the current way to avoid importing api models into the core layer, but you could avoid this by making Update an api-only extension method on Provider.)
Anyway - none of that needs to be done here - just thinking aloud.
There was a problem hiding this comment.
Yeah I think that could be a bit more readable. Even just using a different signature for the same approach might make it easier to reason through at first glance as well.
For instance, it makes perfect sense for CreateProviderModel to have a ToProvider method that returns a Provider entity that will be inserted into the DB. But for the EditProviderModel, we already have an existing Provider, so if we're going to update in place, there's no reason to return anything and the method name could be more along the lines of EditProviderModel.UpdateEntity(Provider) or even just EditProviderModel.Update(Provider). If AC is open to that, I can definitely start making those changes as we make more Admin updates! Either way, thank you for calling that out and for the review.
There was a problem hiding this comment.
I agree with EditProviderModel.Update(Provider), returning void!
cturnbull-bitwarden
approved these changes
May 13, 2024
amorask-bitwarden
deleted the
billing/AC-2313/consolidated-billing-admin-gateway-fields
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type of change
Objective
This PR does some refactoring around creating and modifying Pricing Plans in Admin. It also adds input fields to the Provider Edit screen so CS can view and update the Gateway fields for a Provider who has Consolidated Billing.
Screen.Recording.2024-05-06.at.2.26.30.PM.mov