remove client notification by rest

Author: carlosthe19916

pom.xml

@@ -41,7 +41,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-rest-client</artifactId>
+            <artifactId>quarkus-hibernate-orm-panache</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -52,6 +52,11 @@
             <artifactId>quarkus-artemis-jms</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-jdbc-postgresql</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>io.github.carlosthe19916</groupId>
             <artifactId>sunat-web-services</artifactId>

src/main/java/org/openubl/factories/ModelFactory.java

@@ -1,7 +1,7 @@
 package org.openubl.factories;
 
 import io.github.carlosthe19916.webservices.providers.BillServiceModel;
-import org.openubl.models.SendFileModel;
+import org.openubl.models.SendFileMessageModel;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
@@ -15,8 +15,8 @@ private ModelFactory() {
         // Just static methods
     }
 
-    public static SendFileModel getSendFilePropertiesModel(Message message) throws JMSException {
-        SendFileModel.Builder builder = SendFileModel.Builder.aSunatJMSMessageModel();
+    public static SendFileMessageModel getSendFilePropertiesModel(Message message) throws JMSException {
+        SendFileMessageModel.Builder builder = SendFileMessageModel.Builder.aSunatJMSMessageModel();
 
         Enumeration<?> enumeration = message.getPropertyNames();
         if (enumeration != null) {
@@ -45,7 +45,7 @@ public static SendFileModel getSendFilePropertiesModel(Message message) throws J
         return builder.build();
     }
 
-    public static Map<String, String> getAsMap(SendFileModel model) {
+    public static Map<String, String> getAsMap(SendFileMessageModel model) {
         Map<String, String> map = new HashMap<>();
 
         map.put("fileName", model.getFileName());

src/main/java/org/openubl/jms/SendCallbackJMSProducer.java

@@ -4,12 +4,10 @@
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.openubl.factories.ModelFactory;
-import org.openubl.models.SendFileModel;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
 import javax.jms.*;
-import java.lang.IllegalStateException;
 import java.util.Map;
 
 @ApplicationScoped

src/main/java/org/openubl/jms/SendFileJMSConsumer.java

@@ -4,16 +4,14 @@
 import io.quarkus.runtime.StartupEvent;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
-import org.openubl.exceptions.InvalidXMLFileException;
 import org.openubl.factories.ModelFactory;
-import org.openubl.models.SendFileModel;
+import org.openubl.models.SendFileMessageModel;
 import org.openubl.providers.SendFileWSProvider;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.enterprise.event.Observes;
 import javax.inject.Inject;
 import javax.jms.*;
-import java.io.IOException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
@@ -56,7 +54,7 @@ public void run() {
                     LOG.warn("Consumer can not consume messages other than Bytes Messages");
                 }
 
-                SendFileModel model = ModelFactory.getSendFilePropertiesModel(message);
+                SendFileMessageModel model = ModelFactory.getSendFilePropertiesModel(message);
                 boolean result = sunatWSProvider.sendFile(model, message.getBody(byte[].class));
 
                 if (result) {

src/main/java/org/openubl/jms/SendFileJMSProducer.java

@@ -1,10 +1,9 @@
 package org.openubl.jms;
 
-import io.github.carlosthe19916.webservices.providers.BillServiceModel;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.jboss.logging.Logger;
 import org.openubl.factories.ModelFactory;
-import org.openubl.models.SendFileModel;
+import org.openubl.models.SendFileMessageModel;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -23,7 +22,7 @@ public class SendFileJMSProducer {
     @Inject
     ConnectionFactory connectionFactory;
 
-    public void produceSendFileMessage(SendFileModel sendFileModel, byte[] file) {
+    public void produceSendFileMessage(SendFileMessageModel sendFileMessageModel, byte[] file) throws JMSException {
         if (file == null || file.length == 0) {
             throw new IllegalStateException("Invalid file");
         }
@@ -36,13 +35,13 @@ public void produceSendFileMessage(SendFileModel sendFileModel, byte[] file) {
             BytesMessage message = context.createBytesMessage();
             message.writeBytes(file);
 
-            for (Map.Entry<String, String> entry : ModelFactory.getAsMap(sendFileModel).entrySet()) {
+            for (Map.Entry<String, String> entry : ModelFactory.getAsMap(sendFileMessageModel).entrySet()) {
                 message.setStringProperty(entry.getKey(), entry.getValue());
             }
 
             jmsProducer.send(queue, message);
-        } catch (JMSException e) {
-            LOG.error("Error trying to send bytes message", e);
+        } finally {
+            LOG.info("File has been sent to the Broker");
         }
     }
 

src/main/java/org/openubl/models/FileDeliveryStatusType.java

@@ -0,0 +1,7 @@
+package org.openubl.models;
+
+public enum FileDeliveryStatusType {
+    SCHEDULED_TO_DELIVER,
+    RESCHEDULED_TO_DELIVER,
+    DELIVERED
+}

src/main/java/org/openubl/models/MultipartBody.java

@@ -1,11 +1,12 @@
 package org.openubl.models;
 
-public class SendFileModel {
+public class SendFileMessageModel {
     private String serverUrl;
     private String fileName;
     private String documentType;
     private String username;
     private String password;
+    private String customId;
 
     public String getServerUrl() {
         return serverUrl;
@@ -47,17 +48,26 @@ public void setPassword(String password) {
         this.password = password;
     }
 
+    public String getCustomId() {
+        return customId;
+    }
+
+    public void setCustomId(String customId) {
+        this.customId = customId;
+    }
+
     public static final class Builder {
         private String serverUrl;
         private String fileName;
         private String documentType;
         private String username;
         private String password;
+        private String customId;
 
         private Builder() {
         }
 
-        public static Builder aSunatJMSMessageModel() {
+        public static Builder aSendFileMessageModel() {
             return new Builder();
         }
 
@@ -86,14 +96,20 @@ public Builder withPassword(String password) {
             return this;
         }
 
-        public SendFileModel build() {
-            SendFileModel sendMessageModel = new SendFileModel();
-            sendMessageModel.setServerUrl(serverUrl);
-            sendMessageModel.setFileName(fileName);
-            sendMessageModel.setDocumentType(documentType);
-            sendMessageModel.setUsername(username);
-            sendMessageModel.setPassword(password);
-            return sendMessageModel;
+        public Builder withCustomId(String customId) {
+            this.customId = customId;
+            return this;
+        }
+
+        public SendFileMessageModel build() {
+            SendFileMessageModel sendFileMessageModel = new SendFileMessageModel();
+            sendFileMessageModel.setServerUrl(serverUrl);
+            sendFileMessageModel.setFileName(fileName);
+            sendFileMessageModel.setDocumentType(documentType);
+            sendFileMessageModel.setUsername(username);
+            sendFileMessageModel.setPassword(password);
+            sendFileMessageModel.setCustomId(customId);
+            return sendFileMessageModel;
         }
     }
 }

src/main/java/org/openubl/models/SendFileModel.java renamed to src/main/java/org/openubl/models/SendFileMessageModel.java

@@ -0,0 +1,10 @@
+package org.openubl.models.jpa;
+
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+import org.openubl.models.jpa.entities.FileDeliveryEntity;
+
+import javax.enterprise.context.ApplicationScoped;
+
+@ApplicationScoped
+public class FileDeliveryRepository implements PanacheRepository<FileDeliveryEntity> {
+}

src/main/java/org/openubl/models/jpa/FileDeliveryRepository.java

@@ -0,0 +1,39 @@
+package org.openubl.models.jpa.entities;
+
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import org.openubl.models.FileDeliveryStatusType;
+
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+@Entity
+@Cacheable
+public class FileDeliveryEntity extends PanacheEntity {
+
+    @NotNull
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status")
+    public FileDeliveryStatusType status;
+
+    public static final class Builder {
+        public FileDeliveryStatusType status;
+
+        private Builder() {
+        }
+
+        public static Builder aFileDeliveryEntity() {
+            return new Builder();
+        }
+
+        public Builder withStatus(FileDeliveryStatusType status) {
+            this.status = status;
+            return this;
+        }
+
+        public FileDeliveryEntity build() {
+            FileDeliveryEntity fileDeliveryEntity = new FileDeliveryEntity();
+            fileDeliveryEntity.status = this.status;
+            return fileDeliveryEntity;
+        }
+    }
+}