Merge pull request #2629 from gtech-mulearn/dev

dev

Author: awindsr

api/dashboard/achievement/achievement_views.py

@@ -22,7 +22,7 @@
 from utils.permission import CustomizePermission, JWTUtils, RoleRequired, BackendApiKeyPermission
 from utils.response import CustomResponse
 from utils.types import RoleType
-from utils.utils import DateTimeUtils
+from utils.utils import DateTimeUtils, CommonUtils
 
 
 class AchievementListAPIView(APIView):

api/dashboard/error_log/log_helper.py

@@ -113,7 +113,7 @@ def __init__(self, log_data) -> None:
         # Log entries their types and how to find them
         self.log_entries = {
             "id": {"regex": r"ID: (.+?)\n(?=TYPE:)", "type": str},
-            "timestamp": {"regex": r"\n(.+?) ERROR.*", "type": datetime},
+            "timestamp": {"regex": r"^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}[,\.]\d{3}) ERROR", "type": datetime},
             "type": {"regex": r"TYPE: (.+?)\n(?=MESSAGE:)", "type": str},
             "message": {"regex": r"MESSAGE: (.+?)\n(?=METHOD:)", "type": str},
             "method": {"regex": r"METHOD: (.+?)\n(?=PATH:)", "type": str},