From 8f7b25bab1fcbf63afccf09df8af089f068376d3 Mon Sep 17 00:00:00 2001
From: rjshrjndrn <rjshrjndrn@gmail.com>
Date: Fri, 5 May 2023 19:29:38 +0200
Subject: [PATCH] chore(cli): Adding separate query for ee cleanup

Signed-off-by: rjshrjndrn <rjshrjndrn@gmail.com>
---
 scripts/helmcharts/openreplay-cli | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/scripts/helmcharts/openreplay-cli b/scripts/helmcharts/openreplay-cli
index ba32c1162..6c5226fb2 100755
--- a/scripts/helmcharts/openreplay-cli
+++ b/scripts/helmcharts/openreplay-cli
@@ -18,6 +18,8 @@ function xargs() {
   /var/lib/openreplay/busybox xargs
 }
 
+[[ $(awk '/enterpriseEditionLicense/{print $2}' < "/var/lib/openreplay/vars.yaml") != "" ]] && EE=true
+
 tools=(
   zyedidia/eget
   stern/stern
@@ -243,23 +245,25 @@ function cleanup() {
   pghost=$(awk '/postgresqlHost/{print $2}' < "${OR_DIR}/vars.yaml" | xargs)
   pgport=$(awk '/postgresqlPort/{print $2}' < "${OR_DIR}/vars.yaml" | xargs)
   pgdatabase=$(awk '/postgresqlDatabase/{print $2}' < "${OR_DIR}/vars.yaml" | xargs)
-  kubectl delete po -n ${APP_NS} pg-cleanup &> /dev/null || true
-  kubectl run pg-cleanup -n ${APP_NS} \
+  cleanup_query="DELETE FROM public.sessions WHERE start_ts < extract(epoch from '${delete_from_date}'::date) * 1000;"
+  [[ $EE ]] && cleanup_query="DELETE FROM public.sessions WHERE start_ts < extract(epoch from '${delete_from_date}'::date) * 1000 AND session_id NOT IN (SELECT session_id FROM user_favorite_sessions);"
+  kubectl delete po -n "${APP_NS}" pg-cleanup &> /dev/null || true
+  kubectl run pg-cleanup -n "${APP_NS}" \
     --restart=Never \
-    --env PGHOST=$pghost \
-    --env PGUSER=$pguser \
-    --env PGDATABASE=$pgdatabase \
-    --env PGPASSWORD=$pgpassword \
-    --env PGPORT=$pgport \
-    --image bitnami/postgresql -- psql -c "DELETE FROM public.sessions WHERE start_ts < extract(epoch from '${delete_from_date}'::date) * 1000;"
+    --env PGHOST="$pghost"\
+    --env PGUSER="$pguser"\
+    --env PGDATABASE="$pgdatabase"\
+    --env PGPASSWORD="$pgpassword"\
+    --env PGPORT="$pgport"\
+    --image bitnami/postgresql -- psql -c "$cleanup_query"
   # Run minio cleanup
   MINIO_ACCESS_KEY=$(awk '/accessKey/{print $NF}' < "${OR_DIR}/vars.yaml" | tail -n1 | xargs)
   MINIO_SECRET_KEY=$(awk '/secretKey/{print $NF}' < "${OR_DIR}/vars.yaml" | tail -n1 | xargs)
   MINIO_HOST=$(awk '/endpoint/{print $NF}' < "${OR_DIR}/vars.yaml" | tail -n1 | xargs)
-  kubectl delete po -n ${APP_NS} minio-cleanup &> /dev/null || true
-  kubectl run minio-cleanup -n ${APP_NS} \
+  kubectl delete po -n "${APP_NS}" minio-cleanup &> /dev/null || true
+  kubectl run minio-cleanup -n "${APP_NS}" \
     --restart=Never \
-    --env MINIO_HOST=$pghost \
+    --env MINIO_HOST="$pghost" \
     --image bitnami/minio:2020.10.9-debian-10-r6 -- /bin/sh -c "
       mc alias set minio $MINIO_HOST $MINIO_ACCESS_KEY $MINIO_SECRET_KEY &&
       mc rm --recursive --dangerous --force --older-than ${delete_from_number_days}d minio/mobs