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 a13fc6e

Browse files
final testing for controllers
1 parent 56e152e commit a13fc6e

File tree

16 files changed

+136
-76
lines changed

16 files changed

+136
-76
lines changed

‎src/main/java/com/nfs/project/config/SecurityConfig.java‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
1212
import org.springframework.security.web.authentication.logout.LogoutHandler;
1313

14-
import com.nfs.project.filters.*;
14+
import com.nfs.project.filters.JwtAuthenticationFilter;
1515

1616
import jakarta.servlet.http.HttpServletResponse;
1717
import lombok.RequiredArgsConstructor;
@@ -44,14 +44,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
4444
.logoutSuccessHandler((request, response, authentication) -> SecurityContextHolder.clearContext())
4545
)
4646
.exceptionHandling(exceptionHandling -> exceptionHandling
47-
// redirect to index.html
48-
// .authenticationEntryPoint((request, response, authException) -> {
49-
// log.info("not allowed");
50-
// response.getWriter().write(authException.getMessage());
51-
// response.setStatus(444);
52-
// })
5347
.accessDeniedHandler((request, response, accessDeniedException) -> {
54-
log.info("not allowed2");
48+
log.info("not allowed");
5549
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, accessDeniedException.getMessage());
5650
}))
5751
.build();

‎src/main/java/com/nfs/project/controller/OrderBasketController.java‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
package com.nfs.project.controller;
22

3-
import com.nfs.project.model.OrderBasket;
4-
import com.nfs.project.model.OrdersOperation;
5-
import com.nfs.project.service.OrderBasketService;
3+
import java.util.List;
4+
65
import org.springframework.beans.factory.annotation.Autowired;
7-
import org.springframework.web.bind.annotation.*;
8-
import com.nfs.project.dto.orderBasketRequest;
6+
import org.springframework.web.bind.annotation.CrossOrigin;
7+
import org.springframework.web.bind.annotation.GetMapping;
8+
import org.springframework.web.bind.annotation.PathVariable;
9+
import org.springframework.web.bind.annotation.PostMapping;
10+
import org.springframework.web.bind.annotation.RequestBody;
11+
import org.springframework.web.bind.annotation.RequestMapping;
12+
import org.springframework.web.bind.annotation.RestController;
913

10-
import java.util.List;
14+
import com.nfs.project.dto.orderBasketRequest;
15+
import com.nfs.project.model.OrderBasket;
16+
import com.nfs.project.service.OrderBasketService;
1117

1218
@RestController
1319
@CrossOrigin(origins = { "http://localhost:3000", "http://codemaster.ninja" }, allowCredentials = "true")

‎src/main/java/com/nfs/project/controller/OrderOpController.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import java.util.List;
55

66
import org.springframework.beans.factory.annotation.Autowired;
7+
import org.springframework.http.ResponseEntity;
78
import org.springframework.web.bind.annotation.CrossOrigin;
89
import org.springframework.web.bind.annotation.GetMapping;
910
import org.springframework.web.bind.annotation.PathVariable;
@@ -13,11 +14,11 @@
1314
import org.springframework.web.bind.annotation.RequestParam;
1415
import org.springframework.web.bind.annotation.RestController;
1516

17+
import com.nfs.project.dto.orderOpRequest;
1618
import com.nfs.project.model.OrdersOperation;
1719
import com.nfs.project.service.OrdersOpService;
1820

1921
import jakarta.validation.Valid;
20-
import com.nfs.project.dto.orderOpRequest;
2122

2223
@RestController
2324
@CrossOrigin(origins = { "http://localhost:3000", "http://codemaster.ninja" }, allowCredentials = "true")
@@ -29,9 +30,9 @@ public class OrderOpController {
2930

3031

3132
@PostMapping
32-
public OrdersOperation SaveOrder(@Valid @RequestBody orderOpRequest operation) {
33+
public ResponseEntity<OrdersOperation> SaveOrder(@Valid @RequestBody orderOpRequest operation) {
3334
System.out.println(operation.toString());
34-
return Service.SaveOrderOperation(operation);
35+
return ResponseEntity.created(null).body(Service.SaveOrderOperation(operation));
3536

3637
}
3738

‎src/main/java/com/nfs/project/controller/ProductController.java‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@
1212
import org.springframework.web.bind.annotation.RequestMapping;
1313
import org.springframework.web.bind.annotation.RequestParam;
1414
import org.springframework.web.bind.annotation.RestController;
15-
import org.webjars.NotFoundException;
1615

16+
import com.nfs.project.dto.productRequest;
1717
import com.nfs.project.model.Product;
1818
import com.nfs.project.service.ProductService;
19-
import com.nfs.project.dto.productRequest;
19+
20+
import jakarta.validation.Valid;
2021

2122
@RestController
2223
@CrossOrigin(origins = { "http://localhost:3000", "http://codemaster.ninja" }, allowCredentials = "true")
@@ -27,39 +28,44 @@ public class ProductController {
2728
private ProductService Service;
2829

2930
@PostMapping
30-
public Product saveProduct(@RequestBody productRequest product){
31+
public Product saveProduct(@Valid@RequestBody productRequest product){
3132
return Service.saveProduct(product);
3233
}
34+
35+
36+
3337
@PostMapping(path = "/list")
3438
public List<Product> saveProducts(@RequestBody List<productRequest> listproducts){
3539
return Service.SaveProductList(listproducts);
3640
}
41+
42+
43+
3744
@GetMapping
3845
public List<Product> getAllProducts(){
39-
/*if(Math.random() < 0.999)
40-
throw new NotFoundException("null");*/
4146
return Service.getAllProduct();
4247
}
48+
49+
50+
4351
@GetMapping(path = "{id}")
4452
public Product getProductById(@PathVariable int id){
45-
try{
46-
return Service.getById(id);
47-
}
48-
catch (Exception e){
49-
System.out.printf(e.getMessage());
50-
return null;
51-
}
52-
53+
return Service.getById(id);
5354
}
55+
56+
5457
@PutMapping(path = "{id}")
5558
public void updateProduct(
5659
@PathVariable int id,
5760
@RequestParam String name,
5861
@RequestParam long price,
59-
@RequestParam String desc
62+
@RequestParam String description
6063
){
61-
Service.updateProduct(id,name,price,desc);
64+
Service.updateProduct(id,name,price,description);
6265
}
66+
67+
68+
6369
@DeleteMapping(path = "{id}")
6470
public void DeleteProduct(@PathVariable int id){
6571
Service.deleteProduct(id);

‎src/main/java/com/nfs/project/dto/customerRequest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.nfs.project.dto;
22

3-
import jakarta.validation.constraints.NotBlank;
43
import lombok.AllArgsConstructor;
54
import lombok.Builder;
65
import lombok.Data;
@@ -12,9 +11,9 @@
1211
@NoArgsConstructor
1312
public class customerRequest {
1413

15-
private String firstname;
14+
private String firstName;
1615

17-
private String lastname;
16+
private String lastName;
1817
private String Address;
1918

2019
private String city;

‎src/main/java/com/nfs/project/dto/orderOpRequest.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package com.nfs.project.dto;
22

3-
import com.nfs.project.model.customer;
43
import lombok.AllArgsConstructor;
54
import lombok.Builder;
65
import lombok.Data;
76
import lombok.NoArgsConstructor;
87

9-
import javax.enterprise.inject.Default;
10-
118
@Data
129
@Builder
1310
@AllArgsConstructor
1411
@NoArgsConstructor
1512
public class orderOpRequest {
13+
14+
1615
private int customerId;
1716
private String label;
1817
private float totalOrderPrice;

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
import jakarta.persistence.Column;
99
import jakarta.persistence.Entity;
10-
import jakarta.persistence.FetchType;
1110
import jakarta.persistence.GeneratedValue;
1211
import jakarta.persistence.GenerationType;
1312
import jakarta.persistence.Id;
@@ -33,11 +32,11 @@ public class OrderBasket {
3332
@SequenceGenerator(name = "order_basket_seq", sequenceName = "ORDER_BASKET_SEQ", allocationSize = 1)
3433
private int basketid;
3534

36-
@ManyToOne(fetch = FetchType.LAZY)
35+
@ManyToOne()
3736
@JoinColumn(name = "productid")
3837
private Product product;
3938

40-
@ManyToOne(fetch = FetchType.LAZY)
39+
@ManyToOne()
4140
@JoinColumn(name = "orderid")
4241
private OrdersOperation ordersOperation;
4342

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

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

66
import jakarta.persistence.Entity;
7-
import jakarta.persistence.FetchType;
87
import jakarta.persistence.GeneratedValue;
98
import jakarta.persistence.GenerationType;
109
import jakarta.persistence.Id;
@@ -36,7 +35,7 @@ public class OrdersOperation implements Serializable {
3635
private LocalDate OrderDate,ConfirmationDate,ShippingDate,ReceivingDate;
3736
// private Boolean confirmed,Shipped,Received;
3837

39-
@ManyToOne(fetch = FetchType.LAZY)
38+
@ManyToOne()
4039
@JoinColumn(name = "customerid", referencedColumnName = "id", nullable = false)
4140
private customer customer;
4241

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,4 @@ public class Product implements Serializable{
2727
private long price;
2828
private String name,description,type,imagesrc;
2929

30-
public Product( String name, String Description, String Type, String imagesrc, long Price){
31-
32-
this.description=Description;
33-
this.imagesrc=imagesrc;
34-
this.name=name;
35-
this.type=Type;
36-
this.price=Price;
37-
}
38-
3930
}
Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
package com.nfs.project.repository;
22

3-
import com.nfs.project.dto.orderBasketRequest;
4-
import com.nfs.project.model.OrderBasket;
5-
import com.nfs.project.model.OrdersOperation;
6-
import com.nfs.project.model.Product;
3+
import java.util.List;
4+
75
import org.springframework.data.jpa.repository.JpaRepository;
86
import org.springframework.data.jpa.repository.Query;
97

10-
import java.util.List;
11-
import java.util.Optional;
8+
import com.nfs.project.model.OrderBasket;
129

1310
public interface OrderBasketRepository extends JpaRepository<OrderBasket,Integer> {
1411
@Query("SELECT s FROM OrderBasket s WHERE s.product.id=?1")
15-
Optional<OrderBasket> findOrderBasketByProduct(int productId);
12+
List<OrderBasket> findOrderBasketByProduct(int productId);
1613
@Query("SELECT s FROM OrderBasket s WHERE s.ordersOperation.id=?1")
17-
Optional<Product> findOrderBasketByOrder(int opId);
14+
List<OrderBasket> findOrderBasketByOrder(int opId);
1815
}

0 commit comments

Comments
(0)

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