From 1a3883e5577391ac7630de76bab5518fc6e754a5 Mon Sep 17 00:00:00 2001 From: Nour Eldien Ayman Date: Sun, 18 May 2025 17:25:46 +0300 Subject: [PATCH] refactor: remove 'api' prefix from cart and promo code endpoints --- .../{ => com/podzilla}/cart/CartApplication.java | 4 ++-- .../podzilla}/cart/config/AppConfig.java | 2 +- .../cart/controller/CartController.java | 8 ++++---- .../cart/controller/PromoCodeController.java | 6 +++--- .../cart/exception/GlobalExceptionHandler.java | 2 +- .../cart/exception/GlobalHandlerException.java | 2 +- .../java/{ => com/podzilla}/cart/model/Cart.java | 2 +- .../{ => com/podzilla}/cart/model/CartItem.java | 2 +- .../{ => com/podzilla}/cart/model/PromoCode.java | 2 +- .../cart/repository/CartRepository.java | 4 ++-- .../cart/repository/PromoCodeRepository.java | 4 ++-- .../podzilla}/cart/service/AddItemCommand.java | 6 +++--- .../podzilla}/cart/service/CartCommand.java | 4 ++-- .../podzilla}/cart/service/CartService.java | 12 ++++++------ .../podzilla}/cart/service/PromoCodeService.java | 8 ++++---- .../cart/service/RemoveItemCommand.java | 6 +++--- .../cart/service/UpdateQuantityCommand.java | 8 ++++---- src/main/resources/application.properties | 2 ++ src/test/java/service/CartServiceTest.java | 16 +++++++--------- src/test/java/service/PromoCodeServiceTest.java | 8 ++++---- 20 files changed, 54 insertions(+), 54 deletions(-) rename src/main/java/{ => com/podzilla}/cart/CartApplication.java (83%) rename src/main/java/{ => com/podzilla}/cart/config/AppConfig.java (89%) rename src/main/java/{ => com/podzilla}/cart/controller/CartController.java (98%) rename src/main/java/{ => com/podzilla}/cart/controller/PromoCodeController.java (95%) rename src/main/java/{ => com/podzilla}/cart/exception/GlobalExceptionHandler.java (96%) rename src/main/java/{ => com/podzilla}/cart/exception/GlobalHandlerException.java (94%) rename src/main/java/{ => com/podzilla}/cart/model/Cart.java (96%) rename src/main/java/{ => com/podzilla}/cart/model/CartItem.java (94%) rename src/main/java/{ => com/podzilla}/cart/model/PromoCode.java (96%) rename src/main/java/{ => com/podzilla}/cart/repository/CartRepository.java (83%) rename src/main/java/{ => com/podzilla}/cart/repository/PromoCodeRepository.java (78%) rename src/main/java/{ => com/podzilla}/cart/service/AddItemCommand.java (95%) rename src/main/java/{ => com/podzilla}/cart/service/CartCommand.java (50%) rename src/main/java/{ => com/podzilla}/cart/service/CartService.java (98%) rename src/main/java/{ => com/podzilla}/cart/service/PromoCodeService.java (89%) rename src/main/java/{ => com/podzilla}/cart/service/RemoveItemCommand.java (94%) rename src/main/java/{ => com/podzilla}/cart/service/UpdateQuantityCommand.java (95%) diff --git a/src/main/java/cart/CartApplication.java b/src/main/java/com/podzilla/cart/CartApplication.java similarity index 83% rename from src/main/java/cart/CartApplication.java rename to src/main/java/com/podzilla/cart/CartApplication.java index abec166..c18ef1f 100644 --- a/src/main/java/cart/CartApplication.java +++ b/src/main/java/com/podzilla/cart/CartApplication.java @@ -1,4 +1,4 @@ -package cart; +package com.podzilla.cart; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -6,7 +6,7 @@ import org.springframework.data.mongodb.repository.config.EnableMongoRepositories; @SpringBootApplication -@EnableMongoRepositories(basePackages = "cart.repository") +@EnableMongoRepositories(basePackages = "com.podzilla.cart.repository") @ComponentScan(basePackages = { "com.podzilla" }) public class CartApplication { public static void main(final String[] args) { diff --git a/src/main/java/cart/config/AppConfig.java b/src/main/java/com/podzilla/cart/config/AppConfig.java similarity index 89% rename from src/main/java/cart/config/AppConfig.java rename to src/main/java/com/podzilla/cart/config/AppConfig.java index 70500cc..2d76465 100644 --- a/src/main/java/cart/config/AppConfig.java +++ b/src/main/java/com/podzilla/cart/config/AppConfig.java @@ -1,4 +1,4 @@ -package cart.config; +package com.podzilla.cart.config; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/cart/controller/CartController.java b/src/main/java/com/podzilla/cart/controller/CartController.java similarity index 98% rename from src/main/java/cart/controller/CartController.java rename to src/main/java/com/podzilla/cart/controller/CartController.java index 4e924b7..53b69e9 100644 --- a/src/main/java/cart/controller/CartController.java +++ b/src/main/java/com/podzilla/cart/controller/CartController.java @@ -1,7 +1,7 @@ -package cart.controller; +package com.podzilla.cart.controller; -import cart.model.Cart; -import cart.service.CartService; +import com.podzilla.cart.model.Cart; +import com.podzilla.cart.service.CartService; import com.podzilla.mq.events.ConfirmationType; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestBody; -import cart.model.CartItem; +import com.podzilla.cart.model.CartItem; import io.swagger.v3.oas.annotations.media.Content; import org.springframework.web.bind.annotation.RequestHeader; diff --git a/src/main/java/cart/controller/PromoCodeController.java b/src/main/java/com/podzilla/cart/controller/PromoCodeController.java similarity index 95% rename from src/main/java/cart/controller/PromoCodeController.java rename to src/main/java/com/podzilla/cart/controller/PromoCodeController.java index 33d6fd3..1ff1bab 100644 --- a/src/main/java/cart/controller/PromoCodeController.java +++ b/src/main/java/com/podzilla/cart/controller/PromoCodeController.java @@ -1,7 +1,7 @@ -package cart.controller; +package com.podzilla.cart.controller; -import cart.model.PromoCode; -import cart.service.PromoCodeService; +import com.podzilla.cart.model.PromoCode; +import com.podzilla.cart.service.PromoCodeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; diff --git a/src/main/java/cart/exception/GlobalExceptionHandler.java b/src/main/java/com/podzilla/cart/exception/GlobalExceptionHandler.java similarity index 96% rename from src/main/java/cart/exception/GlobalExceptionHandler.java rename to src/main/java/com/podzilla/cart/exception/GlobalExceptionHandler.java index 4b03133..0195ffd 100644 --- a/src/main/java/cart/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/podzilla/cart/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package cart.exception; +package com.podzilla.cart.exception; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; diff --git a/src/main/java/cart/exception/GlobalHandlerException.java b/src/main/java/com/podzilla/cart/exception/GlobalHandlerException.java similarity index 94% rename from src/main/java/cart/exception/GlobalHandlerException.java rename to src/main/java/com/podzilla/cart/exception/GlobalHandlerException.java index d6b665b..d9297bf 100644 --- a/src/main/java/cart/exception/GlobalHandlerException.java +++ b/src/main/java/com/podzilla/cart/exception/GlobalHandlerException.java @@ -1,4 +1,4 @@ -package cart.exception; +package com.podzilla.cart.exception; import org.springframework.http.HttpStatus; diff --git a/src/main/java/cart/model/Cart.java b/src/main/java/com/podzilla/cart/model/Cart.java similarity index 96% rename from src/main/java/cart/model/Cart.java rename to src/main/java/com/podzilla/cart/model/Cart.java index 4c52b18..ad33344 100644 --- a/src/main/java/cart/model/Cart.java +++ b/src/main/java/com/podzilla/cart/model/Cart.java @@ -1,4 +1,4 @@ -package cart.model; +package com.podzilla.cart.model; import jakarta.validation.constraints.NotBlank; import lombok.AllArgsConstructor; diff --git a/src/main/java/cart/model/CartItem.java b/src/main/java/com/podzilla/cart/model/CartItem.java similarity index 94% rename from src/main/java/cart/model/CartItem.java rename to src/main/java/com/podzilla/cart/model/CartItem.java index ddac146..184e724 100644 --- a/src/main/java/cart/model/CartItem.java +++ b/src/main/java/com/podzilla/cart/model/CartItem.java @@ -1,4 +1,4 @@ -package cart.model; +package com.podzilla.cart.model; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cart/model/PromoCode.java b/src/main/java/com/podzilla/cart/model/PromoCode.java similarity index 96% rename from src/main/java/cart/model/PromoCode.java rename to src/main/java/com/podzilla/cart/model/PromoCode.java index c69956d..d533c6d 100644 --- a/src/main/java/cart/model/PromoCode.java +++ b/src/main/java/com/podzilla/cart/model/PromoCode.java @@ -1,4 +1,4 @@ -package cart.model; +package com.podzilla.cart.model; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/cart/repository/CartRepository.java b/src/main/java/com/podzilla/cart/repository/CartRepository.java similarity index 83% rename from src/main/java/cart/repository/CartRepository.java rename to src/main/java/com/podzilla/cart/repository/CartRepository.java index 65d18fd..e544fc5 100644 --- a/src/main/java/cart/repository/CartRepository.java +++ b/src/main/java/com/podzilla/cart/repository/CartRepository.java @@ -1,6 +1,6 @@ -package cart.repository; +package com.podzilla.cart.repository; -import cart.model.Cart; +import com.podzilla.cart.model.Cart; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cart/repository/PromoCodeRepository.java b/src/main/java/com/podzilla/cart/repository/PromoCodeRepository.java similarity index 78% rename from src/main/java/cart/repository/PromoCodeRepository.java rename to src/main/java/com/podzilla/cart/repository/PromoCodeRepository.java index 371285a..2d4116d 100644 --- a/src/main/java/cart/repository/PromoCodeRepository.java +++ b/src/main/java/com/podzilla/cart/repository/PromoCodeRepository.java @@ -1,7 +1,7 @@ -package cart.repository; +package com.podzilla.cart.repository; -import cart.model.PromoCode; +import com.podzilla.cart.model.PromoCode; import org.springframework.data.mongodb.repository.MongoRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/cart/service/AddItemCommand.java b/src/main/java/com/podzilla/cart/service/AddItemCommand.java similarity index 95% rename from src/main/java/cart/service/AddItemCommand.java rename to src/main/java/com/podzilla/cart/service/AddItemCommand.java index a0755c2..0ac42f2 100644 --- a/src/main/java/cart/service/AddItemCommand.java +++ b/src/main/java/com/podzilla/cart/service/AddItemCommand.java @@ -1,7 +1,7 @@ -package cart.service; +package com.podzilla.cart.service; -import cart.model.Cart; -import cart.model.CartItem; +import com.podzilla.cart.model.Cart; +import com.podzilla.cart.model.CartItem; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/cart/service/CartCommand.java b/src/main/java/com/podzilla/cart/service/CartCommand.java similarity index 50% rename from src/main/java/cart/service/CartCommand.java rename to src/main/java/com/podzilla/cart/service/CartCommand.java index da64aad..60e1259 100644 --- a/src/main/java/cart/service/CartCommand.java +++ b/src/main/java/com/podzilla/cart/service/CartCommand.java @@ -1,6 +1,6 @@ -package cart.service; +package com.podzilla.cart.service; -import cart.model.Cart; +import com.podzilla.cart.model.Cart; public interface CartCommand { Cart execute(); diff --git a/src/main/java/cart/service/CartService.java b/src/main/java/com/podzilla/cart/service/CartService.java similarity index 98% rename from src/main/java/cart/service/CartService.java rename to src/main/java/com/podzilla/cart/service/CartService.java index f292b05..a22a13a 100644 --- a/src/main/java/cart/service/CartService.java +++ b/src/main/java/com/podzilla/cart/service/CartService.java @@ -1,10 +1,10 @@ -package cart.service; +package com.podzilla.cart.service; -import cart.exception.GlobalHandlerException; -import cart.model.Cart; -import cart.model.CartItem; -import cart.model.PromoCode; -import cart.repository.CartRepository; +import com.podzilla.cart.exception.GlobalHandlerException; +import com.podzilla.cart.model.Cart; +import com.podzilla.cart.model.CartItem; +import com.podzilla.cart.model.PromoCode; +import com.podzilla.cart.repository.CartRepository; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; diff --git a/src/main/java/cart/service/PromoCodeService.java b/src/main/java/com/podzilla/cart/service/PromoCodeService.java similarity index 89% rename from src/main/java/cart/service/PromoCodeService.java rename to src/main/java/com/podzilla/cart/service/PromoCodeService.java index c3767af..5d80524 100644 --- a/src/main/java/cart/service/PromoCodeService.java +++ b/src/main/java/com/podzilla/cart/service/PromoCodeService.java @@ -1,8 +1,8 @@ -package cart.service; +package com.podzilla.cart.service; -import cart.exception.GlobalHandlerException; -import cart.model.PromoCode; -import cart.repository.PromoCodeRepository; +import com.podzilla.cart.exception.GlobalHandlerException; +import com.podzilla.cart.model.PromoCode; +import com.podzilla.cart.repository.PromoCodeRepository; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/java/cart/service/RemoveItemCommand.java b/src/main/java/com/podzilla/cart/service/RemoveItemCommand.java similarity index 94% rename from src/main/java/cart/service/RemoveItemCommand.java rename to src/main/java/com/podzilla/cart/service/RemoveItemCommand.java index 1a7bc00..71952c7 100644 --- a/src/main/java/cart/service/RemoveItemCommand.java +++ b/src/main/java/com/podzilla/cart/service/RemoveItemCommand.java @@ -1,7 +1,7 @@ -package cart.service; +package com.podzilla.cart.service; -import cart.model.Cart; -import cart.model.CartItem; +import com.podzilla.cart.model.Cart; +import com.podzilla.cart.model.CartItem; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/cart/service/UpdateQuantityCommand.java b/src/main/java/com/podzilla/cart/service/UpdateQuantityCommand.java similarity index 95% rename from src/main/java/cart/service/UpdateQuantityCommand.java rename to src/main/java/com/podzilla/cart/service/UpdateQuantityCommand.java index 5ea737d..6d08c59 100644 --- a/src/main/java/cart/service/UpdateQuantityCommand.java +++ b/src/main/java/com/podzilla/cart/service/UpdateQuantityCommand.java @@ -1,8 +1,8 @@ -package cart.service; +package com.podzilla.cart.service; -import cart.exception.GlobalHandlerException; -import cart.model.Cart; -import cart.model.CartItem; +import com.podzilla.cart.exception.GlobalHandlerException; +import com.podzilla.cart.model.Cart; +import com.podzilla.cart.model.CartItem; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index ac948a4..f2fe1f3 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -13,3 +13,5 @@ spring.rabbitmq.password=guest # Use appropriate credentials # Custom properties for exchange/routing keys rabbitmq.exchange.name=cart.events rabbitmq.routing.key.checkout=order.checkout.initiate + +server.servlet.context-path=/api diff --git a/src/test/java/service/CartServiceTest.java b/src/test/java/service/CartServiceTest.java index eb9622a..a31bd02 100644 --- a/src/test/java/service/CartServiceTest.java +++ b/src/test/java/service/CartServiceTest.java @@ -1,11 +1,11 @@ package service; -import cart.exception.GlobalHandlerException; -import cart.model.Cart; -import cart.model.CartItem; -import cart.model.PromoCode; -import cart.repository.CartRepository; -import cart.service.CartService; -import cart.service.PromoCodeService; +import com.podzilla.cart.exception.GlobalHandlerException; +import com.podzilla.cart.model.Cart; +import com.podzilla.cart.model.CartItem; +import com.podzilla.cart.model.PromoCode; +import com.podzilla.cart.repository.CartRepository; +import com.podzilla.cart.service.CartService; +import com.podzilla.cart.service.PromoCodeService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -13,9 +13,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.http.HttpStatus; -import org.springframework.test.util.ReflectionTestUtils; import com.podzilla.mq.EventPublisher; import com.podzilla.mq.EventsConstants; diff --git a/src/test/java/service/PromoCodeServiceTest.java b/src/test/java/service/PromoCodeServiceTest.java index aa6116a..ca03a0e 100644 --- a/src/test/java/service/PromoCodeServiceTest.java +++ b/src/test/java/service/PromoCodeServiceTest.java @@ -1,9 +1,9 @@ package service; -import cart.exception.GlobalHandlerException; -import cart.model.PromoCode; -import cart.repository.PromoCodeRepository; -import cart.service.PromoCodeService; +import com.podzilla.cart.exception.GlobalHandlerException; +import com.podzilla.cart.model.PromoCode; +import com.podzilla.cart.repository.PromoCodeRepository; +import com.podzilla.cart.service.PromoCodeService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith;