MessageMapper SessionMapper Dockerfile

Dockerfile

@@ -9,13 +9,12 @@ RUN apk add --update curl && \
 RUN export JAVA_HOME=$(readlink -f /usr/bin/java | sed "s:/bin/java::")
 RUN export PATH=$JAVA_HOME/bin:$PATH
 
-VOLUME /tmp
-ARG JAR_FILE
-RUN echo ${JAR_FILE}
-COPY ${JAR_FILE} app.jar
-ENV JAVA_OPTS="-Xms512m -Xmx1024m"
+# VOLUME /tmp
+RUN echo 'target/bytebot-service-1.0.1-SNAPSHOT.jar'
+COPY 'target/bytebot-service-1.0.1-SNAPSHOT.jar' app.jar
+# ENV JAVA_OPTS="-Xms512m -Xmx1024m"
 
 EXPOSE 8080
 EXPOSE 8443
 EXPOSE 22
-ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]
+ENTRYPOINT [ "sh", "-c", "java -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ]

Dockerfile_Volume

+FROM python:3.8-slim
+
+USER root
+
+COPY . .
+
+RUN apt update && \
+  apt install -y nano curl awscli
+
+RUN chmod +x entrypoint.sh
+
+RUN mkdir /data
+VOLUME [ "/data" ]
+
+CMD ["sh","entrypoint.sh"]
\ No newline at end of file

entrypoint.sh

+#!/bin/bash
+
+aws s3 sync s3://$bucket$path /data/$directory/
+
+
+while :
+do
+	echo "Container is still running"
+	sleep 5
+done
\ No newline at end of file

src/main/resources/config/mappers/bytebot/mysql/MessageMapper.xml

@@ -8,14 +8,12 @@
         SELECT COUNT(MESSA_ID)
         FROM AVB_MESSAGE
         WHERE MESSA_DATE <= #{endDate} AND MESSA_DATE >= #{startDate}
-        and INTEN_ID IS NOT NULL
     </select>
 
     <select id="countMessagesInRangeForHour" resultType="int" flushCache="true">
         SELECT COUNT(MESSA_ID)
         FROM AVB_MESSAGE
         WHERE MESSA_DATE &lt;= #{endDate} AND MESSA_DATE &gt;= #{startDate}
-        and INTEN_ID IS NOT NULL
     </select>
 
     <!-- @TODO Pendiente agregar la fecha -->

src/main/resources/config/mappers/bytebot/mysql/SessionMapper.xml

@@ -14,8 +14,8 @@
 
     <select id="countSessionsInRange" resultType="int" flushCache="true">
         select count(session_id) from avb_session
-        WHERE SESSION_LEDAT &lt;= #{endDate}
-        AND SESSION_LEDAT &gt;= #{startDate}
+        WHERE SESSION_DATE &lt;= #{endDate}
+        AND SESSION_DATE &gt;= #{startDate}
     </select>
 
     <select id="avgSessionsByCustomerInRange" resultType="Double" flushCache="true">
@@ -23,7 +23,7 @@
         (
         select count(USER_ID) as SESSION_CANT
         from AVB_SESSION bas
-        WHERE SESSION_LEDAT &lt;= #{endDate} AND SESSION_LEDAT &gt;= #{startDate} GROUP BY USER_ID
+        WHERE SESSION_DATE &lt;= #{endDate} AND SESSION_DATE &gt;= #{startDate} GROUP BY USER_ID
         ) AVB_SESSION_COUNT
     </select>
 

src/main/resources/config/mappers/bytebot/postgres/MessageMapper.xml

@@ -8,14 +8,12 @@
         SELECT COUNT(MESSA_ID)
         FROM AVB_MESSAGE
         WHERE MESSA_DATE <= #{endDate} AND MESSA_DATE >= #{startDate}
-        and INTEN_ID IS NOT NULL
     </select>
 
     <select id="countMessagesInRangeForHour" resultType="int" flushCache="true">
         SELECT COUNT(MESSA_ID)
         FROM AVB_MESSAGE
         WHERE MESSA_DATE &lt;= #{endDate} AND MESSA_DATE &gt;= #{startDate}
-        and INTEN_ID IS NOT NULL
     </select>
 
     <!-- @TODO Pendiente agregar la fecha -->

src/main/resources/config/mappers/bytebot/postgres/SessionMapper.xml

@@ -14,8 +14,8 @@
 
     <select id="countSessionsInRange" resultType="int" flushCache="true">
         select count(session_id) from avb_session
-        WHERE SESSION_LEDAT &lt;= #{endDate}
-        AND SESSION_LEDAT &gt;= #{startDate}
+        WHERE SESSION_DATE &lt;= #{endDate}
+        AND SESSION_DATE &gt;= #{startDate}
     </select>
 
     <select id="avgSessionsByCustomerInRange" resultType="Double" flushCache="true">
@@ -23,7 +23,7 @@
         (
         select count(USER_ID) as SESSION_CANT
         from AVB_SESSION bas
-        WHERE SESSION_LEDAT &lt;= #{endDate} AND SESSION_LEDAT &gt;= #{startDate} GROUP BY USER_ID
+        WHERE SESSION_DATE &lt;= #{endDate} AND SESSION_DATE &gt;= #{startDate} GROUP BY USER_ID
         ) AVB_SESSION_COUNT
     </select>