Rewrite RecalculatePriceHandler #609
Draft
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
agoerler
reviewed
Jun 16, 2023
| bookingFee = (BigDecimal) bookingFeeRow.get().get("BookingFee"); | ||
| private BigDecimal calculateTravelPrice(String travelUUID) { | ||
| BigDecimal bookingFee = run(Select.from(TRAVEL) | ||
| .columns(t -> t.BookingFee().as("sum")) |
There was a problem hiding this comment.
booking fee is not a sum
Comment on lines
95
to
97
| private static interface Price { | ||
| BigDecimal sum(); | ||
| } |
There was a problem hiding this comment.
I don't think this interface buys much
| Travel travel = Struct.access(update.data()).as(Travel.class); | ||
| BigDecimal newFee = travel.getBookingFee(); | ||
| if (newFee != null) { | ||
| Map<String, Object> travelKeys = CqnAnalyzer.create(context.getModel()).analyze(update).targetKeys(); |
There was a problem hiding this comment.
CqnAnalyzer.create(context.getModel()) -> we should offer this directly on the "event context"
| @On(event = { EVENT_DRAFT_PATCH }, entity = Travel_.CDS_NAME) | ||
| public void updateTravelPriceOnBookingFeeUpdate(DraftPatchEventContext context) { | ||
| CqnUpdate update = context.getCqn(); | ||
| Travel travel = Struct.access(update.data()).as(Travel.class); |
There was a problem hiding this comment.
Suggested change
| Travel travel = Struct.access(update.data()).as(Travel.class); | |
| Travel travelData = Struct.access(update.data()).as(Travel.class); |
| Travel travel = Struct.access(update.data()).as(Travel.class); | ||
| BigDecimal newFee = travel.getBookingFee(); | ||
| if (newFee != null) { | ||
| Map<String, Object> travelKeys = CqnAnalyzer.create(context.getModel()).analyze(update).targetKeys(); |
There was a problem hiding this comment.
Access travelKeys as Travel ?
e.g.
Travel travelKeys = CqnAnalyzer.create(context.getModel()).analyze(update).targetKeys(Travel.class);
BigDecimal oldFee = selectTravelFee(travelKeys);
BigDecimal travelPrice = selectTravelPrice(travelKeys.getTravelUuid()).add(newFee).subtract(oldFee);
Comment on lines
180
to
182
| CqnSelect query = Select.from(TRAVEL) | ||
| .matching(Map.of(Travel.TRAVEL_UUID, travelUUID, Travel.IS_ACTIVE_ENTITY, false)) | ||
| .columns(t -> t.TotalPrice().as("sum")); |
There was a problem hiding this comment.
maybe extract the query as a private static final and parameterize it for reuse
| .first() | ||
| .ifPresent(row -> calculateAndPatchNewTotalPriceForDraft((String) row.get(Travel.TRAVEL_UUID))); | ||
| private BigDecimal selectTravelFee(Map<String, Object> travelKeys) { | ||
| CqnSelect query = Select.from(TRAVEL).matching(travelKeys).columns(b -> b.BookingFee()); |
There was a problem hiding this comment.
maybe extract the query as a private static final and parameterize it for reuse
| } | ||
|
|
||
| private BigDecimal calculateAndPatchNewTotalPriceForDraft(final String travelUUID) { | ||
| private Booking selectBooking(Map<String, Object> bookingKeys) { | ||
| CqnSelect query = Select.from(BOOKING).matching(bookingKeys).columns(b -> b.BookingUUID(), |
There was a problem hiding this comment.
maybe extract the query as a private static final and parameterize it for reuse
| } | ||
|
|
||
| private BookingSupplement selectSupplement(Map<String, Object> supplementKeys) { | ||
| return draftService.run(Select.from(BOOKING_SUPPLEMENT).matching(supplementKeys) |
There was a problem hiding this comment.
maybe extract the query as a private static final and parameterize it for reuse
| private BigDecimal run(CqnSelect query) { | ||
| BigDecimal sum = persistenceService.run(query).first(Price.class).map(Price::sum).orElse(ZERO); | ||
|
|
||
| return nullToZero(sum); |
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.
Updates the total
Travelprice on Patch and Cancellation ofBookingandBookingSupplementDrafts