Revert period range timezone changes

Author: ar2rsawseen

api/lib/countly.common.js

@@ -913,9 +913,7 @@ countlyCommon.getPeriodRange = function(period, timezone, offset) {
 
     endTimestamp = excludeCurrentDay ? __currMoment.clone().subtract(1, 'days').endOf('day') : __currMoment.clone().endOf('day');
 
-    var isRangePeriod = Array.isArray(period);
-
-    if (isRangePeriod) {
+    if (Array.isArray(period)) {
         if ((period[0] + "").length === 10) {
             period[0] *= 1000;
         }
@@ -996,24 +994,15 @@ countlyCommon.getPeriodRange = function(period, timezone, offset) {
         let nDays = 30;
         startTimestamp = __currMoment.clone().startOf("day").subtract(nDays - 1, "days");
     }
-    var startOffset = offset;
-    var endOffset = offset;
-
-    if (timezone && isRangePeriod) {
-        startOffset = moment.tz(startTimestamp.valueOf(), timezone).utcOffset() * -1;
-        endOffset = moment.tz(endTimestamp.valueOf(), timezone).utcOffset() * -1;
+    if (!offset) {
+        offset = moment.tz(timezone).utcOffset();
+        offset = offset * -1;
     }
-    else if (typeof offset !== "number") {
-        offset = timezone ? moment.tz(timezone).utcOffset() * -1 : 0;
-        startOffset = offset;
-        endOffset = offset;
-    }
-
     return {
-        "$gt": startTimestamp.valueOf() + startOffset * 60000 - 1,
-        "$lt": endTimestamp.valueOf() + endOffset * 60000 + 1,
-        "$gte": startTimestamp.valueOf() + startOffset * 60000,
-        "$lte": endTimestamp.valueOf() + endOffset * 60000,
+        "$gt": startTimestamp.valueOf() + offset * 60000 - 1,
+        "$lt": endTimestamp.valueOf() + offset * 60000 + 1,
+        "$gte": startTimestamp.valueOf() + offset * 60000,
+        "$lte": endTimestamp.valueOf() + offset * 60000,
     };
 };
 

test/unit/api.utils.common.unit.js

@@ -447,7 +447,7 @@ describe("Common API utility functions", function() {
                     var timezone = "America/New_York";
                     var offset = 300;
                     var range = countlyCommon.getPeriodRange(getPeriod(), timezone, offset);
-                    assertRange(range, timezone);
+                    assertRange(range, timezone, offset);
                 });
 
                 describe("with different server default timezone", function() {