Cleanup after merge request

OrderProcessingService/build.gradle.kts

@@ -35,7 +35,6 @@ dependencies {
  implementation(project(":shared"))
  implementation("org.springframework.boot:spring-boot-starter-data-redis")
  implementation("io.lettuce:lettuce-core")
- implementation("io.nats:nats-java:2.14.0")
  compileOnly("org.projectlombok:lombok")
  runtimeOnly("org.postgresql:postgresql")
  runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.6")

OrderProcessingService/src/main/java/com/joe/trading/order_processing/config/ApplicationConfiguration.java

@@ -7,25 +7,19 @@
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration;
 import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import com.joe.trading.order_processing.entities.User;
-import com.joe.trading.order_processing.repositories.UserRepository;
 
 import lombok.AllArgsConstructor;
 
 @Configuration
 @AllArgsConstructor
 public class ApplicationConfiguration {
- // private final UserRepository userRepository;
 
  @Bean
  UserDetailsService userDetailsService() {
- return email -> {
- System.out.println("Finding user with email: " + email);
- return new User();
- };
+ return email -> new User();
  }
 
  @Bean

OrderProcessingService/src/main/java/com/joe/trading/order_processing/config/JwtAuthenticationFilter.java

@@ -58,7 +58,6 @@ protected void doFilterInternal(
  } finally {
  // Even if an exception is thrown, we still want to continue the filter chain
  // as the request may still be valid
- System.out.println("Filtering request");
  filterChain.doFilter(request, response);
  }
  }

OrderProcessingService/src/main/java/com/joe/trading/order_processing/controllers/OrderController.java

@@ -2,11 +2,14 @@
 
 import java.util.List;
 
+import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,11 +25,6 @@
 import com.joe.trading.order_processing.entities.enums.Ticker;
 import com.joe.trading.order_processing.services.OrderService;
 import com.joe.trading.order_processing.services.validation.OrderValidationService;
-import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.util.List;
 
 @RestController
 @RequestMapping("/api/v1/orders")
@@ -68,22 +66,23 @@ public ResponseEntity<OrderResponseDTO> sendOrder(@RequestBody OrderRequestDTO r
  }
 
  @GetMapping
- public ResponseEntity<List<OrderResponseDTO>> getAllOrders(){
+ public ResponseEntity<List<OrderResponseDTO>> getAllOrders() {
  return ResponseEntity.ok(orderService.getAllOrders());
  }
 
- @GetMapping
- public ResponseEntity<Page<OrderResponseDTO>> getAllOrdersByUserId(OrderRequestDTO request){
-
- return ResponseEntity.ok(orderService.getAllOrdersPerUserId(request));
+ @GetMapping("/user/{id}")
+ @PreAuthorize("hasRole('ADMIN') or principal.id == #id")
+ public ResponseEntity<Page<OrderResponseDTO>> getAllOrdersByUserId(
+ @PathVariable("id") Long userId, OrderRequestDTO request) {
+ return ResponseEntity.ok(orderService.getAllOrdersPerUserId(userId, request));
  }
 
  @DeleteMapping("/{id}")
- public ResponseEntity<OrderResponseDTO> cancelAnOrder(@PathVariable Long id){
+ public ResponseEntity<OrderResponseDTO> cancelAnOrder(@PathVariable Long id) {
  return ResponseEntity.ok(orderService.cancelOrder(id));
  }
 
- private Order buildValidatedOrder(OrderRequestDTO request){
+ private Order buildValidatedOrder(OrderRequestDTO request) {
  return new Order(
  Ticker.valueOf(request.getTicker().toUpperCase()),
  request.getQuantity(),
@@ -92,9 +91,4 @@ private Order buildValidatedOrder(OrderRequestDTO request){
  AvailableExchanges.valueOf(request.getExchanges().toUpperCase()),
  OrderType.valueOf(request.getOrderType()));
  }
-
- @GetMapping
- public ResponseEntity<List<OrderResponseDTO>> getAllOrders() {
- return ResponseEntity.ok(orderService.getAllOrders());
- }
 }

OrderProcessingService/src/main/java/com/joe/trading/order_processing/services/OrderService.java

@@ -10,7 +10,10 @@
 public interface OrderService {
 
  public OrderResponseDTO saveOrder(Order order);
+
  public List<OrderResponseDTO> getAllOrders();
+
  public OrderResponseDTO cancelOrder(Long id);
- public Page<OrderResponseDTO> getAllOrdersPerUserId(OrderRequestDTO request);
+
+ public Page<OrderResponseDTO> getAllOrdersPerUserId(Long userId, OrderRequestDTO request);
 }