Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 56e152e

Browse files
bug fixed
1 parent cfe1ebd commit 56e152e

File tree

6 files changed

+39
-21
lines changed

6 files changed

+39
-21
lines changed

‎src/main/java/com/nfs/project/model/OrdersOperation.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.time.LocalDate;
55

66
import jakarta.persistence.Entity;
7+
import jakarta.persistence.FetchType;
78
import jakarta.persistence.GeneratedValue;
89
import jakarta.persistence.GenerationType;
910
import jakarta.persistence.Id;
@@ -33,21 +34,22 @@ public class OrdersOperation implements Serializable {
3334
private String Status;
3435
private float TotalOrderPrice;
3536
private LocalDate OrderDate,ConfirmationDate,ShippingDate,ReceivingDate;
36-
private Boolean confirmed,Shipped,Received;
37-
@ManyToOne
38-
@JoinColumn(name="customer_id")
39-
private customer customerid;
37+
// private Boolean confirmed,Shipped,Received;
38+
39+
@ManyToOne(fetch = FetchType.LAZY)
40+
@JoinColumn(name = "customerid", referencedColumnName = "id", nullable = false)
41+
private customer customer;
4042

41-
public OrdersOperation(customer customerid, String label,
43+
public OrdersOperation(customer customer, String label,
4244
float totalOrderPrice, boolean confirmed) {
4345

44-
this.customerid = customerid;
46+
this.customer = customer;
4547
this.Label = label;
4648
this.TotalOrderPrice = totalOrderPrice;
4749
this.OrderDate = LocalDate.now();
48-
this.confirmed = confirmed;
49-
this.Shipped = false;
50-
this.Received = false;
50+
// this.confirmed = confirmed;
51+
// this.Shipped = false;
52+
// this.Received = false;
5153
this.Status="pending";
5254

5355

‎src/main/java/com/nfs/project/model/customer.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,15 @@
22

33
import java.io.Serializable;
44
import java.time.LocalDate;
5+
import java.util.List;
56

7+
import jakarta.persistence.CascadeType;
68
import jakarta.persistence.Entity;
9+
import jakarta.persistence.FetchType;
710
import jakarta.persistence.GeneratedValue;
811
import jakarta.persistence.GenerationType;
912
import jakarta.persistence.Id;
13+
import jakarta.persistence.OneToMany;
1014
import jakarta.persistence.SequenceGenerator;
1115
import jakarta.persistence.Table;
1216
import lombok.AllArgsConstructor;

‎src/main/java/com/nfs/project/repository/OrderOpRepository.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
import com.nfs.project.model.OrdersOperation;
1010

1111
public interface OrderOpRepository extends JpaRepository<OrdersOperation,Integer> {
12-
@Query("SELECT s FROM orders_operation s where s.confirmed=?1")
12+
@Query("SELECT s FROM orders_operation s where s.Status=?1")
1313
List<OrdersOperation> findAllByConfirmedOrdersValue(Boolean confirm);
14-
@Query("SELECT s FROM orders_operation s where s.Shipped=?1")
14+
@Query("SELECT s FROM orders_operation s where s.Status=?1")
1515
List<OrdersOperation> findAllByShippedOrdersValue(Boolean Shipped);
16-
@Query("SELECT s FROM orders_operation s where s.Received=?1")
16+
@Query("SELECT s FROM orders_operation s where s.Status=?1")
1717
List<OrdersOperation> findAllByReceivedOrdersValue(Boolean Received);
1818
/*@Query("SELECT s FROM orders_operation s where s.ProductId=?1")
1919
List<OrdersOperation> findAllByProductId(int productId);*/
20-
@Query("SELECT s FROM orders_operation s where s.customerid=?1")
20+
@Query("SELECT s FROM orders_operation s where s.customer.id=?1")
2121
List<OrdersOperation> findAllByCustomerId(int CustomerId);
2222
@Query("SELECT s FROM orders_operation s where s.OrderDate=?1")
2323
List<OrdersOperation> findAllByOrOrderDate(LocalDate orderDate);

‎src/main/java/com/nfs/project/service/OrdersOpService.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,11 @@
44
import java.time.LocalDate;
55
import java.util.List;
66

7-
import com.nfs.project.dto.orderOpRequest;
87
import org.springframework.beans.factory.annotation.Autowired;
9-
import org.springframework.beans.factory.annotation.Qualifier;
108
import org.springframework.stereotype.Service;
119

1210
import com.nfs.project.dao.OrderOpServiceDAO;
11+
import com.nfs.project.dto.orderOpRequest;
1312
import com.nfs.project.model.OrdersOperation;
1413
import com.nfs.project.repository.CustomerRepository;
1514
import com.nfs.project.repository.OrderOpRepository;
@@ -105,10 +104,13 @@ public OrdersOperation SaveOrderOperation(orderOpRequest order) {
105104
}
106105
else{
107106
String Status="pending";
107+
System.out.println("customer :"+ customerRepository.findById(order.getCustomerId()).get());
108108
var orderOpObj=OrdersOperation.builder().OrderDate(LocalDate.now()).TotalOrderPrice(order.getTotalOrderPrice())
109-
.Label(order.getLabel()).confirmed(false).Shipped(false).Received(false)
110-
.customerid(customerRepository.findById(order.getCustomerId()).get()).Status(Status).build();
109+
.Label(order.getLabel()).ReceivingDate(LocalDate.now()).ShippingDate(LocalDate.now()).ConfirmationDate(LocalDate.now())
110+
.customer(customerRepository.findById(order.getCustomerId()).get()).Status(Status).build();
111+
System.out.println(orderOpObj);
111112
Repository.save(orderOpObj);
113+
// System.exit(0);
112114
return orderOpObj;
113115
}
114116

@@ -118,7 +120,7 @@ public OrdersOperation SaveOrderOperation(orderOpRequest order) {
118120
public void setConfirmedOrderById(int OrderId) {
119121
if(Repository.findById(OrderId).isPresent()){
120122
OrdersOperation op=Repository.findById(OrderId).get();
121-
op.setConfirmed(true);
123+
// op.setConfirmed(true);
122124
}
123125
else{
124126
throw new IllegalStateException("non existed id");
@@ -129,7 +131,7 @@ public void setConfirmedOrderById(int OrderId) {
129131
public void setShippedOrderById(int Orderid) {
130132
if(Repository.findById(Orderid).isPresent()){
131133
OrdersOperation op=Repository.findById(Orderid).get();
132-
op.setShipped(true);
134+
// op.setShipped(true);
133135
}
134136
else{
135137
throw new IllegalStateException("non existed value");
@@ -140,7 +142,7 @@ public void setShippedOrderById(int Orderid) {
140142
public void SetReceivedOrderById(int Orderid) {
141143
if(Repository.findById(Orderid).isPresent()){
142144
OrdersOperation op=Repository.findById(Orderid).get();
143-
op.setReceived(true);
145+
// op.setReceived(true);
144146
}
145147
else{
146148
throw new IllegalStateException("non existed value");

‎src/main/resources/application.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spring.datasource.oracleucp.inactive-connection-timeout=10
2121
logging.level.=error
2222
spring.aop.proxy-target-class=false
2323
spring.profiles.active=production
24-
#spring.jpa.hibernate.ddl-auto=create
24+
spring.jpa.hibernate.ddl-auto=update
2525

2626
# Allow CORS for all origins and all methods
2727
# spring.mvc.cors.enabled=true

‎src/main/resources/index.sql‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,3 +117,13 @@ DELETE FROM order_basket;
117117
DELETE FROM stock_operation;
118118
-- DELETE FROM product;
119119
DELETE FROM customer;
120+
121+
122+
123+
-- {
124+
-- "customerId": 114,
125+
-- "label": "5-500 - Metal Fabrications",
126+
-- "totalOrderPrice": 921
127+
-- }
128+
129+
insert into ORDERS_OPERATION (id,customerid, label, total_order_price, order_date) values (1,114, '5-500 - Metal Fabrications', 921, sysdate);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /