Update Models

src/main/java/com/bytesw/bytebot/etl/batch/service/ScheduleService.java

@@ -222,10 +222,12 @@ public class ScheduleService implements SchedulingConfigurer {
             futureMap.remove(key);
         }
         if (!keys.isEmpty()) {
-            for (String Key: keys) {
-                ScheduledFuture future = futureMap.get(Key);
-                future.cancel(true);
-                futureMap.remove(key);
+            for (String keyTask: keys) {
+                if (!futureMap.get(keyTask).isCancelled()) {
+                    ScheduledFuture future = futureMap.get(keyTask);
+                    future.cancel(true);
+                    futureMap.remove(keyTask);
+                }
             }
         }
     }

src/main/java/com/bytesw/bytebot/etl/batch/writer/DataSensibleJPAWriter.java

@@ -58,7 +58,7 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
     @Override
     @Transactional
     public void write(List<? extends DynaBean> list) throws Exception {
-        Object numeros = JsonUtils.getFieldFromJson(agent.getChannelValue(), "$.telefonos_desplegados");
+        Object numeros = JsonUtils.getFieldFromJson(agent.getChannelValue(), "$.telefono_despliegue");
         List<String> numerosAgentes = numbersAgent((List<Map>) numeros);
         for (DynaBean dynaBean : list) {
             Long id = Long.parseLong(dynaBean.get("id").toString());
@@ -75,7 +75,7 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
                 if (toAgent == null) {
                    continue;
                 }
-                if (toAgent.isEmpty()) {
+                if (!toAgent.isEmpty()) {
                     agentNumber = toAgent.split(":")[1];
                 }
                 if (numerosAgentes.contains(agentNumber)) {
@@ -142,7 +142,7 @@ public class DataSensibleJPAWriter implements ItemWriter<DynaBean>, StepExecutio
     private List<String> numbersAgent(List<Map> listNumber){
         List<String> result = new ArrayList<>();
         for (Map map : listNumber){
-            String cod = (String) map.get("CodigoInternacional");
+            String cod = (String) map.get("codigoInternacional");
             String number = (String) map.get("numero");
             String agent = "+" + cod + number;
             result.add(agent);

src/main/java/com/bytesw/bytebot/etl/services/UserMessageProcessed.java

@@ -164,7 +164,7 @@ public class UserMessageProcessed extends MessageProcessedSupport implements Mes
             List<DeleteDataSensBean> deleteDataSensBeans = deleteDataSensJDBCRepository
                     .getListAgentChannel(AgentStatusEnum.DEPLOYED.getName(), AgentParameterEnum.ACCESS_TWILIO.getName());
             for (DeleteDataSensBean deleteDataSensBean: deleteDataSensBeans) {
-                Object numeros = JsonUtils.getFieldFromJson(deleteDataSensBean.getChannelValue(), "$.telefonos_desplegados");
+                Object numeros = JsonUtils.getFieldFromJson(deleteDataSensBean.getChannelValue(), "$.telefono_despliegue");
                 List<String> numerosAgentes = numbersAgent((List<Map>) numeros);
                 if (numerosAgentes.contains(number)) {
                     agentId = deleteDataSensBean.getAgenId();
@@ -178,7 +178,7 @@ public class UserMessageProcessed extends MessageProcessedSupport implements Mes
     private List<String> numbersAgent(List<Map> listNumber){
         List<String> result = new ArrayList<>();
         for (Map map : listNumber){
-            String cod = (String) map.get("CodigoInternacional");
+            String cod = (String) map.get("codigoInternacional");
             String number = (String) map.get("numero");
             String agent = "+" + cod + number;
             result.add(agent);

src/main/java/com/bytesw/bytebot/model/Agent.java

@@ -8,11 +8,13 @@ import com.bytesw.bytebot.model.enums.AgentTypeEnum;
 import com.bytesw.bytebot.model.enums.LanguageEnum;
 import lombok.*;
 import org.hibernate.annotations.Type;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
+//@Audited
 @Entity
 @Getter @Setter @EqualsAndHashCode(of = "id")
 @NoArgsConstructor

src/main/java/com/bytesw/bytebot/model/Calendar.java

@@ -10,7 +10,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
-//@Audited
+@Audited
 @Entity
 @Table(name = "AVB_CALENDAR")
 @NamedQuery(name = "Calendar.findByPK", query = "Select u from Calendar u where u.id = ?1")

src/main/java/com/bytesw/bytebot/model/CalendarException.java

@@ -13,7 +13,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigInteger;
 
-//@Audited
+@Audited
 @Entity
 @Inheritance(
         strategy = InheritanceType.SINGLE_TABLE

src/main/java/com/bytesw/bytebot/model/CalendarExceptionFull.java

@@ -13,7 +13,6 @@ import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
 
-//@Audited
 @Entity
 @Inheritance(
         strategy = InheritanceType.SINGLE_TABLE

src/main/java/com/bytesw/bytebot/model/Channel.java

@@ -4,6 +4,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 import java.util.List;
@@ -19,6 +20,7 @@ import java.util.List;
  * Confidencial y debe usarla de acuerdo con los términos de aceptación de
  * licencia de uso que firmó con Byte.
  */
+@Audited
 @Entity
 @Table(name = "AVB_CHANNEL")
 @Getter @Setter @ToString

src/main/java/com/bytesw/bytebot/model/ChannelParam.java

@@ -5,6 +5,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 
@@ -19,6 +20,7 @@ import javax.persistence.*;
  * Confidencial y debe usarla de acuerdo con los términos de aceptación de
  * licencia de uso que firmó con Byte.
  */
+@Audited
 @Entity
 @Table(name = "AVB_CHANNEL_PARAM")
 @Getter

src/main/java/com/bytesw/bytebot/model/Country.java

 package com.bytesw.bytebot.model;
 
 import lombok.*;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 import java.util.List;
 
+@Audited
 @Entity
 @Getter
 @Setter

src/main/java/com/bytesw/bytebot/model/DeploymentChannel.java

@@ -6,6 +6,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 import java.util.List;
@@ -21,6 +22,7 @@ import java.util.List;
  * Confidencial y debe usarla de acuerdo con los términos de aceptación de
  * licencia de uso que firmó con Byte.
  */
+//@Audited
 @Entity
 @Table(name = "AVB_DEPLOYMENT_CHANNEL")
 @Getter

src/main/java/com/bytesw/bytebot/model/DeploymentChannelParamValue.java

@@ -4,6 +4,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 
@@ -18,6 +19,7 @@ import javax.persistence.*;
  * Confidencial y debe usarla de acuerdo con los términos de aceptación de
  * licencia de uso que firmó con Byte.
  */
+//@Audited
 @Entity
 @Table(name = "AVB_DEPLOYMENT_CHANNEL_PARAM_VALUE")
 @Getter

src/main/java/com/bytesw/bytebot/model/FrequentQuestion.java

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 import java.time.LocalDateTime;
@@ -24,6 +25,7 @@ import java.time.OffsetDateTime;
  * Confidencial y debe usarla de acuerdo con los términos de aceptación de
  * licencia de uso que firmó con Byte.
  */
+//@Audited
 @Entity
 @Table(name = "AVB_FREQUENT_QUESTION")
 @Getter

src/main/java/com/bytesw/bytebot/model/ProcessETL.java

@@ -9,7 +9,7 @@ import org.hibernate.envers.Audited;
 import javax.persistence.*;
 import java.io.Serializable;
 
-//@Audited
+@Audited
 @Entity
 @Table(name = "avb_process_etl")
 @NamedQuery(name = "ProcessETL.findByPK", query = "Select u from ProcessETL u where u.id = ?1")

src/main/java/com/bytesw/bytebot/model/QuestionFile.java

@@ -14,7 +14,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 import org.hibernate.annotations.Type;
+import org.hibernate.envers.Audited;
 
+//@Audited
 @Entity
 @Getter
 @Setter

src/main/java/com/bytesw/bytebot/model/RangeCalendarException.java

@@ -12,7 +12,7 @@ import javax.persistence.Entity;
 import javax.persistence.NamedQuery;
 import java.time.OffsetDateTime;
 
-//@Audited
+@Audited
 @Entity
 @DiscriminatorValue(value= RangeCalendarException.DISCRIMINATOR_VALUE)
 @NamedQuery(name = "RangeCalendarException.findByPK", query = "Select u from RangeCalendarException u where u.id = ?1")

src/main/java/com/bytesw/bytebot/model/SchedulerTask.java

@@ -13,7 +13,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigInteger;
 
-//@Audited
+@Audited
 @Entity
 @Table(name = "AVB_SCHEDULER_TASK")
 @NamedQuery(name = "SchedulerTask.findByPK", query = "Select u from SchedulerTask u where u.id = ?1")

src/main/java/com/bytesw/bytebot/model/Timezone.java

 package com.bytesw.bytebot.model;
 
 import lombok.*;
+import org.hibernate.envers.Audited;
 
 import javax.persistence.*;
 
@@ -15,7 +16,7 @@ import javax.persistence.*;
  * Confidencial y debe usarla de acuerdo con los términos de aceptación de
  * licencia de uso que firmó con Byte.
  */
-
+@Audited
 @Entity
 @Getter @Setter
 @NoArgsConstructor

src/main/java/com/bytesw/bytebot/model/UniqueCalendarException.java

@@ -12,7 +12,7 @@ import javax.persistence.Entity;
 import javax.persistence.NamedQuery;
 import java.time.LocalDate;
 
-//@Audited
+@Audited
 @Entity
 @DiscriminatorValue(value= UniqueCalendarException.DISCRIMINATOR_VALUE)
 @NamedQuery(name = "UniqueCalendarException.findByPK", query = "Select u from UniqueCalendarException u where u.id = ?1")

src/main/java/com/bytesw/bytebot/model/UniqueWeeklyCalendarException.java

@@ -11,7 +11,7 @@ import javax.persistence.DiscriminatorValue;
 import javax.persistence.Entity;
 import javax.persistence.NamedQuery;
 
-//@Audited
+@Audited
 @Entity
 @DiscriminatorValue(value= UniqueWeeklyCalendarException.DISCRIMINATOR_VALUE)
 @NamedQuery(name = "UniqueWeeklyCalendarException.findByPK", query = "Select u from UniqueWeeklyCalendarException u where u.id = ?1")

src/main/java/com/bytesw/bytebot/model/WeekScheduler.java

@@ -14,7 +14,7 @@ import java.math.BigInteger;
 import java.time.OffsetDateTime;
 import java.time.OffsetTime;
 
-//@Audited
+@Audited
 @Entity
 @Table(name = "AVB_WEEK_SCHEDULER")
 @NamedQuery(name = "WeekScheduler.findByPK", query = "Select u from WeekScheduler u where u.id = ?1")