Merge branch 'refs/heads/main' into order-service-improvement

# Conflicts:
#	order-service/order-service-impl/src/main/java/edu/pa165/orderservice/controller/OrderEntityController.java
#	order-service/order-service-impl/src/main/java/edu/pa165/orderservice/datamanager/DataManager.java
#	order-service/order-service-impl/src/main/java/edu/pa165/orderservice/mapping/OrderItemLineDtoMapper.java
#	order-service/order-service-impl/src/main/java/edu/pa165/orderservice/model/OrderItemLine.java
#	order-service/order-service-impl/src/main/java/edu/pa165/orderservice/service/WineStockService.java
#	order-service/order-service-impl/src/test/java/edu/pa165/orderservice/TestUtils.java
#	order-service/order-service-impl/src/test/java/edu/pa165/orderservice/mapping/OrderEntityDtoMapperUnitTest.java
#	order-service/order-service-impl/src/test/java/edu/pa165/orderservice/mapping/OrderItemLineDtoMapperUnitTest.java
#	order-service/order-service-impl/src/test/java/edu/pa165/orderservice/repository/OrderEntityRepositoryTest.java