Skip to content

Commit e625490

Browse files
committed
BENCH-182 comments raised ahs been resolved
1 parent b259b72 commit e625490

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/main/java/com/answerdigital/answerking/response/SimpleCategoryResponse.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.answerdigital.answerking.response;
22

3-
import com.fasterxml.jackson.annotation.JsonProperty;
43
import lombok.AllArgsConstructor;
54
import lombok.Builder;
65
import lombok.Data;
@@ -12,7 +11,6 @@
1211
@AllArgsConstructor
1312
public class SimpleCategoryResponse {
1413

15-
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
1614
private Long id;
1715

1816
private String name;

src/main/java/com/answerdigital/answerking/service/OrderService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ public OrderService(final OrderRepository orderRepository, final ProductService
4646
*/
4747
@Transactional
4848
public OrderResponse addOrder(final OrderRequest orderRequest) {
49-
final Order order = new Order();
50-
addLineItemsToOrder(order, orderRequest.lineItemRequests());
49+
final Order order = addLineItemsToOrder(new Order(), orderRequest.lineItemRequests());
5150
return convertToResponse(orderRepository.save(order));
5251
}
5352

@@ -80,17 +79,17 @@ public List<OrderResponse> findAll() {
8079
public OrderResponse updateOrder(final Long orderId, final OrderRequest orderRequest) {
8180
final Order order = getOrderById(orderId);
8281

83-
if(order.getOrderStatus().equals(OrderStatus.CANCELLED)) {
82+
if (OrderStatus.CANCELLED.equals(order.getOrderStatus())) {
8483
throw new OrderCancelledException(
85-
String.format("The order with ID %d has been cancelled, not possible to update", orderId)
84+
String.format("The order with ID %d has been cancelled, not possible to update", orderId)
8685
);
8786
}
8887

8988
addLineItemsToOrder(order, orderRequest.lineItemRequests());
9089
return convertToResponse(orderRepository.save(order));
9190
}
9291

93-
private void addLineItemsToOrder(final Order order, final List<LineItemRequest> lineItemRequests) {
92+
private Order addLineItemsToOrder(final Order order, final List<LineItemRequest> lineItemRequests) {
9493
// get line items id list
9594
final List<Long> lineItemProductIds = lineItemRequests.stream()
9695
.map(LineItemRequest::productId)
@@ -105,6 +104,7 @@ private void addLineItemsToOrder(final Order order, final List<LineItemRequest>
105104

106105
// add line items to the order.
107106
lineItems.forEach((k, v) -> order.addLineItem(new LineItem(order, k, v)));
107+
return order;
108108
}
109109

110110
private List<Product> getUnRetiredProductsListFromDatabase(final List<Long> productIdsList){

0 commit comments

Comments
 (0)