Merge branch 'dev_jm' into 'dev_mg'

# Conflicts:
#   src/main/java/com/bytesw/bytebot/model/CalendarException.java
#   src/main/java/com/bytesw/bytebot/model/SchedulerTask.java

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

@@ -152,6 +152,7 @@ public class ScheduleService implements SchedulingConfigurer {
         String key = String.format("%s-%s", tenantIdentifier, identifier);
         futureMap.put(key, taskRegistrar.getScheduler().schedule(() -> scheduleCron(createJob(tenantIdentifier), tenantIdentifier), trigger));
 
+
         /*ETL eliminacion de data sensible*/
         List<DeleteDataSensBean> deleteDataSensBeans = deleteDataSensJDBCRepository
                 .getListAgentChannel(AgentStatusEnum.DEPLOYED.getName(), AgentParameterEnum.ACCESS_TWILIO.getName());

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

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

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

@@ -12,7 +12,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigInteger;
 
-@Audited
+//@Audited
 @Entity
 @Inheritance(
         strategy = InheritanceType.SINGLE_TABLE
@@ -27,8 +27,8 @@ public abstract class CalendarException implements Serializable {
 
     @Id
     @Column(name = "CALE_EXC_ID")
-    //@SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
-    //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
+//    @SequenceGenerator(name = "AVB_CALENDAR_EXCEPTION_GENERATOR", sequenceName = "AVB_CALENDAR_EXCEPTION_SEQ", initialValue = 1, allocationSize = 1)
+//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_CALENDAR_EXCEPTION_GENERATOR")
     private BigInteger id;
 
     @Version

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

@@ -11,7 +11,7 @@ import javax.persistence.*;
 import java.io.Serializable;
 import java.math.BigInteger;
 
-@Audited
+//@Audited
 @Entity
 @Table(name = "AVB_SCHEDULER_TASK")
 @NamedQuery(name = "SchedulerTasks.findByPK", query = "Select u from SchedulerTask u where u.id = ?1")
@@ -23,8 +23,8 @@ public class SchedulerTask implements Serializable {
 
     @Id
     @Column(name = "SHTA_ID")
-    //@SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1)
-    //@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR")
+//    @SequenceGenerator(name = "AVB_SCHEDULER_TASK_GENERATOR", sequenceName = "AVB_SCHEDULER_TASK_SEQ", initialValue = 1, allocationSize = 1)
+//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_SCHEDULER_TASK_GENERATOR")
     private BigInteger id;
 
     @Version

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

@@ -13,7 +13,7 @@ import java.io.Serializable;
 import java.math.BigInteger;
 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")
@@ -25,8 +25,8 @@ public class WeekScheduler implements Serializable {
 
     @Id
     @Column(name = "WESC_ID")
-    @SequenceGenerator(name = "AVB_WEEK_SCHEDULER_GENERATOR", sequenceName = "AVB_WEEK_SCHEDULER_SEQ", initialValue = 1, allocationSize = 1)
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_WEEK_SCHEDULER_GENERATOR")
+//    @SequenceGenerator(name = "AVB_WEEK_SCHEDULER_GENERATOR", sequenceName = "AVB_WEEK_SCHEDULER_SEQ", initialValue = 1, allocationSize = 1)
+//    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AVB_WEEK_SCHEDULER_GENERATOR")
     private BigInteger id;
 
     @Version

src/main/java/com/bytesw/bytebot/repository/SchedulerTaskRepository.java

@@ -14,4 +14,5 @@ public interface SchedulerTaskRepository extends CrudRepository<SchedulerTask, B
 
     @Query("select b from SchedulerTask b where b.calendar.id = :calendarId")
     Optional<List<SchedulerTask>> findByCalendarId(@Param("calendarId") String calendarId);
+
 }