From 7e640e2c951ced167453f4b61d812ca1b9053a39 Mon Sep 17 00:00:00 2001 From: TakahashiNg <83152264+TakahashiNguyen@users.noreply.github.com> Date: Wed, 6 May 2026 09:43:30 +0000 Subject: [PATCH] chore: update --- .../com/drinkool/services/AccountService.java | 2 +- .../drinkool/services/CustomerService.java | 3 ++- .../com/drinkool/services/ManagerService.java | 5 +++-- .../drinkool/services/AccountServiceTest.java | 3 ++- .../drinkool/services/BaseServiceTest.java | 3 ++- .../services/CustomerServiceTest.java | 3 ++- .../drinkool/services/ManagerServiceTest.java | 3 ++- eatery-service/pom.xml | 22 +++++++++++-------- .../com/drinkool/dtos/UpdateMenuItem.java | 7 +++++- .../com/drinkool/services/EateryService.java | 2 +- .../com/drinkool/services/ReviewService.java | 3 ++- .../drinkool/services/EateryServiceTest.java | 6 +++-- .../drinkool/services/ReviewServiceTest.java | 2 +- .../controller/CustomerController.java | 2 +- .../drinkool/controller/EateryController.java | 3 ++- .../drinkool/controller/IndexController.java | 2 +- .../drinkool/controller/MainController.java | 2 +- .../controller/ManagerController.java | 2 +- .../com/drinkool/services/BaseService.java | 3 ++- .../drinkool/services/CustomerService.java | 3 ++- .../com/drinkool/services/ManagerService.java | 3 ++- lib/pom.xml | 4 ++++ .../drinkool/{ => lib}/dtos/AddInventory.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 +- .../com/drinkool/lib/entities/BaseEntity.java | 6 +++-- 33 files changed, 71 insertions(+), 43 deletions(-) rename lib/src/main/java/com/drinkool/{ => lib}/dtos/AddInventory.java (70%) rename lib/src/main/java/com/drinkool/{ => lib}/dtos/GraphqlDto.java (76%) rename lib/src/main/java/com/drinkool/{ => lib}/dtos/Login.java (69%) rename lib/src/main/java/com/drinkool/{ => lib}/dtos/ManagerSignup.java (70%) 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 (84%) rename lib/src/main/java/com/drinkool/{ => lib}/dtos/Signup.java (75%) 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%) 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 01a8c8a..caf12fd 100644 --- a/account-service/src/main/java/com/drinkool/services/AccountService.java +++ b/account-service/src/main/java/com/drinkool/services/AccountService.java @@ -2,8 +2,8 @@ package com.drinkool.services; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.dtos.SmsOtp; import com.drinkool.entities.ManagerEntity; +import com.drinkool.lib.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 ea00033..816925f 100644 --- a/account-service/src/main/java/com/drinkool/services/CustomerService.java +++ b/account-service/src/main/java/com/drinkool/services/CustomerService.java @@ -1,8 +1,9 @@ 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.*; 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 ce2d9b6..f78552e 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,10 @@ 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.*; 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 c8880af..0688cd2 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,8 @@ package com.drinkool.services; import static io.restassured.RestAssured.*; import com.drinkool.*; -import com.drinkool.dtos.*; +import com.drinkool.lib.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 2838545..c925bd4 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,8 @@ import static io.restassured.RestAssured.*; import static org.hamcrest.CoreMatchers.*; import com.drinkool.*; -import com.drinkool.dtos.*; +import com.drinkool.lib.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 359bff5..5a429f6 100644 --- a/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/CustomerServiceTest.java @@ -4,8 +4,9 @@ import static io.restassured.RestAssured.*; import static org.junit.jupiter.api.Assertions.*; import com.drinkool.*; -import com.drinkool.dtos.*; import com.drinkool.entities.CustomerEntity; +import com.drinkool.lib.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 c2343a0..4d72a95 100644 --- a/account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java +++ b/account-service/src/test/java/com/drinkool/services/ManagerServiceTest.java @@ -4,7 +4,8 @@ import static io.restassured.RestAssured.*; import static org.junit.jupiter.api.Assertions.*; import com.drinkool.*; -import com.drinkool.dtos.*; +import com.drinkool.lib.dtos.*; + import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.kafka.*; diff --git a/eatery-service/pom.xml b/eatery-service/pom.xml index 94f324f..334b2e6 100644 --- a/eatery-service/pom.xml +++ b/eatery-service/pom.xml @@ -1,8 +1,8 @@ - + 4.0.0 @@ -20,9 +20,11 @@ 3.15.0 25 UTF-8 - UTF-8 + UTF-8 quarkus-bom - io.quarkus.platform + io.quarkus.platform 3.32.4 true 3.5.4 @@ -171,7 +173,8 @@ @{argLine} - org.jboss.logmanager.LogManager + org.jboss.logmanager.LogManager ${maven.home} 1 @@ -195,7 +198,8 @@ ${project.build.directory}/${project.build.finalName}-runner - org.jboss.logmanager.LogManager + org.jboss.logmanager.LogManager ${maven.home} @@ -218,4 +222,4 @@ - \ No newline at end of file + diff --git a/eatery-service/src/main/java/com/drinkool/dtos/UpdateMenuItem.java b/eatery-service/src/main/java/com/drinkool/dtos/UpdateMenuItem.java index 4c95eb1..6ec10dc 100644 --- a/eatery-service/src/main/java/com/drinkool/dtos/UpdateMenuItem.java +++ b/eatery-service/src/main/java/com/drinkool/dtos/UpdateMenuItem.java @@ -1,6 +1,7 @@ package com.drinkool.dtos; import com.drinkool.interfaces.EntityInterface; +import com.drinkool.interfaces.MenuItemInterface; import io.quarkus.runtime.annotations.RegisterForReflection; import java.util.UUID; import lombok.AllArgsConstructor; @@ -15,7 +16,11 @@ import org.eclipse.microprofile.graphql.Input; @NoArgsConstructor @AllArgsConstructor @RegisterForReflection -public class UpdateMenuItem extends AddMenuItem implements EntityInterface { +public class UpdateMenuItem implements EntityInterface, MenuItemInterface { UUID id; + + String name; + + double price; } 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 6dcf5ee..baa6c04 100644 --- a/eatery-service/src/main/java/com/drinkool/services/EateryService.java +++ b/eatery-service/src/main/java/com/drinkool/services/EateryService.java @@ -5,9 +5,9 @@ import com.drinkool.Role; import com.drinkool.dtos.AddMenuItem; import com.drinkool.dtos.DtoMapper; import com.drinkool.dtos.UpdateMenuItem; -import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; +import com.drinkool.lib.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 426fc09..0b9a5ca 100644 --- a/eatery-service/src/main/java/com/drinkool/services/ReviewService.java +++ b/eatery-service/src/main/java/com/drinkool/services/ReviewService.java @@ -1,7 +1,8 @@ package com.drinkool.services; -import com.drinkool.dtos.SendReview; import com.drinkool.entities.ReviewEntity; +import com.drinkool.lib.dtos.SendReview; + import jakarta.transaction.Transactional; import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; 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 ddc4e24..e00718e 100644 --- a/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java +++ b/eatery-service/src/test/java/com/drinkool/services/EateryServiceTest.java @@ -10,9 +10,10 @@ import static org.hamcrest.Matchers.hasSize; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.dtos.AddMenuItem; -import com.drinkool.dtos.event.ManagerCreate; import com.drinkool.entities.EateryEntity; import com.drinkool.entities.MenuItemEntity; +import com.drinkool.lib.dtos.event.ManagerCreate; + import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; import io.smallrye.reactive.messaging.memory.InMemoryConnector; @@ -305,7 +306,8 @@ public class EateryServiceTest { .when() .post("/graphql") .then() - .body("data.updateMenuItem.name", is(newValue)) + .body("", is("lmao")) + // .body("data.updateMenuItem.name", is(newValue)) .body("data.updateMenuItem.id", is(lastSavedId)) .statusCode(200); } 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 5ed751e..bdab888 100644 --- a/eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java +++ b/eatery-service/src/test/java/com/drinkool/services/ReviewServiceTest.java @@ -3,8 +3,8 @@ package com.drinkool.services; import static io.restassured.RestAssured.given; import static org.junit.jupiter.api.Assertions.*; -import com.drinkool.dtos.SendReview; import com.drinkool.entities.ReviewEntity; +import com.drinkool.lib.dtos.SendReview; import com.drinkool.lib.models.ReviewModel; import io.quarkus.test.junit.QuarkusTest; import io.restassured.http.ContentType; 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 36efce8..1cb2e87 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.dtos.*; +import com.drinkool.lib.dtos.*; import com.drinkool.services.CustomerService; import io.smallrye.mutiny.Uni; import jakarta.inject.Inject; 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 d54173e..2da0157 100644 --- a/gateway-service/src/main/java/com/drinkool/controller/EateryController.java +++ b/gateway-service/src/main/java/com/drinkool/controller/EateryController.java @@ -1,7 +1,8 @@ package com.drinkool.controller; import com.drinkool.InternalValue; -import com.drinkool.dtos.GraphqlDto; +import com.drinkool.lib.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 a212dfd..7e3d1b9 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.dtos.SmsOtp; +import com.drinkool.lib.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 f739339..7f378df 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.dtos.Login; +import com.drinkool.lib.dtos.Login; import com.drinkool.services.CustomerService; import com.drinkool.services.ManagerService; import io.smallrye.mutiny.Uni; 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 8b126f2..c95b504 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.dtos.*; +import com.drinkool.lib.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/services/BaseService.java b/gateway-service/src/main/java/com/drinkool/services/BaseService.java index 48a87a5..a07bc1d 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,8 @@ package com.drinkool.services; import com.drinkool.Url; -import com.drinkool.dtos.SmsOtp; +import com.drinkool.lib.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 5660e19..f6799a7 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,8 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.dtos.*; +import com.drinkool.lib.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/ManagerService.java b/gateway-service/src/main/java/com/drinkool/services/ManagerService.java index bae3afd..e0edfb3 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,8 @@ package com.drinkool.services; import com.drinkool.InternalValue; import com.drinkool.Role; import com.drinkool.Url; -import com.drinkool.dtos.*; +import com.drinkool.lib.dtos.*; + import io.smallrye.mutiny.Uni; import jakarta.ws.rs.*; import jakarta.ws.rs.core.Response; diff --git a/lib/pom.xml b/lib/pom.xml index f5d8d22..26901c6 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -62,5 +62,9 @@ 5.10.0 test + + io.quarkus + quarkus-smallrye-graphql + diff --git a/lib/src/main/java/com/drinkool/dtos/AddInventory.java b/lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java similarity index 70% rename from lib/src/main/java/com/drinkool/dtos/AddInventory.java rename to lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java index 7c2a1f8..374742a 100644 --- a/lib/src/main/java/com/drinkool/dtos/AddInventory.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/AddInventory.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class AddInventory { diff --git a/lib/src/main/java/com/drinkool/dtos/GraphqlDto.java b/lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java similarity index 76% rename from lib/src/main/java/com/drinkool/dtos/GraphqlDto.java rename to lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java index a358ed0..309d3f2 100644 --- a/lib/src/main/java/com/drinkool/dtos/GraphqlDto.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/GraphqlDto.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class GraphqlDto { diff --git a/lib/src/main/java/com/drinkool/dtos/Login.java b/lib/src/main/java/com/drinkool/lib/dtos/Login.java similarity index 69% rename from lib/src/main/java/com/drinkool/dtos/Login.java rename to lib/src/main/java/com/drinkool/lib/dtos/Login.java index af5ca86..e87f3d8 100644 --- a/lib/src/main/java/com/drinkool/dtos/Login.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/Login.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class Login { diff --git a/lib/src/main/java/com/drinkool/dtos/ManagerSignup.java b/lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java similarity index 70% rename from lib/src/main/java/com/drinkool/dtos/ManagerSignup.java rename to lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java index 8857f0e..89db905 100644 --- a/lib/src/main/java/com/drinkool/dtos/ManagerSignup.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/ManagerSignup.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class ManagerSignup extends Signup { diff --git a/lib/src/main/java/com/drinkool/dtos/QuickLogin.java b/lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java similarity index 69% rename from lib/src/main/java/com/drinkool/dtos/QuickLogin.java rename to lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java index 6e4c3f8..adbb06b 100644 --- a/lib/src/main/java/com/drinkool/dtos/QuickLogin.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/QuickLogin.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class QuickLogin { diff --git a/lib/src/main/java/com/drinkool/dtos/QuickSignup.java b/lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java similarity index 63% rename from lib/src/main/java/com/drinkool/dtos/QuickSignup.java rename to lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java index aedb13d..3844736 100644 --- a/lib/src/main/java/com/drinkool/dtos/QuickSignup.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/QuickSignup.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class QuickSignup { diff --git a/lib/src/main/java/com/drinkool/dtos/SendReview.java b/lib/src/main/java/com/drinkool/lib/dtos/SendReview.java similarity index 84% rename from lib/src/main/java/com/drinkool/dtos/SendReview.java rename to lib/src/main/java/com/drinkool/lib/dtos/SendReview.java index c0fb899..2793753 100644 --- a/lib/src/main/java/com/drinkool/dtos/SendReview.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/SendReview.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; import com.drinkool.lib.models.ReviewModel; import java.util.UUID; diff --git a/lib/src/main/java/com/drinkool/dtos/Signup.java b/lib/src/main/java/com/drinkool/lib/dtos/Signup.java similarity index 75% rename from lib/src/main/java/com/drinkool/dtos/Signup.java rename to lib/src/main/java/com/drinkool/lib/dtos/Signup.java index d63b990..0db754a 100644 --- a/lib/src/main/java/com/drinkool/dtos/Signup.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/Signup.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class Signup { diff --git a/lib/src/main/java/com/drinkool/dtos/SmsOtp.java b/lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java similarity index 60% rename from lib/src/main/java/com/drinkool/dtos/SmsOtp.java rename to lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java index a7ff340..482733e 100644 --- a/lib/src/main/java/com/drinkool/dtos/SmsOtp.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/SmsOtp.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos; +package com.drinkool.lib.dtos; public class SmsOtp { diff --git a/lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java b/lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java similarity index 88% rename from lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java rename to lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java index e337a6f..ef06c68 100644 --- a/lib/src/main/java/com/drinkool/dtos/event/ManagerCreate.java +++ b/lib/src/main/java/com/drinkool/lib/dtos/event/ManagerCreate.java @@ -1,4 +1,4 @@ -package com.drinkool.dtos.event; +package com.drinkool.lib.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/lib/entities/BaseEntity.java index 0ee8e50..0a33368 100644 --- a/lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java +++ b/lib/src/main/java/com/drinkool/lib/entities/BaseEntity.java @@ -1,13 +1,15 @@ package com.drinkool.lib.entities; import io.quarkus.hibernate.orm.panache.PanacheEntityBase; -import jakarta.persistence.*; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.MappedSuperclass; import java.util.UUID; @MappedSuperclass public class BaseEntity extends PanacheEntityBase { - @Id + @jakarta.persistence.Id @GeneratedValue(strategy = GenerationType.UUID) public UUID id; }