chore: update

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.*;

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.*;

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.*;

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;

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;

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;

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.*;

eatery-service/pom.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
 >
     <modelVersion>4.0.0</modelVersion>
 
@@ -20,9 +20,11 @@
         <compiler-plugin.version>3.15.0</compiler-plugin.version>
         <maven.compiler.release>25</maven.compiler.release>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <project.reporting.outputEncoding
+		>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
-        <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
+        <quarkus.platform.group-id
+		>io.quarkus.platform</quarkus.platform.group-id>
         <quarkus.platform.version>3.32.4</quarkus.platform.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>3.5.4</surefire-plugin.version>
@@ -171,7 +173,8 @@
                 <configuration>
                     <argLine>@{argLine}</argLine>
                     <systemPropertyVariables>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <java.util.logging.manager
+						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                     <forkCount>1</forkCount>
@@ -195,7 +198,8 @@
                     <systemPropertyVariables>
                         <native.image.path>
                             ${project.build.directory}/${project.build.finalName}-runner</native.image.path>
-                        <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                        <java.util.logging.manager
+						>org.jboss.logmanager.LogManager</java.util.logging.manager>
                         <maven.home>${maven.home}</maven.home>
                     </systemPropertyVariables>
                 </configuration>
@@ -218,4 +222,4 @@
             </properties>
         </profile>
     </profiles>
-</project>
+</project>

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;
 }

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;

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;

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);
 	}

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;

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;

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;

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;

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;

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;

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;

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;

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;

lib/pom.xml

@@ -62,5 +62,9 @@
       <version>5.10.0</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>io.quarkus</groupId>
+      <artifactId>quarkus-smallrye-graphql</artifactId>
+    </dependency>
   </dependencies>
 </project>

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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 {
 

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;

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 {
 

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 {
 

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;

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;
 }