Рефактор RedmineConfig

config/clockify.py

@@ -2,33 +2,17 @@ class ClockifyConfig:
     def __init__(self, workspace_id: str, user_id: str):
         self.workspace_id = workspace_id
         self.user_id = user_id
-    
-    @property
-    def base_url(self):
-        return "https://api.clockify.me/api/v1"
-    
-    @property
-    def tags_url(self):
-        return f"/workspaces/{self.workspace_id}/tags"
-    
-    @property
-    def time_entries_url(self):
-        return f"/workspaces/{self.workspace_id}/user/{self.user_id}/time-entries"
-    
-    @property
-    def user_url(self):
-        return "/user"
-    
-    @property
-    def datetime_format(self):
-        return "%Y-%m-%dT%H:%M:%SZ"
+        self.datetime_format = "%Y-%m-%dT%H:%M:%SZ"
+        self.base_url = "https://api.clockify.me/api/v1"
+        self.workspace_url = f"/workspaces/{self.workspace_id}"
+        self.tags_url = f"{self.workspace_url}/tags"
+        self.time_entries_url = f"/{self.workspace_url}/user/{self.user_id}/time-entries"
+        self.user_url = "/user"
+        self.projects_url = f"{self.workspace_url}/projects"
     
     def update_time_entry(self, activity_id):
-        return f"/workspaces/{self.workspace_id}/time-entries/{activity_id}"
-    
-    @property
-    def projects_url(self):
-        return f"/workspaces/{self.workspace_id}/projects"
+        return f"{self.workspace_url}/time-entries/{activity_id}"
 
     def tasks_url(self, project_id: str):
         return f"{self.projects_url}/{project_id}/tasks"
+    

config/redmine.py

@@ -1,20 +1,7 @@
 class RedmineConfig:
-    @property
-    def base_url(self):
-        return "https://redmine.sbps.ru"
-
-    @property
-    def time_entries_url(self):
-        return "/time_entries.json"
-    
-    @property
-    def my_account_url(self):
-        return "/my/account.json"
-    
-    @property
-    def datetime_format(self):
-        return "%Y-%m-%d"
-    
-    @property
-    def time_entry_activities(self):
-        return "/enumerations/time_entry_activities.json"
+    def __init__(self):
+        self.base_url = "https://redmine.sbps.ru"
+        self.time_entries_url = "/time_entries.json"
+        self.my_account_url = "/my/account.json"
+        self.datetime_format = "%Y-%m-%d"
+        self.time_entry_activities = "/enumerations/time_entry_activities.json"