From 41d687cec40df0f6403e5f46535e197f0866a18c Mon Sep 17 00:00:00 2001
From: Eduard <e.vlasov@ssphere.ru>
Date: Thu, 15 May 2025 15:02:23 +0300
Subject: [PATCH] 0

---
 api.py     | 33 ++++++++++++++++++++++++++++-----
 classes.py |  3 ++-
 config.py  |  4 ++++
 main.py    |  9 ++++++---
 4 files changed, 40 insertions(+), 9 deletions(-)

diff --git a/api.py b/api.py
index 0d766d3..437e0e5 100644
--- a/api.py
+++ b/api.py
@@ -53,6 +53,7 @@ class ClockifyAPI(ClockifyConfig):
                 task_id, task_title = tag.title.split(" - ")
                 result.append(
                     Activity(
+                        id=activity["id"],
                         task_id=task_id,
                         task_title=task_title,
                         description=activity["description"],
@@ -77,6 +78,25 @@ class ClockifyAPI(ClockifyConfig):
             title=tag["name"]
         ) for tag in tags]
     
+    def mark_tracked(self, activities: list[Activity]):
+        for activity in activities:
+            try:
+                resp = requests.put(self.base_url + self.update_time_entry.format(
+                    workspace_id=WORKSPACE_ID,
+                    id=activity.id
+                ), data={
+                    "description": "*" + activity.description
+                })
+                if resp.ok:
+                    logging.debug(activity, "помечена как затреканная")
+                else:
+                    logging.error(activity, "не помечена как затреканная")
+            except Exception as e:
+                logging.error(e)
+                return
+        
+
+    
     def _check_token(self, token: str) -> str:
         resp = requests.get(self.base_url + self.config.user_url, headers={"X-API-KEY": token})
         if not resp.ok:
@@ -91,11 +111,11 @@ class RedmineAPI(RedmineConfig):
     def __init__(self, token):
         self.token = self._check_token(token) 
 
-    def track_activities(self, activities: list[Activity]):
+    def track_activities(self, activities: list[Activity]) -> list[Activity]:
         if len(activities) == 0:
             logging.info("Нет задач для занесения трудочасов")
             return
-        tracked = 0
+        tracked = []
         for activity in tqdm(activities, desc="Занесение трудочасов"):
             if not activity.is_tracked:
                 try:
@@ -114,7 +134,7 @@ class RedmineAPI(RedmineConfig):
                     )
                     if resp.ok:
                         activity.is_tracked = True
-                        tracked += 1
+                        tracked.append(activity)
                         logging.debug(activity)
                     else:
                         logging.error(activity, "Не была затрекана")
@@ -122,8 +142,11 @@ class RedmineAPI(RedmineConfig):
                 except Exception as e:
                     logging.error(e)
                     continue
-        if len(activities) == tracked:
-            logging.info(f"Все задачи были успешно занесены в Redmine: {tracked}")
+        if len(activities) == len(tracked):
+            logging.info("Все задачи были успешно занесены в Redmine")
+        else:
+            logging.info(f"Не все задачи были занесены в Redmine. Занесено {len(tracked)}")
+        return tracked
 
 
     def _check_token(self, token):
diff --git a/classes.py b/classes.py
index 8c81e1b..717a448 100644
--- a/classes.py
+++ b/classes.py
@@ -4,6 +4,7 @@ from datetime import datetime
 
 @dataclass
 class Activity:
+    id: str
     task_id: int
     task_title: str
     description: str
@@ -15,7 +16,7 @@ class Activity:
         return self.description.startswith("*")
 
     def __str__(self):
-        return f'{self.date}: {self.description.strip("*")} для задачи "{self.task_title}"' + (" - ЗАТРЕКАНА" if self.is_tracked else "")
+        return f'{self.date}: {self.description.strip("*")} для задачи "{self.task_title}"'
 
 
 @dataclass
diff --git a/config.py b/config.py
index 6fc9984..fe87633 100644
--- a/config.py
+++ b/config.py
@@ -49,6 +49,10 @@ class ClockifyConfig:
     @property
     def datetime_format(self):
         return "%Y-%m-%dT%H:%M:%SZ"
+    
+    @property
+    def update_time_entry(self):
+        return "/workspaces/{workspaceId}/time-entries/{id}"
 
 
 config = Config()
diff --git a/main.py b/main.py
index cc3999e..5703958 100644
--- a/main.py
+++ b/main.py
@@ -7,13 +7,16 @@ from utils import today_start, today_end
 
 
 def main():
+    clock = ClockifyAPI(config.CLOCKIFY_TOKEN)
+    red = RedmineAPI(config.REDMINE_TOKEN)
     if False:
-        clock = ClockifyAPI(config.CLOCKIFY_TOKEN)
-        red = RedmineAPI(config.REDMINE_TOKEN)
-        red.track_activities(clock.get_activities(
+        tracked_activities = red.track_activities(clock.get_activities(
             start=today_start(),
             end=today_end()
         ))
+        clock.mark_tracked(tracked_activities)
+
+
 
 
 if __name__ == "__main__":