e.vlasov/redmine_tracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавил режим отладки. Исправил проблемы с логгером

Browse Source
This commit is contained in:
Власов Эдуард
2025-05-21 11:57:09 +03:00
parent caa13a056b
commit aae6d8309a
7 changed files with 133 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api/clockify.py
View File

@@ -11,6 +11,9 @@ from exceptions import InvalidToken
from utils import time_to_hour
logger = logging.getLogger(__name__)
class ClockifyAPI(ClockifyConfig):
def __init__(self, token: str, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -25,13 +28,13 @@ class ClockifyAPI(ClockifyConfig):
"""
time_entries_url = self.time_entries_url
activities = requests.get(self.base_url + time_entries_url, params=kwargs, headers={"X-API-KEY": self.token}).json()
logging.info(f"Получено задач: {len(activities)}")
logger.info(f"Получено задач: {len(activities)}")
time_worked_out_total = 0
result = []
for activity in tqdm(activities, desc="Парсинг задач"):
if not activity.get("tagIds"):
logging.info(f'{activity["timeInterval"]["start"]}: {activity["description"]} - У задачи нет тегов')
logger.info(f'{activity["timeInterval"]["start"]}: {activity["description"]} - У задачи нет тегов')
continue
for tag_id in activity.get("tagIds", {"tagIds": []}):
start = datetime.strptime(activity["timeInterval"]["start"], config.DATETIME_FORMAT)
@@ -41,7 +44,7 @@ class ClockifyAPI(ClockifyConfig):
try:
task_id, task_title = tag.title.split(" - ")
except ValueError:
logging.info(f'{activity["timeInterval"]["start"]}: {activity["description"]} - Неправильный формат тега {tag}')
logger.info(f'{activity["timeInterval"]["start"]}: {activity["description"]} - Неправильный формат тега {tag}')
continue
result.append(
Activity(
@@ -59,8 +62,8 @@ class ClockifyAPI(ClockifyConfig):
is_tracked=activity["billable"]
)
)
logging.info(f"Сохранено задач: {len(result)}")
logging.info(f"Отработано часов: {time_worked_out_total}")
logger.info(f"Сохранено задач: {len(result)}")
logger.info(f"Отработано часов: {time_worked_out_total}")
return result
@@ -95,13 +98,13 @@ class ClockifyAPI(ClockifyConfig):
}
)
if resp.ok:
logging.debug(resp.json())
logging.info(f"{activity} {Fore.GREEN} помечена как затреканная{Fore.RESET}")
logger.debug(resp.json())
logger.info(f"{activity} {Fore.GREEN} помечена как затреканная{Fore.RESET}")
else:
logging.debug(resp.json())
logging.error(f"{activity} {Fore.RED} не помечена как затреканная{Fore.RESET}")
logger.debug(resp.json())
logger.error(f"{activity} {Fore.RED} не помечена как затреканная{Fore.RESET}")
except Exception as e:
logging.error(e)
logger.error(e)
return
@@ -109,8 +112,8 @@ class ClockifyAPI(ClockifyConfig):
def _check_token(self, token: str) -> str:
resp = requests.get(self.base_url + self.user_url, headers={"X-API-KEY": token})
if not resp.ok:
logging.error(resp.json())
logger.error(resp.json())
raise InvalidToken
resp = resp.json()
logging.debug({"id": resp["id"], "email": resp["email"], "name": resp["name"]})
return token
logger.debug({"id": resp["id"], "email": resp["email"], "name": resp["name"]})
return token