Skip to content

fix: migrate to v1.1.12 and resolve existing bugs #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OmarMUhammed03 merged 1 commit into from
May 19, 2025
Merged

fix: migrate to v1.1.12 and resolve existing bugs #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<dependency>
<groupId>com.github.Podzilla</groupId>
<artifactId>podzilla-utils-lib</artifactId>
<version>v1.1.8</version>
<version>v1.1.12</version>
</dependency>
</dependencies>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/podzilla/courier/dtos/delivery_tasks/CreateDeliveryTaskRequestDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/podzilla/courier/dtos/delivery_tasks/DeliveryTaskResponseDto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/podzilla/courier/models/DeliveryTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/podzilla/courier/services/delivery_task/DeliveryTaskService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down