From 93d4557a83afea8ba4ac6171565ab2a1456ed73d Mon Sep 17 00:00:00 2001 From: amir-awad Date: Mon, 19 May 2025 15:17:45 +0300 Subject: [PATCH] fix: migrate to v1.1.12 and resolve existing bugs --- pom.xml | 2 +- .../dtos/delivery_tasks/CreateDeliveryTaskRequestDto.java | 2 +- .../dtos/delivery_tasks/DeliveryTaskResponseDto.java | 2 +- src/main/java/com/podzilla/courier/models/DeliveryTask.java | 2 +- .../courier/services/delivery_task/DeliveryTaskService.java | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index e54883c..1a9ecbd 100644 --- a/pom.xml +++ b/pom.xml @@ -88,7 +88,7 @@ com.github.Podzilla podzilla-utils-lib - v1.1.8 + v1.1.12 diff --git a/src/main/java/com/podzilla/courier/dtos/delivery_tasks/CreateDeliveryTaskRequestDto.java b/src/main/java/com/podzilla/courier/dtos/delivery_tasks/CreateDeliveryTaskRequestDto.java index be29a6e..c6a4a04 100644 --- a/src/main/java/com/podzilla/courier/dtos/delivery_tasks/CreateDeliveryTaskRequestDto.java +++ b/src/main/java/com/podzilla/courier/dtos/delivery_tasks/CreateDeliveryTaskRequestDto.java @@ -1,6 +1,6 @@ package com.podzilla.courier.dtos.delivery_tasks; -import com.podzilla.mq.events.OrderAssignedToCourierEvent.ConfirmationType; +import com.podzilla.mq.events.ConfirmationType; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/podzilla/courier/dtos/delivery_tasks/DeliveryTaskResponseDto.java b/src/main/java/com/podzilla/courier/dtos/delivery_tasks/DeliveryTaskResponseDto.java index ecfbeac..db780e3 100644 --- a/src/main/java/com/podzilla/courier/dtos/delivery_tasks/DeliveryTaskResponseDto.java +++ b/src/main/java/com/podzilla/courier/dtos/delivery_tasks/DeliveryTaskResponseDto.java @@ -2,7 +2,7 @@ import com.podzilla.courier.models.DeliveryStatus; -import com.podzilla.mq.events.OrderAssignedToCourierEvent.ConfirmationType; +import com.podzilla.mq.events.ConfirmationType; import java.math.BigDecimal; diff --git a/src/main/java/com/podzilla/courier/models/DeliveryTask.java b/src/main/java/com/podzilla/courier/models/DeliveryTask.java index 831b3c2..4bbaf4d 100644 --- a/src/main/java/com/podzilla/courier/models/DeliveryTask.java +++ b/src/main/java/com/podzilla/courier/models/DeliveryTask.java @@ -1,6 +1,6 @@ package com.podzilla.courier.models; -import com.podzilla.mq.events.OrderAssignedToCourierEvent.ConfirmationType; +import com.podzilla.mq.events.ConfirmationType; import lombok.Data; import org.springframework.data.annotation.Id; import org.springframework.data.mongodb.core.mapping.Document; diff --git a/src/main/java/com/podzilla/courier/services/delivery_task/DeliveryTaskService.java b/src/main/java/com/podzilla/courier/services/delivery_task/DeliveryTaskService.java index 3de58b1..5e3dacd 100644 --- a/src/main/java/com/podzilla/courier/services/delivery_task/DeliveryTaskService.java +++ b/src/main/java/com/podzilla/courier/services/delivery_task/DeliveryTaskService.java @@ -16,8 +16,8 @@ import com.podzilla.courier.services.delivery_task.poll_command.StopPollingCommand; import com.podzilla.courier.services.delivery_task.poll_command.StartPollingCommand; import com.podzilla.mq.EventPublisher; -import com.podzilla.mq.events.OrderAssignedToCourierEvent.ConfirmationType; -import com.podzilla.mq.events.OrderCancelledEvent; +import com.podzilla.mq.events.ConfirmationType; +import com.podzilla.mq.events.OrderDeliveryFailedEvent; import com.podzilla.mq.events.OrderOutForDeliveryEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -180,7 +180,7 @@ public CancelDeliveryTaskResponseDto cancelDeliveryTask(final String id, final S deliveryTaskRepository.save(deliveryTaskToCancel); LOGGER.debug("Delivery task cancelled for delivery task ID: {}", id); // publish order.failed event - OrderCancelledEvent event = new OrderCancelledEvent( + OrderDeliveryFailedEvent event = new OrderDeliveryFailedEvent( deliveryTaskToCancel.getOrderId(), deliveryTaskToCancel.getCourierId(), cancellationReason