Crud operations

docker-compose.yml

@@ -8,6 +8,8 @@ services:
       - order_db
     environment:
       - SPRING_DATASOURCE_URL=jdbc:postgresql://order_db:5432/orderDB
+      - SPRING_DATASOURCE_USERNAME=postgres
+      - SPRING_DATASOURCE_PASSWORD=1234
     volumes:
       - ./target:/app
       - ./logs:/logs
@@ -30,25 +32,6 @@ services:
       - "15672:15672"
       - "5672:5672"
     environment:
-      RABBITMQ_DEFAULT_USER: user
-      RABBITMQ_DEFAULT_PASS: password
+      RABBITMQ_DEFAULT_USER: guest
+      RABBITMQ_DEFAULT_PASS: guest
 
-  loki:
-    image: grafana/loki:3.5.0
-    container_name: loki
-    ports:
-      - "3100:3100"
-    command: -config.file=/etc/loki/local-config.yaml
-
-  grafana:
-    image: grafana/grafana:10.4.1
-    container_name: grafana
-    ports:
-      - "3000:3000"
-    depends_on:
-      - loki
-    environment:
-      - GF_SECURITY_ADMIN_USER=admin
-      - GF_SECURITY_ADMIN_PASSWORD=admin
-    volumes:
-      - grafana_data:/var/lib/grafana

pom.xml

@@ -40,20 +40,15 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jdbc</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-stream-rabbit</artifactId>
-			<version>4.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springdoc</groupId>
-			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-			<version>2.8.5</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
 		</dependency>
+
+<!--		<dependency>-->
+<!--			<groupId>org.springframework.boot</groupId>-->
+<!--			<artifactId>spring-boot-starter-security</artifactId>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.springdoc</groupId>
 			<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>

src/main/java/com/podzilla/order/exception/GlobalExceptionHandler.java

@@ -2,8 +2,6 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
@@ -12,22 +10,6 @@
 public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
 
 
-    @ExceptionHandler(AccessDeniedException.class)
-    public ResponseEntity<ErrorResponse> handleAccessDeniedException(
-            final AccessDeniedException exception) {
-        return ResponseEntity.status(HttpStatus.FORBIDDEN)
-                .body(new ErrorResponse(exception.getMessage(),
-                        HttpStatus.FORBIDDEN));
-    }
-
-    @ExceptionHandler(AuthenticationException.class)
-    public ResponseEntity<ErrorResponse> handleAuthenticationException(
-            final AuthenticationException exception) {
-        return ResponseEntity.status(HttpStatus.UNAUTHORIZED)
-                .body(new ErrorResponse(exception.getMessage(),
-                        HttpStatus.UNAUTHORIZED));
-    }
-
     @ExceptionHandler(NotFoundException.class)
     public ResponseEntity<ErrorResponse> handleNotFoundException(
             final NotFoundException exception) {

src/main/java/com/podzilla/order/messaging/OrderConsumer.java

@@ -112,16 +112,17 @@ private void handleCartCheckoutEvent(
                     product.setPricePerUnit(orderProduct.getPricePerUnit());
                     return product;
                 }).toList();
-        Order order = new Order();
-        order.setUserId(UUID.fromString(cartCheckedoutEvent.getCustomerId()));
-        order.setTotalAmount(cartCheckedoutEvent.getTotalAmount());
-        order.setStatus(OrderStatus.PENDING);
-        order.setShippingAddress(address);
-        order.setOrderProducts(orderProducts);
-        order.setConfirmationType(cartCheckedoutEvent.getConfirmationType());
-        order.setSignature(cartCheckedoutEvent.getSignature());
-        order.setOrderLatitude(cartCheckedoutEvent.getOrderLatitude());
-        order.setOrderLongitude(cartCheckedoutEvent.getOrderLongitude());
+        Order order = new Order.Builder()
+                .userId(UUID.fromString(cartCheckedoutEvent.getCustomerId()))
+                .totalAmount(cartCheckedoutEvent.getTotalAmount())
+                .status(OrderStatus.PENDING)
+                .shippingAddress(address)
+                .orderProducts(orderProducts)
+                .confirmationType(cartCheckedoutEvent.getConfirmationType())
+                .signature(cartCheckedoutEvent.getSignature())
+                .orderLatitude(cartCheckedoutEvent.getOrderLatitude())
+                .orderLongitude(cartCheckedoutEvent.getOrderLongitude())
+                .build();
         orderService.createOrder(order);
     }
 
@@ -130,7 +131,7 @@ private void handleOrderAssignedToCourierEvent(final OrderAssignedToCourierEvent
                 orderAssignedToCourierEvent.getOrderId());
         orderService.updateOrder(
                 UUID.fromString(orderAssignedToCourierEvent.getOrderId()),
-                Order.builder()
+                new Order.Builder()
                         .courierId(UUID.fromString(orderAssignedToCourierEvent.getCourierId()))
                         .status(OrderStatus.ORDER_ASSIGNED_TO_COURIER)
                         .build());
@@ -147,7 +148,7 @@ private void handleOrderOutForDeliveryEvent(final OrderOutForDeliveryEvent order
         log.info("✅ Order out for delivery for order: {}", orderOutForDeliveryEvent.getOrderId());
         orderService.updateOrder(
                 UUID.fromString(orderOutForDeliveryEvent.getOrderId()),
-                Order.builder()
+                new Order.Builder()
                         .courierId(UUID.fromString(orderOutForDeliveryEvent.getCourierId()))
                         .status(OrderStatus.OUT_FOR_DELIVERY)
                         .build());

src/main/java/com/podzilla/order/model/Order.java

@@ -13,7 +13,6 @@
 import jakarta.persistence.GenerationType;
 import com.podzilla.mq.events.ConfirmationType;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -30,7 +29,6 @@
 @AllArgsConstructor
 @Getter
 @Setter
-@Builder
 public class Order {
 
     @Id
@@ -64,4 +62,103 @@ public class Order {
     @OneToMany(mappedBy = "order", cascade = CascadeType.ALL,
             orphanRemoval = true)
     private List<OrderProduct> orderProducts = new ArrayList<>();
+
+    public static class Builder {
+        private UUID id;
+        private UUID userId;
+        private UUID courierId;
+        private BigDecimal totalAmount;
+        private Address shippingAddress;
+        private OrderStatus status;
+        private LocalDateTime createdAt;
+        private LocalDateTime updatedAt;
+        private ConfirmationType confirmationType;
+        private String signature;
+        private double orderLatitude;
+        private double orderLongitude;
+        private List<OrderProduct> orderProducts = new ArrayList<>();
+
+        public Builder id(final UUID id) {
+            this.id = id;
+            return this;
+        }
+
+        public Builder userId(final UUID userId) {
+            this.userId = userId;
+            return this;
+        }
+
+        public Builder courierId(final UUID courierId) {
+            this.courierId = courierId;
+            return this;
+        }
+
+        public Builder totalAmount(final BigDecimal totalAmount) {
+            this.totalAmount = totalAmount;
+            return this;
+        }
+
+        public Builder shippingAddress(final Address shippingAddress) {
+            this.shippingAddress = shippingAddress;
+            return this;
+        }
+
+        public Builder status(final OrderStatus status) {
+            this.status = status;
+            return this;
+        }
+
+        public Builder createdAt(final LocalDateTime createdAt) {
+            this.createdAt = createdAt;
+            return this;
+        }
+
+        public Builder updatedAt(final LocalDateTime updatedAt) {
+            this.updatedAt = updatedAt;
+            return this;
+        }
+
+        public Builder confirmationType(final ConfirmationType confirmationType) {
+            this.confirmationType = confirmationType;
+            return this;
+        }
+
+        public Builder signature(final String signature) {
+            this.signature = signature;
+            return this;
+        }
+
+        public Builder orderLatitude(final double orderLatitude) {
+            this.orderLatitude = orderLatitude;
+            return this;
+        }
+
+        public Builder orderLongitude(final double orderLongitude) {
+            this.orderLongitude = orderLongitude;
+            return this;
+        }
+
+        public Builder orderProducts(final List<OrderProduct> orderProducts) {
+            this.orderProducts = orderProducts;
+            return this;
+        }
+
+        public Order build() {
+            Order order = new Order();
+            order.setId(id);
+            order.setUserId(userId);
+            order.setCourierId(courierId);
+            order.setTotalAmount(totalAmount);
+            order.setShippingAddress(shippingAddress);
+            order.setStatus(status);
+            order.setCreatedAt(createdAt);
+            order.setUpdatedAt(updatedAt);
+            order.setConfirmationType(confirmationType);
+            order.setSignature(signature);
+            order.setOrderLatitude(orderLatitude);
+            order.setOrderLongitude(orderLongitude);
+            order.setOrderProducts(orderProducts);
+            return order;
+        }
+    }
 }

src/main/resources/application.properties

@@ -1,2 +1,6 @@
 spring.application.name=order
-api.gateway.url=http://localhost:8080
+api.gateway.url=http://localhost:8080
+spring.rabbitmq.host=rabbitmq
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest

src/main/resources/application.yml

@@ -4,5 +4,5 @@ spring:
   rabbitmq:
     host: rabbitmq       # container name
     port: 5672
-    username: user
-    password: password
+    username: guest
+    password: guest