BE/PLG: TZ timestamp work #1251

Signed-off-by: jokob-sk <jokob.sk@gmail.com>

server/helper.py

@@ -56,7 +56,12 @@ def timeNowDB(local=True):
     """
     if local:
         try:
-            tz = ZoneInfo(conf.tz) if conf.tz else None
+            if isinstance(conf.tz, datetime.tzinfo):
+                tz = conf.tz
+            elif conf.tz:
+                tz = ZoneInfo(conf.tz)
+            else:
+                tz = None
         except Exception:
             tz = None
         return datetime.datetime.now(tz).strftime('%Y-%m-%d %H:%M:%S')

server/logger.py

@@ -29,7 +29,12 @@ def timeNowDB(local=True):
     """
     if local:
         try:
-            tz = ZoneInfo(conf.tz) if conf.tz else None
+            if isinstance(conf.tz, datetime.tzinfo):
+                tz = conf.tz
+            elif conf.tz:
+                tz = ZoneInfo(conf.tz)
+            else:
+                tz = None
         except Exception:
             tz = None
         return datetime.datetime.now(tz).strftime('%Y-%m-%d %H:%M:%S')

test/test_sessions_endpoints.py

@@ -10,7 +10,7 @@ from datetime import datetime, timedelta
 INSTALL_PATH = "/app"
 sys.path.extend([f"{INSTALL_PATH}/front/plugins", f"{INSTALL_PATH}/server"])
 
-from helper import timeNowDB, get_setting_value
+from helper import timeNowDB, timeNowTZ, get_setting_value
 from api_server.api_server_start import app
 
 @pytest.fixture(scope="session")