diff --git a/ZathuraProject/__init__.py b/ZathuraProject/__init__.py index bf812f3..5b6d0d7 100644 --- a/ZathuraProject/__init__.py +++ b/ZathuraProject/__init__.py @@ -161,7 +161,7 @@ def print_stuff_nice_and_good(payload:dict, message: str = None, date_filter_aft print(_) if limit != 0: - print("Total result is limited into {}".format(limit)) + print("Total result is limited to {} data only".format(limit)) if desc: print("Result is in descending order") diff --git a/ZathuraProject/zathura.py b/ZathuraProject/zathura.py index fe95bff..876de28 100644 --- a/ZathuraProject/zathura.py +++ b/ZathuraProject/zathura.py @@ -22,7 +22,12 @@ def insert_error_log(self, user:str, error_name:str, error_description:str, poin if user is not None and error_name is not None and error_description is not None and point_of_origin is not None: from uuid import uuid4 try: - error_log = ErrorLog(_id = str(uuid4()),user = user, error_name = error_name.lower(), error_description = error_description, point_of_origin = point_of_origin.lower(), warning_level=int(warning)) + warning = int(warning) + if warning < 0: + warning = 0 + elif warning > 3: + warning = 3 + error_log = ErrorLog(_id = str(uuid4()),user = user, error_name = error_name.lower(), error_description = error_description, point_of_origin = point_of_origin.lower(), warning_level=warning) except ValueError: # TODO: add logger print("Wrong warning field value") @@ -74,7 +79,7 @@ def __error_obj_to_dict(self, error_log_object: ErrorLog): 'logged_at': Utility.milli_to_datetime(error_log_object.logged_at), 'is_resolved': "Resolved" if error_log_object.is_resolved else "Not Resolved", 'resolved_at': error_log_object.resolved_at if error_log_object.resolved_at is None else Utility.milli_to_datetime(error_log_object.resolved_at), - 'warning_level': error_log_object.warning_level, + 'warning_level': self.__get_warning_level_in_text(error_log_object.warning_level), } def __debug_obj_to_dict(self, debug_log_object: DebugLog): @@ -98,6 +103,15 @@ def __generate_error_return_payload(self, log_paylod: ModelSelect): all_error_logs.append(self.__error_obj_to_dict(err)) return {"total": len(all_error_logs), "log": all_error_logs} + def __get_warning_level_in_text(self, warning_level: int): + _ = { + '0': 'warning', + '1': 'Level - 1', + '2': 'Level - 2', + '3': 'Critical' + } + return _[str(warning_level)] + def __generate_verbose_return_payload(self, debug_payload: ModelSelect): """ # generates debug payload for return diff --git a/setup.py b/setup.py index 741426f..220295b 100755 --- a/setup.py +++ b/setup.py @@ -34,7 +34,7 @@ setup(name='zathura', packages = ['ZathuraProject'], - version='0.0.2.dev1', + version='0.0.3.dev1', description='Zathura is a small space logger. It logs stuff into her logbook as she drifts into vast unknown of development phase.', url='https://github.com/ibtehaz-shawon/Zathura', author='Ibtehaz Shawon',