Merge pull request #4330 from Countly/ar2rsawseen/next

Ar2rsawseen/next

Author: ar2rsawseen

api/lib/countly.common.js

@@ -688,7 +688,7 @@ function getPeriodObject(prmPeriod) {
     let zeroIDs = new Set(),
         monthIDs = new Set();
 
-    for (let index in periodObject.currentPeriodArr) {
+    for (let index = 0; index < periodObject.currentPeriodArr.length; index++) {
         let [year, month] = periodObject.currentPeriodArr[index].split("."),
             [pYear, pMonth] = periodObject.previousPeriodArr[index].split(".");
 

bin/upgrade/DEV/upgrade.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DATE=$(date +%Y-%m-%d:%H:%M:%S)
+VERSION="$(basename "${DIR}")" 
+
+countly stop
+if [ -f "$DIR/upgrade_fs.sh" ]; then
+    bash "$DIR/upgrade_fs.sh" combined 2>&1 | tee -a "$DIR/../../../log/countly-upgrade-fs-$VERSION-$DATE.log"
+fi
+if [ -f "$DIR/upgrade_db.sh" ]; then
+    bash "$DIR/upgrade_db.sh" combined 2>&1 | tee -a "$DIR/../../../log/countly-upgrade-db-$VERSION-$DATE.log"
+fi
+countly upgrade

bin/upgrade/DEV/upgrade_db.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+VER="23.06"
+
+CONTINUE="$(countly check before upgrade db "$VER")"
+
+if [ "$CONTINUE" != "1" ] && [ "$1" != "combined" ]
+then
+    echo "Database is already up to date with $VER"
+    read -r -p "Are you sure you want to run this script? [y/N] " response
+    if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]
+    then
+        CONTINUE=1
+    fi
+fi
+
+if [ "$CONTINUE" == "1" ]
+then
+    echo "Running database modifications"
+    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+    SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+    if [ "$1" != "combined" ]; then
+        #upgrade plugins
+        #countly plugin enable license;
+        nodejs "$DIR/scripts/install_plugins.js"
+    fi
+    
+    #add indexes
+    nodejs "$DIR/scripts/add_indexes.js"
+
+    #run upgrade scripts
+    countly config "drill.big_list_limit" 1000
+    nodejs "$SCRIPTS/scripts/script.js"
+
+
+    if [ "$1" != "combined" ]; then
+        countly upgrade;
+    fi
+
+    #call after check
+    countly check after upgrade db "$VER"
+elif [ "$CONTINUE" == "0" ]
+then
+    echo "Database is already upgraded to $VER"
+elif [ "$CONTINUE" == "-1" ]
+then
+    echo "Database is upgraded to higher version"
+else
+    echo "Unknown ugprade state: $CONTINUE"
+fi

bin/upgrade/DEV/upgrade_fs.sh

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+echo "Running filesystem modifications"
+
+VER="23.06"
+
+CONTINUE="$(countly check before upgrade fs "$VER")"
+
+if [ "$CONTINUE" != "1" ] && [ "$1" != "combined" ]
+then
+    echo "Filesystem is already up to date with $VER"
+    read -r -p "Are you sure you want to run this script? [y/N] " response
+    if [[ "$response" =~ ^([yY][eE][sS]|[yY])$ ]]
+    then
+        CONTINUE=1
+    fi
+fi
+
+if [ "$CONTINUE" == "1" ]
+then
+    DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+
+    #enable command line
+    bash "$DIR/scripts/detect.init.sh"
+
+    #countly plugin enable sdk;
+    
+    #upgrade plugins
+    nodejs "$DIR/scripts/install_plugins.js"
+    
+    #get web sdk
+    countly update sdk-web
+   
+    
+    if [ "$1" != "combined" ]; then
+        countly upgrade;
+    else
+        countly task dist-all;
+    fi
+
+    #call after check
+    countly check after upgrade fs "$VER"
+elif [ "$CONTINUE" == "0" ]
+then
+    echo "Filesystem is already upgraded to $VER"
+elif [ "$CONTINUE" == "-1" ]
+then
+    echo "Filesystem is upgraded to higher version"
+else
+    echo "Unknown ugprade state: $CONTINUE"
+fi