diff --git a/api/clockify.py b/api/clockify.py index 3709456..8fe6f2f 100644 --- a/api/clockify.py +++ b/api/clockify.py @@ -91,7 +91,7 @@ class ClockifyAPI(ClockifyConfig): time_spent=time_to_hour((end if end else datetime.utcnow()) - start), date_start=start, date_end=end, - is_tracked=activity["billable"], + is_tracked=db.has_time_entry(activity["id"]), author_id=author["id"] ) ) @@ -159,6 +159,7 @@ class ClockifyAPI(ClockifyConfig): title=vetro_project["name"] ) for vetro_project in vetro_projects] + # DEPRECATED def mark_tracked(self, activities: list[Activity]): """ Помечает активности затреканными (Billable) на сервере Clockify diff --git a/db/db.py b/db/db.py index 4c50df6..db07efc 100644 --- a/db/db.py +++ b/db/db.py @@ -309,3 +309,12 @@ class Database: ] except Exception as e: logger.error(e) + + def has_time_entry(self, activity_id: str) -> bool: + """Проверяет, есть ли запись о времени для активности""" + try: + result = self.cursor.execute("SELECT * FROM time_entry WHERE activity_id = ?", (activity_id,)).fetchone() + return bool(result) + except Exception as e: + logger.error(e) + return False diff --git a/track.py b/track.py index 64492bc..0ff9f62 100644 --- a/track.py +++ b/track.py @@ -62,7 +62,7 @@ def main(): db.insert_activities(activities) try: tracked_activities = red.track_activities(activities) - clock.mark_tracked(tracked_activities) + # clock.mark_tracked(tracked_activities) if not is_debug: db.insert_time_entries(tracked_activities) db.insert_activities(tracked_activities)