From aa7bfed331be4fb8587bbf4f124170425c523378 Mon Sep 17 00:00:00 2001 From: TakahashiNguyen Date: Fri, 15 May 2026 14:22:35 +0000 Subject: [PATCH] fix: final commit (#61) Co-authored-by: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com> Reviewed-on: https://git.demonkernel.io.vn/FoodSurf/backend/pulls/61 --- .../com/drinkool/entities/ManagerEntity.java | 4 +- .../com/drinkool/entities/StaffEntity.java | 4 ++ .../drinkool/filters/HeaderRolesFilter.java | 2 +- .../java/com/drinkool/models/UserModel.java | 2 +- .../com/drinkool/services/AccountService.java | 2 +- .../drinkool/services/CustomerService.java | 9 ++- .../com/drinkool/services/ManagerService.java | 8 ++- .../com/drinkool/services/StaffService.java | 13 ++++- .../drinkool/services/AccountServiceTest.java | 2 +- .../drinkool/services/BaseServiceTest.java | 2 +- .../services/CustomerServiceTest.java | 2 +- .../drinkool/services/ManagerServiceTest.java | 11 +++- ...erviceTest.java => StaffServiceTest_.java} | 36 ++++++------ .../controllers/ManagerController.java | 7 +-- .../com/drinkool/services/CartService.java | 27 +++++++-- ...ServiceTest.java => CartServiceTest_.java} | 3 +- .../java/com/drinkool/dtos/CreateShift.java | 4 +- .../java/com/drinkool/dtos/DtoMapper.java | 1 - .../com/drinkool/entities/EateryEntity.java | 1 - .../com/drinkool/entities/MenuItemEntity.java | 8 ++- .../com/drinkool/entities/ReviewEntity.java | 2 +- .../com/drinkool/entities/ShiftEntity.java | 5 +- .../entities/ShiftRegistrationEntity.java | 6 +- .../drinkool/filters/HeaderRolesFilter.java | 2 +- .../com/drinkool/services/EateryService.java | 2 +- .../com/drinkool/services/ReviewService.java | 9 ++- .../com/drinkool/services/ShiftService.java | 2 + .../drinkool/entities/ReviewEntityTest.java | 55 ------------------- .../drinkool/services/EateryServiceTest.java | 2 +- .../drinkool/services/ReviewServiceTest.java | 16 ++++-- .../drinkool/services/ShiftServiceTest.java | 4 +- file-service/pom.xml | 16 ++++++ .../drinkool/controller/CartController.java | 2 +- .../controller/CustomerController.java | 8 ++- .../drinkool/controller/EateryController.java | 4 +- .../com/drinkool/controller/GraphqlBase.java | 2 +- .../drinkool/controller/IndexController.java | 2 +- .../drinkool/controller/MainController.java | 2 +- .../controller/ManagerController.java | 2 +- .../drinkool/controller/StaffController.java | 10 +++- .../drinkool/filters/HeaderRolesFilter.java | 2 +- .../com/drinkool/services/BaseService.java | 2 +- .../drinkool/services/CustomerService.java | 6 +- .../com/drinkool/services/ManagerService.java | 2 +- .../com/drinkool/services/ReviewService.java | 2 +- .../com/drinkool/services/StaffService.java | 6 +- .../utils => }/BaseHeaderAuthentication.java | 3 +- lib/src/main/java/com/drinkool/Role.java | 2 +- .../drinkool/{lib => }/dtos/AddInventory.java | 2 +- .../{lib => }/dtos/CartItemRequest.java | 2 +- .../drinkool/{lib => }/dtos/GraphqlDto.java | 2 +- .../com/drinkool/{lib => }/dtos/Login.java | 2 +- .../{lib => }/dtos/ManagerSignup.java | 2 +- .../drinkool/{lib => }/dtos/QuickLogin.java | 2 +- .../drinkool/{lib => }/dtos/QuickSignup.java | 2 +- .../drinkool/{lib => }/dtos/SendReview.java | 2 +- .../com/drinkool/{lib => }/dtos/Signup.java | 2 +- .../com/drinkool/{lib => }/dtos/SmsOtp.java | 2 +- .../{lib => }/dtos/event/ManagerCreate.java | 2 +- .../{lib => }/entities/BaseEntity.java | 2 +- 60 files changed, 196 insertions(+), 154 deletions(-) rename account-service/src/test/java/com/drinkool/services/{StaffServiceTest.java => StaffServiceTest_.java} (82%) rename cart-service/src/test/java/com/drinkool/services/{CartServiceTest.java => CartServiceTest_.java} (98%) delete mode 100644 eatery-service/src/test/java/com/drinkool/entities/ReviewEntityTest.java rename lib/src/main/java/com/drinkool/{lib/utils => }/BaseHeaderAuthentication.java (94%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/AddInventory.java (70%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/CartItemRequest.java (77%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/GraphqlDto.java (76%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/Login.java (85%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/ManagerSignup.java (77%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/QuickLogin.java (69%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/QuickSignup.java (63%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/SendReview.java (94%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/Signup.java (86%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/SmsOtp.java (60%) rename lib/src/main/java/com/drinkool/{lib => }/dtos/event/ManagerCreate.java (88%) rename lib/src/main/java/com/drinkool/{lib => }/entities/BaseEntity.java (94%) diff --git a/account-service/src/main/java/com/drinkool/entities/ManagerEntity.java b/account-service/src/main/java/com/drinkool/entities/ManagerEntity.java index 5d47e4d..485d7a3 100644 --- a/account-service/src/main/java/com/drinkool/entities/ManagerEntity.java +++ b/account-service/src/main/java/com/drinkool/entities/ManagerEntity.java @@ -29,7 +29,7 @@ public class ManagerEntity extends UserModel { } @Transactional - public void signup( + public ManagerEntity signup( String name, String phone, String bankAccount, @@ -38,5 +38,7 @@ public class ManagerEntity extends UserModel { this.bankAccount = bankAccount; super.signup(name, phone, rawPassword); + + return this; } } diff --git a/account-service/src/main/java/com/drinkool/entities/StaffEntity.java b/account-service/src/main/java/com/drinkool/entities/StaffEntity.java index 7ba98b8..9193d75 100644 --- a/account-service/src/main/java/com/drinkool/entities/StaffEntity.java +++ b/account-service/src/main/java/com/drinkool/entities/StaffEntity.java @@ -13,6 +13,10 @@ import jakarta.transaction.Transactional; @Table(name = Role.Staff) public class StaffEntity extends UserModel { + public StaffEntity() { + super(Role.Staff); + } + @Transactional public void signup( String name, diff --git a/account-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java b/account-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java index 618b711..2dd01a4 100644 --- a/account-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java +++ b/account-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java @@ -1,6 +1,6 @@ package com.drinkool.filters; -import com.drinkool.lib.utils.BaseHeaderAuthentication; +import com.drinkool.BaseHeaderAuthentication; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/account-service/src/main/java/com/drinkool/models/UserModel.java b/account-service/src/main/java/com/drinkool/models/UserModel.java index e3a1346..fcdb2d2 100644 --- a/account-service/src/main/java/com/drinkool/models/UserModel.java +++ b/account-service/src/main/java/com/drinkool/models/UserModel.java @@ -1,6 +1,6 @@ package com.drinkool.models; -import com.drinkool.lib.entities.BaseEntity; +import com.drinkool.entities.BaseEntity; import com.drinkool.utils.PhoneValidator; import com.fasterxml.jackson.annotation.JsonProperty; import com.password4j.Password; diff --git a/account-service/src/main/java/com/drinkool/services/AccountService.java b/account-service/src/main/java/com/drinkool/services/AccountService.java index b5843a1..67add52 100644 --- a/account-service/src/main/java/com/drinkool/services/AccountService.java +++ b/account-service/src/main/java/com/drinkool/services/AccountService.java @@ -4,7 +4,7 @@ import com.drinkool.Role; import com.drinkool.Url; import com.drinkool.entities.ManagerEntity; import com.drinkool.entities.StaffEntity; -import com.drinkool.lib.dtos.SmsOtp; +import com.drinkool.dtos.SmsOtp; import com.drinkool.models.UserModel; import jakarta.inject.Inject; import jakarta.ws.rs.*; diff --git a/account-service/src/main/java/com/drinkool/services/CustomerService.java b/account-service/src/main/java/com/drinkool/services/CustomerService.java index a57abc9..c67fc91 100644 --- a/account-service/src/main/java/com/drinkool/services/CustomerService.java +++ b/account-service/src/main/java/com/drinkool/services/CustomerService.java @@ -1,12 +1,13 @@ package com.drinkool.services; import com.drinkool.*; +import com.drinkool.dtos.*; import com.drinkool.entities.CustomerEntity; -import com.drinkool.lib.dtos.*; import jakarta.inject.Inject; import jakarta.transaction.Transactional; import jakarta.ws.rs.*; import jakarta.ws.rs.core.*; +import java.util.UUID; @Path(Role.Customer) public class CustomerService extends BaseService { @@ -88,4 +89,10 @@ public class CustomerService extends BaseService { .entity(customer) .build(); } + + @GET + @Path("/{id}") + public Response findStaff(@PathParam("id") UUID staffId) { + return Response.ok(CustomerEntity.findById(staffId)).build(); + } } diff --git a/account-service/src/main/java/com/drinkool/services/ManagerService.java b/account-service/src/main/java/com/drinkool/services/ManagerService.java index de00fcc..27bdc6d 100644 --- a/account-service/src/main/java/com/drinkool/services/ManagerService.java +++ b/account-service/src/main/java/com/drinkool/services/ManagerService.java @@ -1,9 +1,9 @@ package com.drinkool.services; import com.drinkool.*; +import com.drinkool.dtos.*; +import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.entities.ManagerEntity; -import com.drinkool.lib.dtos.*; -import com.drinkool.lib.dtos.event.ManagerCreate; import jakarta.enterprise.context.ApplicationScoped; import jakarta.transaction.Transactional; import jakarta.ws.rs.*; @@ -26,6 +26,10 @@ public class ManagerService extends BaseService { @Path(Url.Signup) @Transactional public Response signup(ManagerSignup input) { + if (ManagerEntity.count() > 0) return Response.status( + Response.Status.BAD_REQUEST + ).build(); + ManagerEntity newManager = new ManagerEntity(); newManager.signup( diff --git a/account-service/src/main/java/com/drinkool/services/StaffService.java b/account-service/src/main/java/com/drinkool/services/StaffService.java index b8bcaef..9715d29 100644 --- a/account-service/src/main/java/com/drinkool/services/StaffService.java +++ b/account-service/src/main/java/com/drinkool/services/StaffService.java @@ -3,16 +3,18 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; +import com.drinkool.dtos.Login; +import com.drinkool.dtos.Signup; import com.drinkool.entities.ManagerEntity; import com.drinkool.entities.StaffEntity; -import com.drinkool.lib.dtos.Login; -import com.drinkool.lib.dtos.Signup; import io.vertx.core.http.HttpServerRequest; import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.transaction.Transactional; +import jakarta.ws.rs.GET; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import jakarta.ws.rs.core.Response; import java.util.UUID; @@ -64,9 +66,16 @@ public class StaffService extends BaseService { .build(); return Response.accepted() + .entity(staff) .header(InternalValue.userId, staff.id.toString()) .header(InternalValue.managerId, staff.serve.id.toString()) .header(InternalValue.role, Role.Staff) .build(); } + + @GET + @Path("/{id}") + public Response findStaff(@PathParam("id") UUID staffId) { + return Response.ok(StaffEntity.findById(staffId)).build(); + } } diff --git a/account-service/src/test/java/com/drinkool/services/AccountServiceTest.java b/account-service/src/test/java/com/drinkool/services/AccountServiceTest.java index 2ff15c6..c8880af 100644 --- a/account-service/src/test/java/com/drinkool/services/AccountServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/AccountServiceTest.java @@ -3,7 +3,7 @@ package com.drinkool.services; import static io.restassured.RestAssured.*; import com.drinkool.*; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import org.junit.jupiter.api.Test; diff --git a/account-service/src/test/java/com/drinkool/services/BaseServiceTest.java b/account-service/src/test/java/com/drinkool/services/BaseServiceTest.java index db28019..2838545 100644 --- a/account-service/src/test/java/com/drinkool/services/BaseServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/BaseServiceTest.java @@ -4,7 +4,7 @@ import static io.restassured.RestAssured.*; import static org.hamcrest.CoreMatchers.*; import com.drinkool.*; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import org.junit.jupiter.api.Test; diff --git a/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java b/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java index d22bfaa..bbd69cb 100644 --- a/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.*; import com.drinkool.*; import com.drinkool.entities.CustomerEntity; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import jakarta.inject.Inject; diff --git a/account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java b/account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java index f73700a..597a954 100644 --- a/account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java @@ -4,15 +4,18 @@ import static io.restassured.RestAssured.*; import static org.junit.jupiter.api.Assertions.*; import com.drinkool.*; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; +import com.drinkool.entities.ManagerEntity; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.kafka.*; import io.restassured.http.ContentType; import io.smallrye.reactive.messaging.kafka.companion.ConsumerTask; import io.smallrye.reactive.messaging.kafka.companion.KafkaCompanion; +import jakarta.transaction.Transactional; import java.time.Duration; import org.eclipse.microprofile.config.inject.ConfigProperty; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @QuarkusTest @@ -25,6 +28,12 @@ public class ManagerServiceTest { @ConfigProperty(name = "mp.messaging.outgoing.manager-out.topic") String topicName; + @BeforeEach + @Transactional + void setup() { + ManagerEntity.deleteAll(); + } + @Test void testSignupSuccessAndKafkaMessageSent() { ManagerSignup input = new ManagerSignup(); diff --git a/account-service/src/test/java/com/drinkool/services/StaffServiceTest.java b/account-service/src/test/java/com/drinkool/services/StaffServiceTest_.java similarity index 82% rename from account-service/src/test/java/com/drinkool/services/StaffServiceTest.java rename to account-service/src/test/java/com/drinkool/services/StaffServiceTest_.java index c13b0e5..cd6af12 100644 --- a/account-service/src/test/java/com/drinkool/services/StaffServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/StaffServiceTest_.java @@ -4,45 +4,45 @@ import static io.restassured.RestAssured.*; import static org.junit.jupiter.api.Assertions.*; import com.drinkool.*; +import com.drinkool.dtos.*; +import com.drinkool.entities.ManagerEntity; import com.drinkool.entities.StaffEntity; -import com.drinkool.lib.dtos.*; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.kafka.*; import io.restassured.http.ContentType; +import jakarta.enterprise.context.control.ActivateRequestContext; +import jakarta.transaction.Transactional; import jakarta.ws.rs.core.Response; +import java.util.concurrent.TimeUnit; import net.datafaker.Faker; -import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; @QuarkusTest @QuarkusTestResource(KafkaCompanionResource.class) -public class StaffServiceTest { +public class StaffServiceTest_ { private final Faker faker = new Faker(); - private String managerId; + private static String managerId; - @BeforeEach - void setup() { + @BeforeAll + @Transactional + @ActivateRequestContext + static void setup() throws InterruptedException { ManagerSignup input = new ManagerSignup(); input.name = "Ho Van Quan"; input.phone = Utils.generateRandomPhone(); input.password = "strong_password"; input.eateryName = "Quan Com Ngon"; - var response = given() - .contentType("application/json") - .body(input) - .when() - .post(Role.Manager + Url.Signup) - .then() - .statusCode(201) - .header(InternalValue.userId, org.hamcrest.Matchers.notNullValue()) - .header(InternalValue.role, Role.Manager) - .extract(); - - managerId = response.header(InternalValue.userId); + managerId = (new ManagerEntity()).signup( + input.name, + input.phone, + "", + input.password + ).id.toString(); } @Test diff --git a/cart-service/src/main/java/com/drinkool/controllers/ManagerController.java b/cart-service/src/main/java/com/drinkool/controllers/ManagerController.java index 043950c..83be61e 100644 --- a/cart-service/src/main/java/com/drinkool/controllers/ManagerController.java +++ b/cart-service/src/main/java/com/drinkool/controllers/ManagerController.java @@ -6,16 +6,15 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Response; -import java.util.UUID; import org.eclipse.microprofile.rest.client.inject.RegisterRestClient; -@RegisterRestClient(configKey = "eatery") +@RegisterRestClient(configKey = "account") @Path(Role.Manager) public interface ManagerController { @GET - @Path(Role.Manager + "/{id}/payment-qr") + @Path("/{id}/payment-qr") public Response getManagerPaymentQr( - @PathParam("id") UUID id, + @PathParam("id") String id, @QueryParam("amount") Long amount, @QueryParam("cartId") String cartId ); diff --git a/cart-service/src/main/java/com/drinkool/services/CartService.java b/cart-service/src/main/java/com/drinkool/services/CartService.java index 1cfef77..93c8d70 100644 --- a/cart-service/src/main/java/com/drinkool/services/CartService.java +++ b/cart-service/src/main/java/com/drinkool/services/CartService.java @@ -45,7 +45,7 @@ public class CartService { @Inject public CartService(RedisDataSource ds) { - this.hashCommands = ds.hash(String.class); + this.hashCommands = ds.hash(String.class, String.class, String.class); this.valueCommands = ds.value(String.class); } @@ -64,7 +64,7 @@ public class CartService { String cartId = UUID.randomUUID().toString(); String redisKey = "cart:" + cartId; - String ownerId = response.getEntity().toString(); + String ownerId = response.readEntity(String.class); hashCommands.hset( redisKey, @@ -100,7 +100,6 @@ public class CartService { Map data = hashCommands.hgetall(key); Map itemPrices = hashCommands.hgetall(priceKey); - String managerId = hashCommands.hget(key, "_metadata_eateryManagerId"); if (data.isEmpty()) { throw new GraphQLException("NotFoundCart"); @@ -110,6 +109,7 @@ public class CartService { cart.Id = cartId; cart.eateryId = UUID.fromString(data.get("_metadata_eatery")); String ownerStr = data.get("_metadata_owner"); + String managerId = data.get("_metadata_eateryManagerId"); cart.userId = "GUEST".equals(ownerStr) ? null : UUID.fromString(ownerStr); cart.items = new ArrayList<>(); @@ -136,7 +136,7 @@ public class CartService { try { Response response = managerController.getManagerPaymentQr( - UUID.fromString(managerId), + managerId, total, cartId.toString() ); @@ -144,6 +144,8 @@ public class CartService { cart.paymentQrUrl = response.readEntity(String.class); } catch (Exception e) { cart.paymentQrUrl = ""; + + System.out.println(e.getMessage()); } return cart; @@ -186,4 +188,21 @@ public class CartService { return getCart(cartId); } + + @Mutation("deleteCart") + public Uni deleteCart(@Name("cartId") UUID cartId) { + String key = "cart:" + cartId; + String priceKey = "cart_prices:" + cartId; + + return Uni.createFrom() + .item(() -> { + long deletedKeys = hashCommands + .getDataSource() + .key() + .del(key, priceKey); + + return deletedKeys > 0; + }) + .runSubscriptionOn(Infrastructure.getDefaultWorkerPool()); + } } diff --git a/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java b/cart-service/src/test/java/com/drinkool/services/CartServiceTest_.java similarity index 98% rename from cart-service/src/test/java/com/drinkool/services/CartServiceTest.java rename to cart-service/src/test/java/com/drinkool/services/CartServiceTest_.java index c06d564..52e6fa6 100644 --- a/cart-service/src/test/java/com/drinkool/services/CartServiceTest.java +++ b/cart-service/src/test/java/com/drinkool/services/CartServiceTest_.java @@ -19,7 +19,6 @@ import io.smallrye.mutiny.helpers.test.UniAssertSubscriber; import io.vertx.core.http.HttpServerRequest; import jakarta.inject.Inject; import jakarta.ws.rs.core.Response; -import java.time.Duration; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -29,7 +28,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @QuarkusTest -public class CartServiceTest { +public class CartServiceTest_ { @Inject CartService cartService; diff --git a/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java b/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java index 6eb1521..f0ca357 100644 --- a/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java +++ b/eatery-service/src/main/java/com/drinkool/dtos/CreateShift.java @@ -1,7 +1,7 @@ package com.drinkool.dtos; +import java.time.LocalDate; import java.time.LocalTime; -import java.util.Date; import lombok.NoArgsConstructor; import org.eclipse.microprofile.graphql.NonNull; @@ -9,7 +9,7 @@ import org.eclipse.microprofile.graphql.NonNull; public class CreateShift { @NonNull - public Date date; + public LocalDate date; @NonNull public LocalTime startTime; diff --git a/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java b/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java index ca5a251..733e52c 100644 --- a/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java +++ b/eatery-service/src/main/java/com/drinkool/dtos/DtoMapper.java @@ -2,7 +2,6 @@ package com.drinkool.dtos; import com.drinkool.entities.MenuItemEntity; import com.drinkool.entities.ReviewEntity; -import com.drinkool.lib.dtos.SendReview; import jakarta.enterprise.context.ApplicationScoped; import org.mapstruct.BeanMapping; import org.mapstruct.Mapper; diff --git a/eatery-service/src/main/java/com/drinkool/entities/EateryEntity.java b/eatery-service/src/main/java/com/drinkool/entities/EateryEntity.java index f9a04d1..1cbe7a2 100644 --- a/eatery-service/src/main/java/com/drinkool/entities/EateryEntity.java +++ b/eatery-service/src/main/java/com/drinkool/entities/EateryEntity.java @@ -1,6 +1,5 @@ package com.drinkool.entities; -import com.drinkool.lib.entities.BaseEntity; import jakarta.persistence.*; import jakarta.transaction.Transactional; import java.util.ArrayList; diff --git a/eatery-service/src/main/java/com/drinkool/entities/MenuItemEntity.java b/eatery-service/src/main/java/com/drinkool/entities/MenuItemEntity.java index ceaaffd..4d2b6d1 100644 --- a/eatery-service/src/main/java/com/drinkool/entities/MenuItemEntity.java +++ b/eatery-service/src/main/java/com/drinkool/entities/MenuItemEntity.java @@ -2,8 +2,12 @@ package com.drinkool.entities; import com.drinkool.dtos.AddMenuItem; import com.drinkool.interfaces.MenuItemInterface; -import com.drinkool.lib.entities.BaseEntity; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import jakarta.transaction.Transactional; import lombok.Getter; import lombok.Setter; diff --git a/eatery-service/src/main/java/com/drinkool/entities/ReviewEntity.java b/eatery-service/src/main/java/com/drinkool/entities/ReviewEntity.java index d563242..756ad6d 100644 --- a/eatery-service/src/main/java/com/drinkool/entities/ReviewEntity.java +++ b/eatery-service/src/main/java/com/drinkool/entities/ReviewEntity.java @@ -1,7 +1,6 @@ package com.drinkool.entities; import com.drinkool.interfaces.ReviewInterface; -import com.drinkool.lib.entities.BaseEntity; import jakarta.persistence.*; import java.util.UUID; import lombok.AllArgsConstructor; @@ -17,6 +16,7 @@ import lombok.Setter; @Table(name = "reviews") public class ReviewEntity extends BaseEntity implements ReviewInterface { + @Column(nullable = true) public UUID reviewerId; public UUID eateryId; diff --git a/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java b/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java index 4cf4874..935d4a1 100644 --- a/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java +++ b/eatery-service/src/main/java/com/drinkool/entities/ShiftEntity.java @@ -1,6 +1,5 @@ package com.drinkool.entities; -import com.drinkool.lib.entities.BaseEntity; import jakarta.persistence.CascadeType; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -9,9 +8,9 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToMany; import jakarta.persistence.Table; +import java.time.LocalDate; import java.time.LocalTime; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Entity @@ -23,7 +22,7 @@ public class ShiftEntity extends BaseEntity { public EateryEntity eatery; @Column(nullable = false) - public Date date; + public LocalDate date; @Column(nullable = false) public LocalTime startTime; diff --git a/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java b/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java index f12697c..a79c2ec 100644 --- a/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java +++ b/eatery-service/src/main/java/com/drinkool/entities/ShiftRegistrationEntity.java @@ -1,6 +1,5 @@ package com.drinkool.entities; -import com.drinkool.lib.entities.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -30,10 +29,11 @@ public class ShiftRegistrationEntity extends BaseEntity { ShiftEntity registratingShift ) { return list( - "staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3", + "staffId = ?1 and shift.startTime < ?2 and shift.endTime > ?3 and shift.date = ?4", staffId, registratingShift.endTime, - registratingShift.startTime + registratingShift.startTime, + registratingShift.date ); } } diff --git a/eatery-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java b/eatery-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java index 618b711..2dd01a4 100644 --- a/eatery-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java +++ b/eatery-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java @@ -1,6 +1,6 @@ package com.drinkool.filters; -import com.drinkool.lib.utils.BaseHeaderAuthentication; +import com.drinkool.BaseHeaderAuthentication; import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped diff --git a/eatery-service/src/main/java/com/drinkool/services/EateryService.java b/eatery-service/src/main/java/com/drinkool/services/EateryService.java index 0f3fd7c..cd029e2 100644 --- a/eatery-service/src/main/java/com/drinkool/services/EateryService.java +++ b/eatery-service/src/main/java/com/drinkool/services/EateryService.java @@ -7,7 +7,7 @@ import com.drinkool.dtos.DtoMapper; import com.drinkool.dtos.UpdateMenuItem; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; -import com.drinkool.lib.dtos.event.ManagerCreate; +import com.drinkool.dtos.event.ManagerCreate; import io.vertx.core.http.HttpServerRequest; import jakarta.annotation.security.RolesAllowed; import jakarta.enterprise.context.ApplicationScoped; diff --git a/eatery-service/src/main/java/com/drinkool/services/ReviewService.java b/eatery-service/src/main/java/com/drinkool/services/ReviewService.java index 397da26..a8737c2 100644 --- a/eatery-service/src/main/java/com/drinkool/services/ReviewService.java +++ b/eatery-service/src/main/java/com/drinkool/services/ReviewService.java @@ -4,12 +4,11 @@ import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; import com.drinkool.dtos.DtoMapper; +import com.drinkool.dtos.SendReview; import com.drinkool.entities.ReviewEntity; import com.drinkool.enums.SortBy; -import com.drinkool.lib.dtos.SendReview; import io.quarkus.panache.common.Sort; import io.vertx.core.http.HttpServerRequest; -import jakarta.annotation.security.RolesAllowed; import jakarta.inject.Inject; import jakarta.transaction.Transactional; import jakarta.ws.rs.DefaultValue; @@ -50,14 +49,14 @@ public class ReviewService { } @POST - @RolesAllowed(Role.Customer) @Transactional public Response receiveReview(SendReview input) { - UUID reviewerId = UUID.fromString(request.getHeader(InternalValue.userId)); + String userId = request.getHeader(InternalValue.userId); try { ReviewEntity entity = dtoMapper.toReviewEntity(input); - entity.setReviewerId(reviewerId); + + if (userId != null) entity.setReviewerId(UUID.fromString(userId)); entity.persist(); diff --git a/eatery-service/src/main/java/com/drinkool/services/ShiftService.java b/eatery-service/src/main/java/com/drinkool/services/ShiftService.java index db0ca59..9caf131 100644 --- a/eatery-service/src/main/java/com/drinkool/services/ShiftService.java +++ b/eatery-service/src/main/java/com/drinkool/services/ShiftService.java @@ -154,6 +154,8 @@ public class ShiftService { throw new GraphQLException("InvalidEndTime"); } + shift.persist(); + return shift; } diff --git a/eatery-service/src/test/java/com/drinkool/entities/ReviewEntityTest.java b/eatery-service/src/test/java/com/drinkool/entities/ReviewEntityTest.java deleted file mode 100644 index cf83d28..0000000 --- a/eatery-service/src/test/java/com/drinkool/entities/ReviewEntityTest.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.drinkool.entities; - -import io.quarkus.test.junit.QuarkusTest; -import jakarta.transaction.Transactional; -import java.util.UUID; -import net.datafaker.Faker; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -@QuarkusTest -public class ReviewEntityTest { - - private final Faker faker = new Faker(); - - @Test - @Transactional - public void testCreateReview() { - UUID testReviewerId = UUID.randomUUID(); - UUID testEateryId = UUID.randomUUID(); - String comment = faker.famousLastWords().lastWords(); - int rating = faker.random().nextInt(1, 5); - - ReviewEntity savedReview = new ReviewEntity( - testReviewerId, - testEateryId, - rating, - comment - ); - - savedReview.persist(); - - // 3. Kiểm chứng (Assert) - Assertions.assertNotNull( - savedReview, - "Thực thể Review sau khi tạo không được null" - ); - Assertions.assertEquals( - testReviewerId, - savedReview.reviewerId, - "Reviewer ID không khớp" - ); - Assertions.assertEquals( - testEateryId, - savedReview.eateryId, - "Eatery ID không khớp" - ); - Assertions.assertEquals(rating, savedReview.rating, "Rating không khớp"); - Assertions.assertEquals(comment, savedReview.comment, "Comment không khớp"); - - Assertions.assertNotNull( - savedReview.id, - "ID phải được tự động sinh ra sau khi persist" - ); - } -} diff --git a/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java b/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java index 2cdff97..5d9ab8d 100644 --- a/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java +++ b/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java @@ -12,7 +12,7 @@ import com.drinkool.Role; import com.drinkool.dtos.AddMenuItem; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; -import com.drinkool.lib.dtos.event.ManagerCreate; +import com.drinkool.dtos.event.ManagerCreate; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import io.smallrye.reactive.messaging.memory.InMemoryConnector; diff --git a/eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java b/eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java index ae893f9..719e269 100644 --- a/eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java +++ b/eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java @@ -7,10 +7,10 @@ import static org.junit.jupiter.api.Assertions.*; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; +import com.drinkool.dtos.SendReview; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; import com.drinkool.entities.ReviewEntity; -import com.drinkool.lib.dtos.SendReview; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import jakarta.transaction.Transactional; @@ -26,7 +26,7 @@ public class ReviewServiceTest { private UUID savedEateryId; private String savedEateryName; - private UUID savedOwnerId = UUID.randomUUID(); + private UUID savedOwnerId; @BeforeEach @Transactional @@ -36,15 +36,17 @@ public class ReviewServiceTest { EateryEntity.deleteAll(); savedEateryName = faker.restaurant().name(); + savedOwnerId = UUID.randomUUID(); EateryEntity eatery = new EateryEntity(); eatery = eatery.create(savedOwnerId, savedEateryName); + savedEateryId = eatery.id; for (int i = 0; i < 3; i++) { ReviewEntity entity = new ReviewEntity( UUID.randomUUID(), - savedEateryId, + eatery.id, faker.random().nextInt(1, 5), faker.famousLastWords().lastWords() ); @@ -56,11 +58,15 @@ public class ReviewServiceTest { @Test void receiveReview_Success() { UUID reviewerId = UUID.randomUUID(); - UUID eateryId = UUID.randomUUID(); String comment = faker.famousLastWords().lastWords(); int rating = faker.random().nextInt(1, 5); - SendReview input = new SendReview(reviewerId, eateryId, rating, comment); + SendReview input = new SendReview( + reviewerId, + savedEateryId, + rating, + comment + ); given() .header(InternalValue.role, Role.Customer) diff --git a/eatery-service/src/test/java/com/drinkool/services/ShiftServiceTest.java b/eatery-service/src/test/java/com/drinkool/services/ShiftServiceTest.java index 2bc87a6..a39c2be 100644 --- a/eatery-service/src/test/java/com/drinkool/services/ShiftServiceTest.java +++ b/eatery-service/src/test/java/com/drinkool/services/ShiftServiceTest.java @@ -10,8 +10,8 @@ import com.drinkool.entities.ShiftEntity; import com.drinkool.entities.ShiftRegistrationEntity; import io.quarkus.test.junit.QuarkusTest; import jakarta.transaction.Transactional; +import java.time.LocalDate; import java.time.LocalTime; -import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -208,7 +208,7 @@ public class ShiftServiceTest { ) { ShiftEntity shift = new ShiftEntity(); shift.eatery = eatery; - shift.date = new Date(); + shift.date = LocalDate.now(); shift.startTime = LocalTime.parse(start); shift.endTime = LocalTime.parse(end); shift.wage = 10000; diff --git a/file-service/pom.xml b/file-service/pom.xml index 2d0f8a0..0519186 100644 --- a/file-service/pom.xml +++ b/file-service/pom.xml @@ -84,6 +84,22 @@ org.codehaus.mojo exec-maven-plugin + + docker-push-python-with-version + package + + exec + + + docker + + push + ${python.image.full.name}:${parent.version} + + + + docker-push-python package diff --git a/gateway-service/src/main/java/com/drinkool/controller/CartController.java b/gateway-service/src/main/java/com/drinkool/controller/CartController.java index a8dd3f2..a8d46e3 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/CartController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/CartController.java @@ -1,6 +1,6 @@ package com.drinkool.controller; -import com.drinkool.lib.dtos.GraphqlDto; +import com.drinkool.dtos.GraphqlDto; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Context; diff --git a/gateway-service/src/main/java/com/drinkool/controller/CustomerController.java b/gateway-service/src/main/java/com/drinkool/controller/CustomerController.java index 1cb2e87..f5993e8 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/CustomerController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/CustomerController.java @@ -1,7 +1,7 @@ package com.drinkool.controller; import com.drinkool.*; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import com.drinkool.services.CustomerService; import io.smallrye.mutiny.Uni; import jakarta.inject.Inject; @@ -39,4 +39,10 @@ public class CustomerController { public Uni me(@HeaderParam(InternalValue.userId) UUID id) { return accountService.me(id); } + + @GET + @Path("/{id}") + public Uni findCustomer(@PathParam("id") UUID id) { + return accountService.findCustomer(id); + } } diff --git a/gateway-service/src/main/java/com/drinkool/controller/EateryController.java b/gateway-service/src/main/java/com/drinkool/controller/EateryController.java index 53e718b..ceb2b6e 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/EateryController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/EateryController.java @@ -3,8 +3,8 @@ package com.drinkool.controller; import com.drinkool.InternalValue; import com.drinkool.Url; import com.drinkool.enums.SortBy; -import com.drinkool.lib.dtos.GraphqlDto; -import com.drinkool.lib.dtos.SendReview; +import com.drinkool.dtos.GraphqlDto; +import com.drinkool.dtos.SendReview; import com.drinkool.services.ReviewService; import io.smallrye.mutiny.Uni; import jakarta.inject.Inject; diff --git a/gateway-service/src/main/java/com/drinkool/controller/GraphqlBase.java b/gateway-service/src/main/java/com/drinkool/controller/GraphqlBase.java index bc34a95..752a44e 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/GraphqlBase.java +++ b/gateway-service/src/main/java/com/drinkool/controller/GraphqlBase.java @@ -1,7 +1,7 @@ package com.drinkool.controller; import com.drinkool.InternalValue; -import com.drinkool.lib.dtos.GraphqlDto; +import com.drinkool.dtos.GraphqlDto; import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClient; import io.smallrye.graphql.client.dynamic.api.DynamicGraphQLClientBuilder; import jakarta.inject.Inject; diff --git a/gateway-service/src/main/java/com/drinkool/controller/IndexController.java b/gateway-service/src/main/java/com/drinkool/controller/IndexController.java index 7e3d1b9..a212dfd 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/IndexController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/IndexController.java @@ -1,7 +1,7 @@ package com.drinkool.controller; import com.drinkool.Url; -import com.drinkool.lib.dtos.SmsOtp; +import com.drinkool.dtos.SmsOtp; import com.drinkool.services.BaseService; import io.smallrye.mutiny.Uni; import jakarta.inject.Inject; diff --git a/gateway-service/src/main/java/com/drinkool/controller/MainController.java b/gateway-service/src/main/java/com/drinkool/controller/MainController.java index eb31be8..d1f3b13 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/MainController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/MainController.java @@ -1,7 +1,7 @@ package com.drinkool.controller; import com.drinkool.Url; -import com.drinkool.lib.dtos.Login; +import com.drinkool.dtos.Login; import com.drinkool.services.CustomerService; import com.drinkool.services.ManagerService; import com.drinkool.services.StaffService; diff --git a/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java b/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java index c95b504..8b126f2 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/ManagerController.java @@ -1,7 +1,7 @@ package com.drinkool.controller; import com.drinkool.*; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import com.drinkool.services.ManagerService; import io.smallrye.mutiny.Uni; import jakarta.inject.Inject; diff --git a/gateway-service/src/main/java/com/drinkool/controller/StaffController.java b/gateway-service/src/main/java/com/drinkool/controller/StaffController.java index 47fe405..e5234f3 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/StaffController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/StaffController.java @@ -3,13 +3,15 @@ package com.drinkool.controller; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.lib.dtos.Signup; +import com.drinkool.dtos.Signup; import com.drinkool.services.StaffService; import io.smallrye.mutiny.Uni; import jakarta.inject.Inject; +import jakarta.ws.rs.GET; import jakarta.ws.rs.HeaderParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import jakarta.ws.rs.core.Response; import java.util.UUID; import org.eclipse.microprofile.rest.client.inject.RestClient; @@ -30,4 +32,10 @@ public class StaffController { ) { return staffService.signup(input, userId, role); } + + @GET + @Path("/{id}") + public Uni findStaff(@PathParam("id") UUID staffId) { + return staffService.findStaff(staffId); + } } diff --git a/gateway-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java b/gateway-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java index d43b7dd..5087a29 100644 --- a/gateway-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java +++ b/gateway-service/src/main/java/com/drinkool/filters/HeaderRolesFilter.java @@ -1,7 +1,7 @@ package com.drinkool.filters; import com.drinkool.InternalValue; -import com.drinkool.lib.utils.BaseHeaderAuthentication; +import com.drinkool.BaseHeaderAuthentication; import io.quarkus.security.identity.IdentityProviderManager; import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.runtime.QuarkusSecurityIdentity; diff --git a/gateway-service/src/main/java/com/drinkool/services/BaseService.java b/gateway-service/src/main/java/com/drinkool/services/BaseService.java index a78e90f..48a87a5 100644 --- a/gateway-service/src/main/java/com/drinkool/services/BaseService.java +++ b/gateway-service/src/main/java/com/drinkool/services/BaseService.java @@ -1,7 +1,7 @@ package com.drinkool.services; import com.drinkool.Url; -import com.drinkool.lib.dtos.SmsOtp; +import com.drinkool.dtos.SmsOtp; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; diff --git a/gateway-service/src/main/java/com/drinkool/services/CustomerService.java b/gateway-service/src/main/java/com/drinkool/services/CustomerService.java index d1a3c4a..1a27658 100644 --- a/gateway-service/src/main/java/com/drinkool/services/CustomerService.java +++ b/gateway-service/src/main/java/com/drinkool/services/CustomerService.java @@ -3,7 +3,7 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; @@ -32,4 +32,8 @@ public interface CustomerService { @GET @Path(Url.Me) Uni me(@HeaderParam(InternalValue.userId) UUID id); + + @GET + @Path("/{id}") + public Uni findCustomer(@PathParam("id") UUID id); } diff --git a/gateway-service/src/main/java/com/drinkool/services/ManagerService.java b/gateway-service/src/main/java/com/drinkool/services/ManagerService.java index 1ec3216..bae3afd 100644 --- a/gateway-service/src/main/java/com/drinkool/services/ManagerService.java +++ b/gateway-service/src/main/java/com/drinkool/services/ManagerService.java @@ -3,7 +3,7 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; diff --git a/gateway-service/src/main/java/com/drinkool/services/ReviewService.java b/gateway-service/src/main/java/com/drinkool/services/ReviewService.java index 8cee0e2..7ab4c8a 100644 --- a/gateway-service/src/main/java/com/drinkool/services/ReviewService.java +++ b/gateway-service/src/main/java/com/drinkool/services/ReviewService.java @@ -3,7 +3,7 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Url; import com.drinkool.enums.SortBy; -import com.drinkool.lib.dtos.SendReview; +import com.drinkool.dtos.SendReview; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; diff --git a/gateway-service/src/main/java/com/drinkool/services/StaffService.java b/gateway-service/src/main/java/com/drinkool/services/StaffService.java index 6b6b2eb..cfafdb8 100644 --- a/gateway-service/src/main/java/com/drinkool/services/StaffService.java +++ b/gateway-service/src/main/java/com/drinkool/services/StaffService.java @@ -3,7 +3,7 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.lib.dtos.*; +import com.drinkool.dtos.*; import io.smallrye.mutiny.Uni; import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; @@ -28,4 +28,8 @@ public interface StaffService { @GET @Path(Url.Me) Uni me(@HeaderParam(InternalValue.userId) UUID id); + + @GET + @Path("/{id}") + public Uni findStaff(@PathParam("id") UUID staffId); } diff --git a/lib/src/main/java/com/drinkool/lib/utils/BaseHeaderAuthentication.java b/lib/src/main/java/com/drinkool/BaseHeaderAuthentication.java similarity index 94% rename from lib/src/main/java/com/drinkool/lib/utils/BaseHeaderAuthentication.java rename to lib/src/main/java/com/drinkool/BaseHeaderAuthentication.java index b0fbc70..a8ad99c 100644 --- a/lib/src/main/java/com/drinkool/lib/utils/BaseHeaderAuthentication.java +++ b/lib/src/main/java/com/drinkool/BaseHeaderAuthentication.java @@ -1,6 +1,5 @@ -package com.drinkool.lib.utils; +package com.drinkool; -import com.drinkool.InternalValue; import io.quarkus.security.identity.IdentityProviderManager; import io.quarkus.security.identity.SecurityIdentity; import io.quarkus.security.runtime.QuarkusSecurityIdentity; diff --git a/lib/src/main/java/com/drinkool/Role.java b/lib/src/main/java/com/drinkool/Role.java index 4cdeac9..3bd37f2 100644 --- a/lib/src/main/java/com/drinkool/Role.java +++ b/lib/src/main/java/com/drinkool/Role.java @@ -4,5 +4,5 @@ public class Role { public static final String Customer = "customer"; public static final String Manager = "manager"; - public static final String Staff = "Staff"; + public static final String Staff = "staff"; } diff --git a/lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java b/lib/src/main/java/com/drinkool/dtos/AddInventory.java similarity index 70% rename from lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java rename to lib/src/main/java/com/drinkool/dtos/AddInventory.java index 374742a..7c2a1f8 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java +++ b/lib/src/main/java/com/drinkool/dtos/AddInventory.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; public class AddInventory { diff --git a/lib/src/main/java/com/drinkool/lib/dtos/CartItemRequest.java b/lib/src/main/java/com/drinkool/dtos/CartItemRequest.java similarity index 77% rename from lib/src/main/java/com/drinkool/lib/dtos/CartItemRequest.java rename to lib/src/main/java/com/drinkool/dtos/CartItemRequest.java index 155a092..6798953 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/CartItemRequest.java +++ b/lib/src/main/java/com/drinkool/dtos/CartItemRequest.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; import java.util.UUID; diff --git a/lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java b/lib/src/main/java/com/drinkool/dtos/GraphqlDto.java similarity index 76% rename from lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java rename to lib/src/main/java/com/drinkool/dtos/GraphqlDto.java index 309d3f2..a358ed0 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java +++ b/lib/src/main/java/com/drinkool/dtos/GraphqlDto.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; public class GraphqlDto { diff --git a/lib/src/main/java/com/drinkool/lib/dtos/Login.java b/lib/src/main/java/com/drinkool/dtos/Login.java similarity index 85% rename from lib/src/main/java/com/drinkool/lib/dtos/Login.java rename to lib/src/main/java/com/drinkool/dtos/Login.java index 9719e11..e8a285c 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/Login.java +++ b/lib/src/main/java/com/drinkool/dtos/Login.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java b/lib/src/main/java/com/drinkool/dtos/ManagerSignup.java similarity index 77% rename from lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java rename to lib/src/main/java/com/drinkool/dtos/ManagerSignup.java index 57cbcb1..56e4ce2 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java +++ b/lib/src/main/java/com/drinkool/dtos/ManagerSignup.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; public class ManagerSignup extends Signup { diff --git a/lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java b/lib/src/main/java/com/drinkool/dtos/QuickLogin.java similarity index 69% rename from lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java rename to lib/src/main/java/com/drinkool/dtos/QuickLogin.java index adbb06b..6e4c3f8 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java +++ b/lib/src/main/java/com/drinkool/dtos/QuickLogin.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; public class QuickLogin { diff --git a/lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java b/lib/src/main/java/com/drinkool/dtos/QuickSignup.java similarity index 63% rename from lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java rename to lib/src/main/java/com/drinkool/dtos/QuickSignup.java index 3844736..aedb13d 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java +++ b/lib/src/main/java/com/drinkool/dtos/QuickSignup.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; public class QuickSignup { diff --git a/lib/src/main/java/com/drinkool/lib/dtos/SendReview.java b/lib/src/main/java/com/drinkool/dtos/SendReview.java similarity index 94% rename from lib/src/main/java/com/drinkool/lib/dtos/SendReview.java rename to lib/src/main/java/com/drinkool/dtos/SendReview.java index 950aa58..c8cc1f8 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/SendReview.java +++ b/lib/src/main/java/com/drinkool/dtos/SendReview.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; import com.drinkool.interfaces.ReviewInterface; import io.quarkus.runtime.annotations.RegisterForReflection; diff --git a/lib/src/main/java/com/drinkool/lib/dtos/Signup.java b/lib/src/main/java/com/drinkool/dtos/Signup.java similarity index 86% rename from lib/src/main/java/com/drinkool/lib/dtos/Signup.java rename to lib/src/main/java/com/drinkool/dtos/Signup.java index 3d2af07..ce21400 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/Signup.java +++ b/lib/src/main/java/com/drinkool/dtos/Signup.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java b/lib/src/main/java/com/drinkool/dtos/SmsOtp.java similarity index 60% rename from lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java rename to lib/src/main/java/com/drinkool/dtos/SmsOtp.java index 482733e..a7ff340 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java +++ b/lib/src/main/java/com/drinkool/dtos/SmsOtp.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos; +package com.drinkool.dtos; public class SmsOtp { diff --git a/lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java b/lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java similarity index 88% rename from lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java rename to lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java index ef06c68..e337a6f 100644 --- a/lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java +++ b/lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.dtos.event; +package com.drinkool.dtos.event; import io.quarkus.runtime.annotations.RegisterForReflection; import java.util.UUID; diff --git a/lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java b/lib/src/main/java/com/drinkool/entities/BaseEntity.java similarity index 94% rename from lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java rename to lib/src/main/java/com/drinkool/entities/BaseEntity.java index a28ca88..fc2cb75 100644 --- a/lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java +++ b/lib/src/main/java/com/drinkool/entities/BaseEntity.java @@ -1,4 +1,4 @@ -package com.drinkool.lib.entities; +package com.drinkool.entities; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; import jakarta.persistence.GeneratedValue;