Merge origin/developer into developer

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

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

@@ -25,7 +25,7 @@ public class Agent implements Serializable {
     @Column(name = "AGEN_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_AGENT_GENERATOR")
     @TableGenerator(name = "BBOT_AGENT_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_AGENT_SEQ")
+            pkColumnValue = "BBOT_AGENT_SEQ", allocationSize = 1)
     private Long id;
 
     @Column(name = "AGEN_IDEN")

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

@@ -31,7 +31,7 @@ public class Channel {
     @Column(name = "CHAN_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_CHANNEL_GENERATOR")
     @TableGenerator(name = "BBOT_CHANNEL_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_CHANNEL_SEQ")
+            pkColumnValue = "BBOT_CHANNEL_SEQ", allocationSize = 1)
     private Long id;
 
     @Column(name = "CHAN_IDEN")

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

@@ -31,7 +31,7 @@ public class ChannelParam {
     @Column(name = "CHPA_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_CHANNEL_PARAM_GENERATOR")
     @TableGenerator(name = "BBOT_CHANNEL_PARAM_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_CHANNEL_PARAM_SEQ")
+            pkColumnValue = "BBOT_CHANNEL_PARAM_SEQ", allocationSize = 1)
     private Long id;
 
     @Column(name = "CHPA_IDEN")

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

@@ -19,7 +19,7 @@ public class Country {
     @Column(name = "COUN_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_COUNTRY_GENERATOR")
     @TableGenerator(name = "BBOT_COUNTRY_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_COUNTRY_SEQ")
+            pkColumnValue = "BBOT_COUNTRY_SEQ", allocationSize = 1)
     private Long id;
 
     @Column(name = "COUN_NAME", nullable = false)

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

@@ -33,7 +33,7 @@ public class DeploymentChannel {
     @Column(name = "DCHA_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_DEPLOYMENT_CHANNEL_GENERATOR")
     @TableGenerator(name = "BBOT_DEPLOYMENT_CHANNEL_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_DEPLOYMENT_CHANNEL_SEQ")
+            pkColumnValue = "BBOT_DEPLOYMENT_CHANNEL_SEQ", allocationSize = 1)
     private Long id;
 
     @Column(name = "DCHA_NAME")

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

@@ -30,7 +30,7 @@ public class DeploymentChannelParamValue {
     @Column(name = "CHPV_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_DEPLOYMENT_CHANNEL_PARAM_VALUE_GENERATOR")
     @TableGenerator(name = "BBOT_DEPLOYMENT_CHANNEL_PARAM_VALUE_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_DEPLOYMENT_CHANNEL_PARAM_VALUE_SEQ")
+            pkColumnValue = "BBOT_DEPLOYMENT_CHANNEL_PARAM_VALUE_SEQ", allocationSize = 1)
     private Long id;
 
     @ManyToOne

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

@@ -26,7 +26,7 @@ public class Timezone {
     @Column(name = "TZON_ID")
     @GeneratedValue(strategy = GenerationType.TABLE, generator = "BBOT_TIMEZONE_GENERATOR")
     @TableGenerator(name = "BBOT_TIMEZONE_GENERATOR", table = "SEQUENCE_TABLE", pkColumnName = "SEQ_NAME", valueColumnName = "SEQ_COUNT",
-            pkColumnValue = "BBOT_TIMEZONE_SEQ")
+            pkColumnValue = "BBOT_TIMEZONE_SEQ", allocationSize = 1)
     private Long id;
 
     @Column(name = "TZON_ZONE", nullable = false)

src/main/java/com/bytesw/bytebot/service/AgentService.java

@@ -179,7 +179,6 @@ public class AgentService extends CustomPaginationService<Agent> {
             if (frequentQuestionBD == null) {
                 frequentQuestionBD = new FrequentQuestion();
                 frequentQuestionBD.setStatus(FrequentQuestionStatusEnum.PENDING_SYNCHRONIZED);
-                frequentQuestionBD.setUploadDate(LocalDateTime.now());
                 frequentQuestionBD.setUuid(frequentQuestionBean.getUuid());
 
                 changeToPendingSynchronized = true;
@@ -354,9 +353,12 @@ public class AgentService extends CustomPaginationService<Agent> {
                 frequentQuestionBean.setDescription(frequentQuestion.getDescription());
                 frequentQuestionBean.setUser(frequentQuestion.getUser());
                 frequentQuestionBean.setFilename(frequentQuestion.getFilename());
-                frequentQuestionBean.setUploadDate(frequentQuestion.getUploadDate().format(formatter));
                 frequentQuestionBean.setStatus(frequentQuestion.getStatus().getName());
 
+                if(frequentQuestion.getUploadDate() != null) {
+                    frequentQuestionBean.setUploadDate(frequentQuestion.getUploadDate().format(formatter));
+                }
+
                 bean.getFrequentQuestions().add(frequentQuestionBean);
             }
 

src/main/resources/application.yml

 spring.autoconfigure.exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration, org.springframework.boot.autoconfigure.security.SecurityAutoConfiguration, org.springframework.boot.autoconfigure.jms.JmsAutoConfiguration
 
 server:
-  servlet.context-path: ${APPLICATION_PATH:/}
+  servlet.context-path: ${APPLICATION_PATH:/bytebot}
   port: ${APPLICATION_PORT:9077}
   web:
-    static-content-location: file:/home/schicoma/Documentos/Proyectos/git/BYTEBOT/bytebot-workspace/dist/bytebot-html/
+    static-content-location: file:/home/hernan/java-projects/byte-projects/BYTEBOT/bytebot-projects/dist/bytebot-html/
 #NOTA debe terminar con /
 
 security:
@@ -32,7 +32,7 @@ application:
     hosts: 38F9D38DD09
   type: web # web o service
   security:
-    enabled: false
+    enabled: true
     encryption-key: ENC(0WRfEFi8lYjlJj2bj37z4TRu4zmPnmXl4zM4Jpdh1H8=)*
   web:
     server: docker # weblogic, docker
@@ -96,31 +96,30 @@ spring:
   datasource:
     database-type: mysql
     schemaName: BYTEBOT
-    url: jdbc:mysql://localhost:3306/BYTEBOT?useSSL=false
+    url: jdbc:mysql://localhost:43306/BYTEBOT?useSSL=false
     driverClassName: 'com.mysql.cj.jdbc.Driver'
-    username: root
-    password: root
+    username: BYTEBOT
+    password: BYTEBOT
     minimum-idle: 10
     maximum-pool-size: 10
     validationQuery: SELECT 1
     testWhileIdle: true
     hikari.registerMbeans: true
   security:
-    basepath: http://127.0.0.1:9077/
+    basepath: http://localhost:9077/bytebot
     provider: byte # oracle, amazon
     oauth2-client:
       clientId: xdf-client
       clientSecret: xdf-secret
-      accessTokenUri: http://localhost:1102/oauth/token
-      userAuthorizationUri: http://localhost:1102/oauth/authorize
+      accessTokenUri: http://cdb.tigo.bfm:8080/oauth/token
+      userAuthorizationUri: http://cdb.tigo.bfm:8080/oauth/authorize
     oauth2-resource:
-      userInfoUri: http://localhost:1102/oauth/userinfo
-      logoutUri: http://localhost:1102/oauth/userlogout
+      userInfoUri: http://cdb.tigo.bfm:8080/oauth/userinfo
+      logoutUri: http://cdb.tigo.bfm:8080/oauth/userlogout
   jpa:
     open-in-view: false
     properties.hibernate:
       dialect: org.hibernate.dialect.MySQL5Dialect
-      #dialect: org.hibernate.dialect.Oracle12cDialect
       format_sql: false
       hbm2ddl.auto: none
     show-sql: true
@@ -146,3 +145,5 @@ logging.level.com.ulisesbocchio.jasyptspringboot: ERROR
 logging.level.org.hibernate.SQL: ERROR
 logging.level.org.hibernate.type: ERROR
 logging.level.net.sf.hibernate.type: ERROR
+
+jasypt.encryptor.password: 179CD78D24F9BC63D6E677272D1A7