refactor code and remove client notification on basic method (#5)

Author: carlosthe19916

.dockerignore

@@ -1,4 +1,4 @@
 *
-!distribution/target/*-runner
-!distribution/target/*-runner.jar
-!distribution/target/lib/*
+!api/target/*-runner
+!api/target/*-runner.jar
+!api/target/lib/*

api/pom.xml

@@ -66,15 +66,15 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
+            <artifactId>quarkus-artemis-jms</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-artemis-jms</artifactId>
+            <artifactId>quarkus-quartz</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-quartz</artifactId>
+            <artifactId>quarkus-smallrye-health</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

api/src/main/java/io/github/project/openubl/xmlsender/events/BasicEventManager.java

@@ -16,23 +16,14 @@
  */
 package io.github.project.openubl.xmlsender.events;
 
-import io.github.project.openubl.xmlsender.events.jms.SendTicketQueueConsumer;
-import io.github.project.openubl.xmlsender.idm.DocumentRepresentation;
 import io.github.project.openubl.xmlsender.models.DocumentEvent;
-import io.github.project.openubl.xmlsender.models.jpa.DocumentRepository;
-import io.github.project.openubl.xmlsender.models.jpa.entities.DocumentEntity;
-import io.github.project.openubl.xmlsender.models.utils.EntityToRepresentation;
-import io.github.project.openubl.xmlsender.resources.client.CallbackClientService;
 import io.github.project.openubl.xmlsender.ws.WSSunatClient;
-import org.eclipse.microprofile.rest.client.inject.RestClient;
 import org.jboss.logging.Logger;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.enterprise.event.TransactionPhase;
 import javax.inject.Inject;
-import javax.transaction.Transactional;
-import javax.ws.rs.WebApplicationException;
 
 @ApplicationScoped
 public class BasicEventManager {
@@ -42,13 +33,6 @@ public class BasicEventManager {
     @Inject
     WSSunatClient wsSunatClient;
 
-    @Inject
-    @RestClient
-    CallbackClientService callbackClientService;
-
-    @Inject
-    DocumentRepository documentRepository;
-
     public void onDocumentCreate(
             @Observes(during = TransactionPhase.AFTER_SUCCESS)
             @EventProvider(EventProvider.Type.basic) DocumentEvent.Created event
@@ -63,18 +47,11 @@ public void onDocumentRequireCheckTicket(
         wsSunatClient.checkDocumentTicket(event.getId());
     }
 
-    @Transactional
     public void onDocumentDelivered(
             @Observes(during = TransactionPhase.AFTER_SUCCESS)
             @EventProvider(EventProvider.Type.basic) DocumentEvent.Delivered event
     ) {
-        DocumentEntity documentEntity = documentRepository.findById(event.getId());
-        DocumentRepresentation rep = EntityToRepresentation.toRepresentation(documentEntity);
-        try {
-            callbackClientService.callback(rep);
-        } catch (WebApplicationException e) {
-            LOG.error("Could not send webhook callback, message=" + e.getMessage());
-        }
+        LOG.warn("Could not notify client since BASIC even manager does not support it.");
     }
 
 }

api/src/main/java/io/github/project/openubl/xmlsender/resources/client/CallbackClientService.java

@@ -36,8 +36,6 @@ openubl.event-manager=basic
 
 ##Valid for basic event management
 openubl.event-manager.basic.retry-delay=43200000
-xml-sender-callback-api/mp-rest/url=
-xml-sender-callback-api/mp-rest/scope=javax.inject.Singleton
 
 ##Valid for JMS event management
 openubl.event-manager.jms.delay=500

api/src/main/resources/application.properties

@@ -18,6 +18,7 @@
 
 import io.github.project.openubl.xmlsender.idm.DocumentRepresentation;
 import io.github.project.openubl.xmlsender.models.DeliveryStatusType;
+import io.github.project.openubl.xmlsender.resources.ApiApplication;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.http.Header;
 import io.restassured.response.Response;
@@ -79,7 +80,8 @@ void withInvalidFileShouldReturnError() {
 
     @Test
     void invoice_withSystemCredentials_shouldReturnOK() {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/invoice.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/invoice.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -106,7 +108,8 @@ void invoice_withSystemCredentials_shouldReturnOK() {
 
     @Test
     void invoice_withCustomCredentials_shouldReturnOK() {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/invoice.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/invoice.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -135,7 +138,8 @@ void invoice_withCustomCredentials_shouldReturnOK() {
 
     @Test
     void invoice_downloadFile() throws IOException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/invoice.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/invoice.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -163,7 +167,8 @@ void invoice_downloadFile() throws IOException {
 
     @Test
     void validInvoice_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/invoice_signed.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/invoice_signed.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -218,7 +223,8 @@ void validInvoice_customCredentials_shouldBeSentToSunat() throws InterruptedExce
 
     @Test
     void invalidInvoice_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/invoice.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/invoice.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -267,7 +273,8 @@ void invalidInvoice_customCredentials_shouldBeSentToSunat() throws InterruptedEx
 
     @Test
     void validCreditNote_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/credit-note_signed.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/credit-note_signed.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -322,7 +329,8 @@ void validCreditNote_customCredentials_shouldBeSentToSunat() throws InterruptedE
 
     @Test
     void invalidCreditNote_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/credit-note.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/credit-note.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -371,7 +379,8 @@ void invalidCreditNote_customCredentials_shouldBeSentToSunat() throws Interrupte
 
     @Test
     void validDebitNote_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/debit-note_signed.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/debit-note_signed.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -426,7 +435,8 @@ void validDebitNote_customCredentials_shouldBeSentToSunat() throws InterruptedEx
 
     @Test
     void invalidDebitNote_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/debit-note.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/debit-note.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -475,7 +485,8 @@ void invalidDebitNote_customCredentials_shouldBeSentToSunat() throws Interrupted
 
     @Test
     void validVoidedDocument_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/voided-document_signed.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/voided-document_signed.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -530,7 +541,8 @@ void validVoidedDocument_customCredentials_shouldBeSentToSunat() throws Interrup
 
     @Test
     void invalidVoidedDocument_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/voided-document.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/voided-document.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -579,7 +591,8 @@ void invalidVoidedDocument_customCredentials_shouldBeSentToSunat() throws Interr
 
     @Test
     void validSummaryDocument_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/summary-document_signed.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/summary-document_signed.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());
 
@@ -634,7 +647,8 @@ void validSummaryDocument_customCredentials_shouldBeSentToSunat() throws Interru
 
     @Test
     void invalidSummaryDocument_customCredentials_shouldBeSentToSunat() throws InterruptedException {
-        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls/summary-document.xml");
+        URL resource = Thread.currentThread().getContextClassLoader().getResource("xmls2/summary-document.xml");
+
         assertNotNull(resource);
         File file = new File(resource.getPath());