Uni/dps-webshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add OrderStatus

Browse Source
This commit is contained in:
Tim
2025-06-12 08:29:31 +02:00
parent 38f9ec69ae
commit aad3b96889
4 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
00-backend/src/main/java/de/htwsaar/webshop/config/ParameterConfig.java
View File

@@ -11,4 +11,5 @@ public class ParameterConfig {
public static final String PARAM_URI = "uri";
public static final String PARAM_RATING = "rating";
public static final String PARAM_IMAGE = "image";
public static final String PARAM_STATUS = "status";
}

19
00-backend/src/main/java/de/htwsaar/webshop/controller/OrderController.java
View File

@@ -1,5 +1,6 @@
package de.htwsaar.webshop.controller;
import de.htwsaar.webshop.model.OrderStatus;
import de.htwsaar.webshop.repository.entities.Order;
import de.htwsaar.webshop.service.OrderService;
import de.htwsaar.webshop.service.ValidatorService;
@@ -14,8 +15,7 @@ import java.util.List;
import static de.htwsaar.webshop.config.ControllerPathConfig.ORDER_BASE;
import static de.htwsaar.webshop.config.ControllerPathConfig.ORDER_GET_ALL;
import static de.htwsaar.webshop.config.ParameterConfig.PARAM_CUSTOMER_ID;
import static de.htwsaar.webshop.config.ParameterConfig.PARAM_ID;
import static de.htwsaar.webshop.config.ParameterConfig.*;
import static de.htwsaar.webshop.util.LoggerUtil.logRequest;
@RestController
@@ -67,16 +67,19 @@ public class OrderController {
return ResponseEntity.ok(saved != null);
}
//TODO: check whether an order should be updatable
@RequestMapping(path = ORDER_BASE, method = RequestMethod.PUT, produces = "application/json")
@RequestMapping(path = ORDER_BASE, method = RequestMethod.PATCH, produces = "application/json")
public ResponseEntity<Boolean> update(HttpServletRequest request,
@RequestParam(value = PARAM_ID) Long orderId,
@RequestBody Order order) {
@RequestParam(value = PARAM_STATUS) OrderStatus status) {
logRequest(request);
if (orderId == null || orderService.getOrderById(orderId) == null) {
return ResponseEntity.badRequest().body(false);
if (orderId == null) {
return ResponseEntity.badRequest().build();
}
order.setId(orderService.getOrderById(orderId).getId());
Order order = orderService.getOrderById(orderId);
if (order == null) {
return ResponseEntity.notFound().build();
}
order.setStatus(status);
return ResponseEntity.ok(orderService.save(order) != null);
}

9
00-backend/src/main/java/de/htwsaar/webshop/model/OrderStatus.java Normal file
View File

@@ -0,0 +1,9 @@
package de.htwsaar.webshop.model;
public enum OrderStatus {
ORDERED, //0
IN_PROGRESS, //1
ISSUES, //2
DELIVERED, //3
CANCELLED, //4
}

4
00-backend/src/main/java/de/htwsaar/webshop/repository/entities/Order.java
View File

@@ -1,5 +1,6 @@
package de.htwsaar.webshop.repository.entities;
import de.htwsaar.webshop.model.OrderStatus;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -26,6 +27,9 @@ public class Order {
@Column(name = "time", nullable = false)
private Long time;
@Column(name = "status", nullable = false)
private OrderStatus status;
@OneToMany(mappedBy = "order", orphanRemoval = true, fetch = FetchType.LAZY, cascade = CascadeType.ALL, targetEntity = OrderItem.class)
private List<OrderItem> orderItems;
}