Skip to content

New design patterns #21

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
amir-awad merged 14 commits into from
May 17, 2025
Merged

New design patterns #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
95ec54a
chore: utilize strategy desgin pattern
amir-awad May 12, 2025
05990c6
fix: migrated to the mq shared lib
amir-awad May 12, 2025
17f2537
create order command design patterns
OmarMUhammed03 May 13, 2025
76438b0
move files to relevant path
OmarMUhammed03 May 16, 2025
377b9b3
add command pattern files
OmarMUhammed03 May 16, 2025
20e7c02
update delivey task to reflect the usage of command pattern
OmarMUhammed03 May 16, 2025
ff0fdfa
update delivey task to pass check-style
OmarMUhammed03 May 16, 2025
3584a57
remove unused variable
OmarMUhammed03 May 16, 2025
41cd1e4
fix exceeding line length constraint
OmarMUhammed03 May 16, 2025
a074a6e
update files to pass check-style
OmarMUhammed03 May 16, 2025
5f80293
update files to pass check-style
OmarMUhammed03 May 16, 2025
5056e42
fix: adjust command design pattern to a meaningful behaviour
amir-awad May 16, 2025
e41a7af
rename package
OmarMUhammed03 May 16, 2025
8b5a3d0
update files to pass check-style
OmarMUhammed03 May 16, 2025
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
225 changes: 118 additions & 107 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,113 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.5</version>
<relativePath /> <!-- lookup parent from repository -->
</parent>
<groupId>com.podzilla</groupId>
<artifactId>courier</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>courier</name>
<description>Courier Service</description>
<url />
<licenses>
<license />
</licenses>
<developers>
<developer />
</developers>
<scm>
<connection />
<developerConnection />
<tag />
<url />
</scm>
<properties>
<java.version>21</java.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.5</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.podzilla</groupId>
<artifactId>courier</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>courier</name>
<description>Courier Service</description>
<url/>
<licenses>
<license/>
</licenses>
<developers>
<developer/>
</developers>
<scm>
<connection/>
<developerConnection/>
<tag/>
<url/>
</scm>
<properties>
<java.version>21</java.version>
</properties>
<repositories>
<repository>
<id>jitpack.io</id>
<url>https://jitpack.io</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-amqp</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-mongodb</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.8.3</version>
</dependency>
</dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<scope>runtime</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-rabbit-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>2.8.3</version>
</dependency>
<dependency>
<groupId>com.github.Podzilla</groupId>
<artifactId>podzilla-utils-lib</artifactId>
<version>v1.1.6</version>
</dependency>
</dependencies>

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessorPaths>
<path>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</path>
</annotationProcessorPaths>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>

</project>
2 changes: 1 addition & 1 deletion src/main/java/com/podzilla/courier/controllers/CourierController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.podzilla.courier.dtos.couriers.CourierResponseDto;
import com.podzilla.courier.dtos.couriers.CreateCourierRequestDto;
import com.podzilla.courier.dtos.couriers.UpdateCourierRequestDto;
import com.podzilla.courier.services.CourierService;
import com.podzilla.courier.services.courier.CourierService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
Expand Down
34 changes: 11 additions & 23 deletions src/main/java/com/podzilla/courier/controllers/DeliveryTaskController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import com.podzilla.courier.dtos.delivery_tasks.DeliveryTaskResponseDto;
import com.podzilla.courier.dtos.delivery_tasks.UpdateDeliveryStatusRequestDto;
import com.podzilla.courier.models.DeliveryStatus;
import com.podzilla.courier.services.DeliveryTaskService;
import com.podzilla.courier.services.delivery_task.DeliveryTaskService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
Expand Down Expand Up @@ -174,30 +174,18 @@ public ResponseEntity<DeliveryTaskResponseDto> deleteDeliveryTask(
return ResponseEntity.ok(deliveryTaskService.deleteDeliveryTask(id));
}

@PutMapping("/{id}/otp")
@Operation(summary = "Update OTP", description = "Updates the One-Time Password for a delivery task")
@ApiResponse(responseCode = "200", description = "OTP updated successfully")
@ApiResponse(responseCode = "404", description = "Task not found")
public ResponseEntity<String> updateOtp(
@Parameter(description = "ID of the delivery task")
@PathVariable final String id,
@RequestBody(description = "New OTP value")
@org.springframework.web.bind.annotation.RequestBody final String otp) {
return deliveryTaskService.updateOtp(id, otp)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}

@PutMapping("/{id}/otp-confirmation")
@Operation(summary = "Confirm OTP", description = "Validates the One-Time Password for a delivery task")
@ApiResponse(responseCode = "200", description = "OTP confirmed successfully")
@ApiResponse(responseCode = "404", description = "Invalid OTP or task not found")
public ResponseEntity<String> confirmOTP(
@PutMapping("/{id}/confirmation")
@Operation(summary = "Confirm delivery",
description = "Validates the delivery confirmation input (e.g., OTP, QR code, or signature)")
@ApiResponse(responseCode = "200", description = "Delivery confirmed successfully")
@ApiResponse(responseCode = "404", description = "Invalid confirmation input or task not found")
public ResponseEntity<String> confirmDelivery(
@Parameter(description = "ID of the delivery task")
@PathVariable final String id,
@RequestBody(description = "OTP to validate")
@org.springframework.web.bind.annotation.RequestBody final String otp) {
return deliveryTaskService.confirmOTP(id, otp)
@RequestBody(description = "Confirmation input (e.g., OTP, QR code, or signature)")
@org.springframework.web.bind.annotation.RequestBody final String confirmationInput) {
LOGGER.info("Received request to confirm delivery for task ID: {}", id);
return deliveryTaskService.confirmDelivery(id, confirmationInput)
.map(ResponseEntity::ok)
.orElse(ResponseEntity.notFound().build());
}
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/com/podzilla/courier/dtos/events/OrderDeliveredEvent.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/com/podzilla/courier/dtos/events/OrderFailedEvent.java
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/java/com/podzilla/courier/dtos/events/OrderShippedEvent.java
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/java/com/podzilla/courier/events/EventPublisher.java
View file
Open in desktop

This file was deleted.

59 changes: 0 additions & 59 deletions src/main/java/com/podzilla/courier/events/RabbitMQEventPublisher.java
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions src/main/java/com/podzilla/courier/models/ConfirmationType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.podzilla.courier.models;

public enum ConfirmationType {
OTP,
QR_CODE,
SIGNATURE
}
Loading