Skip to content

Commit

Permalink
Merge pull request #123 from Hoang-Nguyen-Huy/PBS-84-Manage-Order-Ame…
Browse files Browse the repository at this point in the history
…nities

Pbs 84 manage order amenities
  • Loading branch information
nguyenhcp2004 authored Oct 31, 2024
2 parents 23187a2 + f8eaeaf commit 7478d69
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/main/java/com/swp/PodBookingSystem/service/OrderService.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public Order createOrderByRequest(Account account, OrderDetailCreationRequest re
try {
Order order = new Order();
order.setAccount(account);
order.setId(renderOrderID(request));
order.setId(renderOrderID(request,account));
order.setCreatedAt(LocalDateTime.now());
order.setUpdatedAt(LocalDateTime.now());
orderRepository.save(order);
Expand Down Expand Up @@ -209,8 +209,13 @@ public static String removeDiacritics(String input) {
return pattern.matcher(normalized).replaceAll("").replaceAll("[^\\p{L}]", "");
}

public String renderOrderID(OrderDetailCreationRequest request) {
String customerName = removeDiacritics(request.getCustomer().getName());
public String renderOrderID(OrderDetailCreationRequest request, Account account) {
String customerName;
if(request.getCustomer() == null) {
customerName = removeDiacritics(account.getName());
}else {
customerName = removeDiacritics(request.getCustomer().getName());
}
String roomNames = request.getSelectedRooms()
.stream()
.map(room -> room.getName().replace(" ", ""))
Expand Down

0 comments on commit 7478d69

Please sign in to comment.