добавил систему миграций и связь одной записи Redmine с несколькими активностями Clockify и запретил отправку трудочасов при инициализации базы данных
This commit is contained in:
17
utils.py
17
utils.py
@@ -61,10 +61,10 @@ def db_update(clock, db, red):
|
||||
try:
|
||||
# Обновление Тегов
|
||||
logger.info(f"{Fore.YELLOW}Обновление Тегов...\n{Fore.RESET}")
|
||||
|
||||
db_tags = db.get_tags() or []
|
||||
new_tags = []
|
||||
clock_tags = clock.get_tags(is_updating=True, **{"page-size": clock.tags_count})
|
||||
if clock_tags:
|
||||
db_tags = db.get_tags()
|
||||
new_tags = [tag for tag in clock_tags if tag not in db_tags]
|
||||
|
||||
if new_tags:
|
||||
@@ -79,13 +79,14 @@ def db_update(clock, db, red):
|
||||
|
||||
# Обновление Задач
|
||||
logger.info(f"{Fore.YELLOW}Обновление Задач...\n{Fore.RESET}")
|
||||
|
||||
red_tasks = red.get_issues()
|
||||
clock_task_ids = {
|
||||
parse_task_id(tag.title)
|
||||
for tag in [*db_tags, *new_tags]
|
||||
}
|
||||
red_tasks = red.get_issues(clock_task_ids)
|
||||
if red_tasks:
|
||||
db_tasks = db.get_tasks()
|
||||
clock_task_ids = {parse_task_id(tag.title) for tag in [*db_tags, *new_tags]}
|
||||
clock_tasks = [task for task in red_tasks if task.id in clock_task_ids]
|
||||
new_tasks = [task for task in clock_tasks if task not in db_tasks]
|
||||
db_tasks = db.get_tasks() or []
|
||||
new_tasks = [task for task in red_tasks if task not in db_tasks]
|
||||
|
||||
if new_tasks:
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user