update

Author: hoangtien2k3

docker-compose.yml

@@ -1,8 +1,22 @@
-## zookeeper
-## broker
-## kafka
 version: '2'
 services:
+  mysql:
+    image: mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: 12042003
+      MYSQL_DATABASE: my_database
+      MYSQL_USER: root
+      MYSQL_PASSWORD: 12042003
+    ports:
+      - "3306:3306"
+
+  mongodb:
+      image: mongo
+      volumes:
+        - ./mongo_data:/data/db
+      ports:
+        - "27017:27017"
+
   zookeeper:
     image: confluentinc/cp-zookeeper:7.4.3
     hostname: zookeeper
@@ -60,4 +74,4 @@ services:
       CONTROL_CENTER_INTERNAL_TOPICS_PARTITIONS: 1
       CONTROL_CENTER_MONITORING_INTERCEPTOR_TOPIC_PARTITIONS: 1
       CONFLUENT_METRICS_TOPIC_REPLICATION: 1
-      PORT: 9021
+      PORT: 9021

order-service/src/main/java/com/hoangtien2k3/orderservice/api/CartController.java

@@ -41,7 +41,7 @@ public class CartController {
             @ApiResponse(code = 204, message = "No content", response = ResponseEntity.class)
     })
     @GetMapping
-    @PreAuthorize("hasAuthority('ADMIN')")
+    @PreAuthorize("hasAuthority('ADMIN') and hasAuthority('USER')")
     public Mono<ResponseEntity<List<CartDto>>> findAll() {
         log.info("*** CartDto List, controller; fetch all categories *");
         return cartService.findAll()
@@ -55,7 +55,7 @@ public Mono<ResponseEntity<List<CartDto>>> findAll() {
             @ApiResponse(code = 204, message = "No content", response = ResponseEntity.class)
     })
     @GetMapping("/all")
-    @PreAuthorize("hasAuthority('ADMIN')")
+    @PreAuthorize("hasAuthority('ADMIN') and hasAuthority('USER')")
     public Mono<ResponseEntity<Page<CartDto>>> findAll(@RequestParam(defaultValue = "0") int page,
                                                        @RequestParam(defaultValue = "10") int size,
                                                        @RequestParam(defaultValue = "cartId") String sortBy,

order-service/src/main/java/com/hoangtien2k3/orderservice/api/OrderController.java

@@ -36,7 +36,7 @@ public class OrderController {
             @ApiResponse(code = 204, message = "No content", response = ResponseEntity.class)
     })
     @GetMapping
-    @PreAuthorize("hasAuthority('ADMIN')")
+    @PreAuthorize("hasAuthority('ADMIN') or hasAuthority('USER')")
     public Mono<ResponseEntity<List<OrderDto>>> findAll() {
         log.info("*** OrderDto List, controller; fetch all orders *");
         return orderService.findAll()

order-service/src/main/java/com/hoangtien2k3/orderservice/dto/user/UserDto.java

@@ -1,9 +1,5 @@
 package com.hoangtien2k3.orderservice.dto.user;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.hoangtien2k3.orderservice.dto.order.CartDto;
 import lombok.*;
 
 import java.io.Serial;
@@ -26,8 +22,4 @@ public class UserDto implements Serializable {
     private String phone;
     private String avatar;
 
-    @JsonProperty("cart")
-    @JsonInclude(Include.NON_NULL)
-    private CartDto cartDto;
-
 }