From 81fe923fb39a522a61933c906438efc37ffc9435 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Fri, 23 Feb 2024 20:42:16 +0000
Subject: [PATCH 01/10] Add some first unit tests

---
 .idea/ActiveCollabAPI.iml             |  1 +
 .idea/runConfigurations/Unittests.xml | 20 +++++++
 ActiveCollabAPI/ACAuthenticator.py    | 21 ++++---
 main.py                               | 46 +++++++++------
 tests/__init__.py                     |  0
 tests/test_ACAuthenticator.py         | 85 +++++++++++++++++++++++++++
 6 files changed, 149 insertions(+), 24 deletions(-)
 create mode 100644 .idea/runConfigurations/Unittests.xml
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_ACAuthenticator.py

diff --git a/.idea/ActiveCollabAPI.iml b/.idea/ActiveCollabAPI.iml
index 078a7e4..ef1836e 100644
--- a/.idea/ActiveCollabAPI.iml
+++ b/.idea/ActiveCollabAPI.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
     <orderEntry type="jdk" jdkName="Python 3.10 (ActiveCollabAPI)" jdkType="Python SDK" />
diff --git a/.idea/runConfigurations/Unittests.xml b/.idea/runConfigurations/Unittests.xml
new file mode 100644
index 0000000..ab865b6
--- /dev/null
+++ b/.idea/runConfigurations/Unittests.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Unittests" type="tests" factoryName="Unittests">
+    <module name="ActiveCollabAPI" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/bin/python" />
+    <option name="SDK_NAME" value="Python 3.10 (ActiveCollabAPI)" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="_new_pattern" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_target" value="&quot;&quot;" />
+    <option name="_new_targetType" value="&quot;PATH&quot;" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/ActiveCollabAPI/ACAuthenticator.py b/ActiveCollabAPI/ACAuthenticator.py
index 0c96fb6..4c807e1 100644
--- a/ActiveCollabAPI/ACAuthenticator.py
+++ b/ActiveCollabAPI/ACAuthenticator.py
@@ -3,17 +3,20 @@ import json
 
 # 3rd party libs
 import requests
+from requests import Response
 
 from ActiveCollabAPI import AC_LOGIN_BASE_URL, AC_USER_AGENT
 
 
 class ACAuthenticator:
-
-    base_url = AC_LOGIN_BASE_URL
+    base_url = ""
 
     user = None
     accounts = None
 
+    def __init__(self, base_url: str):
+        self.base_url = base_url
+
     def headers(self):
         return {
             'Content-Type': 'application/json; charset=utf8',
@@ -21,14 +24,18 @@ class ACAuthenticator:
             'User-Agent': AC_USER_AGENT
         }
 
-    def login(self, email, password):
+    def login(self, email: str, password: str) -> Response:
         login_data = {
             'email': email,
             'password': password
         }
-        res = requests.post(self.base_url,
-                            data=json.dumps(login_data),
-                            headers=self.headers())
+        return requests.post(self.base_url,
+                             data=json.dumps(login_data),
+                             headers=self.headers())
+
+    def login_with_check(self, email: str, password: str):
+        res = self.login(email, password)
+
         if res.status_code != 200:
             raise Exception('Login failed!')
 
@@ -38,7 +45,7 @@ class ACAuthenticator:
 
         self.user = login_res['user']
         self.accounts = login_res['accounts']
-        return login_res
+        return res
 
     def find_account(self, value, key='user_display_name'):
         found = list(filter(lambda a: a[key] == value,
diff --git a/main.py b/main.py
index f9e6fff..d7f882b 100644
--- a/main.py
+++ b/main.py
@@ -2,6 +2,7 @@ import configparser
 import logging
 from pprint import pprint
 
+from ActiveCollabAPI import AC_LOGIN_BASE_URL
 from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
 from ActiveCollabAPI.ACClient import ACClient
 from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
@@ -19,7 +20,8 @@ requests_log = logging.getLogger("urllib3")
 requests_log.setLevel(logging.DEBUG)
 requests_log.propagate = True
 
-if __name__ == "__main__":
+
+def main():
     config = configparser.ConfigParser()
     config.read('config.ini')
 
@@ -28,32 +30,37 @@ if __name__ == "__main__":
     account_name = config['LOGIN']['account_name']
 
     # 1. you need to log in to get a session and a list of accounts
-    auth = ACAuthenticator()
-    session = auth.login(username, password)
-    pprint(session)
-    user = session['user']
+    auth = ACAuthenticator(AC_LOGIN_BASE_URL)
+    auth.login_with_check(username, password)
     # use first account
     account = auth.find_account(account_name)
 
     # 2. you need to get a token for this account
-    # token = ACTokenAuthenticator(account, user).issue_token_intent()
+    token = ACTokenAuthenticator(account, auth.user).issue_token_intent()
     # pprint(token)
 
     # 3. now you can query the API
-    # ac = ACClient(account, token)
+    ac = ACClient(account, token)
+
+    # check version
+    res = ac.get_info()
+    ac_version = res.json()
+    pprint(ac_version)
+    if ac_version['version'] != '7.4.337':
+        raise Exception("Supporting only Version 7.4.337!")
 
     # get a list of all projects
     # res = ac.get_projects()
     # pprint(res.json())
 
-    # get task with sub tasks
-    # https://app.activecollab.com/416910/projects/310/tasks/6274
+    # get task with sub-tasks
+    # "https://app.activecollab.com/416910/projects/310/tasks/6260"
     # project_id = 310
-    # task_id = 6281
+    # task_id = 6260
     # task_res = ac.get_project_task(project_id, task_id)
     # pprint(task_res.json())
     # task = task_res.json()
-    # res = ac.unassign_all_sub_task(task)
+    # ac.delete_all_open_subtasks(task)
 
     # create a new subtask for the task without assignment
     # subtask = {
@@ -66,10 +73,10 @@ if __name__ == "__main__":
     # pprint(res.json())
 
     # # bulk create subtasks
-    subtask_texts = []
-    with open("sub-tasks.txt", "r", encoding="utf-8") as fh:
-        for line in fh:
-            subtask_texts.append(line.rstrip('\n'))
+    # subtask_texts = []
+    # with open("sub-tasks.txt", "r", encoding="utf-8") as fh:
+    #     for line in fh:
+    #         subtask_texts.append(line.rstrip('\n'))
     # create
     # for text in subtask_texts:
     #     subtask['body'] = text
@@ -98,5 +105,10 @@ if __name__ == "__main__":
     # res = ac.delete_subtask(subtask)
     # pprint(res.json())
 
-    # res = ac.get_info()
-    # pprint(res.json())
+    res = ac.get_projects()
+    if res.status_code == 200:
+        pprint(res.json())
+
+
+if __name__ == "__main__":
+    main()
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tests/test_ACAuthenticator.py b/tests/test_ACAuthenticator.py
new file mode 100644
index 0000000..0e6ff5b
--- /dev/null
+++ b/tests/test_ACAuthenticator.py
@@ -0,0 +1,85 @@
+import json
+from unittest import TestCase
+from unittest.mock import patch
+
+from ActiveCollabAPI import AC_LOGIN_BASE_URL
+from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
+
+
+class TestACAuthenticator(TestCase):
+    def test_headers(self):
+        authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+        headers = authenticator.headers()
+        self.assertIn('Content-Type', headers)
+        self.assertEqual('application/json; charset=utf8', headers['Content-Type'])
+        self.assertIn('Accept', headers)
+        self.assertEqual('application/json', headers['Accept'])
+        self.assertIn('User-Agent', headers)
+
+    def mock_login_success(self):
+        return {
+            "accounts": [
+                {
+                    "name": 12345678,
+                    "url": "https:\/\/app.activecollab.com\/12345678",
+                    "display_name": "433339",
+                    "user_display_name": "#12345678",
+                    "position": 1,
+                    "class": "ActiveCollab\\Shepherd\\Model\\Account\\ActiveCollab\\FeatherAccount",
+                    "status": "trial"
+                }
+            ],
+            "is_ok": 1,
+            "user": {
+                "avatar_url": "https:\/\/activecollab.com\/avatar.php?user_id=12345678&size=80",
+                "first_name": "users first",
+                "last_name": "users last",
+                "intent": "random-string"}
+        }
+
+    def mock_login_failed(self):
+        return {
+            "is_ok": 3
+        }
+
+    def test_login_success_gets_user_and_accounts_list(self):
+        with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+            mock_post.return_value.status_code = 200
+            mock_post.return_value.json.return_value = self.mock_login_success()
+
+            email = "collab@example.com"
+            password = "VeryS3cret!"
+            authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+            response = authenticator.login_with_check(email, password)
+
+            self.assertEquals(200, response.status_code)
+            res_data = response.json()
+            self.assertEqual(1, res_data['is_ok'])
+            user = res_data["user"]
+            self.assertEqual("users first", user["first_name"])
+            self.assertEqual("users last", user["last_name"])
+            accounts = res_data["accounts"]
+            self.assertGreater(len(accounts), 0)
+            self.assertEqual(12345678, accounts[0]["name"])
+
+    def test_login_failed_http401(self):
+        with self.assertRaises(Exception) as exc:
+            with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+                mock_post.return_value.status_code = 401
+                mock_post.return_value.json.return_value = self.mock_login_failed()
+
+                email = "collab@example.com"
+                password = "VeryS3cret!"
+                authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+                response = authenticator.login_with_check(email, password)
+
+    def test_login_failed_not_ok(self):
+        with self.assertRaises(Exception) as exc:
+            with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+                mock_post.return_value.status_code = 200
+                mock_post.return_value.json.return_value = self.mock_login_failed()
+
+                email = "collab@example.com"
+                password = "VeryS3cret!"
+                authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+                response = authenticator.login_with_check(email, password)

From 662b75e224b5645f6e7a43a0dd86204cc6f3ef4d Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Fri, 23 Feb 2024 21:08:10 +0000
Subject: [PATCH 02/10] Fixes

---
 tests/test_ACAuthenticator.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/test_ACAuthenticator.py b/tests/test_ACAuthenticator.py
index 0e6ff5b..98d9b3d 100644
--- a/tests/test_ACAuthenticator.py
+++ b/tests/test_ACAuthenticator.py
@@ -52,7 +52,7 @@ class TestACAuthenticator(TestCase):
             authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
             response = authenticator.login_with_check(email, password)
 
-            self.assertEquals(200, response.status_code)
+            self.assertEqual(200, response.status_code)
             res_data = response.json()
             self.assertEqual(1, res_data['is_ok'])
             user = res_data["user"]
@@ -71,7 +71,7 @@ class TestACAuthenticator(TestCase):
                 email = "collab@example.com"
                 password = "VeryS3cret!"
                 authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
-                response = authenticator.login_with_check(email, password)
+                authenticator.login_with_check(email, password)
 
     def test_login_failed_not_ok(self):
         with self.assertRaises(Exception) as exc:
@@ -82,4 +82,4 @@ class TestACAuthenticator(TestCase):
                 email = "collab@example.com"
                 password = "VeryS3cret!"
                 authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
-                response = authenticator.login_with_check(email, password)
+                authenticator.login_with_check(email, password)

From 4be5d4c3259b1f7a9e4dae18dd3ef69ef4a9c557 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Sat, 24 Feb 2024 12:02:12 +0000
Subject: [PATCH 03/10] Reorg code and tests

DON'T use main.py
---
 .gitignore                                    |  1 +
 .idea/ActiveCollabAPI.iml                     |  1 +
 .idea/runConfigurations/Integrationtests.xml  | 20 ++++++
 .idea/runConfigurations/Unittests.xml         |  2 +-
 ActiveCollabAPI/ACAuthenticator.py            | 27 +-------
 ActiveCollabAPI/ACTokenAuthenticator.py       | 38 +++++-------
 ActiveCollabAPI/AcAccount.py                  | 12 ++++
 ActiveCollabAPI/AcSession.py                  | 13 ++++
 ActiveCollabAPI/AcToken.py                    |  6 ++
 ActiveCollabAPI/AcUser.py                     |  9 +++
 ActiveCollabAPI/ActiveCollab.py               | 62 +++++++++++++++++++
 Dockerfile                                    |  2 +-
 integration_tests/__init__.py                 |  2 +
 integration_tests/test_Integration_AcLogin.py | 22 +++++++
 main.py                                       | 10 +--
 test-config.json                              |  8 +++
 tests/test_ACAuthenticator.py                 | 62 ++++++++++---------
 tests/test_ACTokenAuthenticator.py            | 59 ++++++++++++++++++
 18 files changed, 271 insertions(+), 85 deletions(-)
 create mode 100644 .idea/runConfigurations/Integrationtests.xml
 create mode 100644 ActiveCollabAPI/AcAccount.py
 create mode 100644 ActiveCollabAPI/AcSession.py
 create mode 100644 ActiveCollabAPI/AcToken.py
 create mode 100644 ActiveCollabAPI/AcUser.py
 create mode 100644 ActiveCollabAPI/ActiveCollab.py
 create mode 100644 integration_tests/__init__.py
 create mode 100644 integration_tests/test_Integration_AcLogin.py
 create mode 100644 test-config.json
 create mode 100644 tests/test_ACTokenAuthenticator.py

diff --git a/.gitignore b/.gitignore
index d708872..28dbaf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 config.ini
 .venv/
 __pycache__/
+config-mira.ini
diff --git a/.idea/ActiveCollabAPI.iml b/.idea/ActiveCollabAPI.iml
index ef1836e..b52f417 100644
--- a/.idea/ActiveCollabAPI.iml
+++ b/.idea/ActiveCollabAPI.iml
@@ -3,6 +3,7 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/integration_tests" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/.venv" />
     </content>
diff --git a/.idea/runConfigurations/Integrationtests.xml b/.idea/runConfigurations/Integrationtests.xml
new file mode 100644
index 0000000..675ce8b
--- /dev/null
+++ b/.idea/runConfigurations/Integrationtests.xml
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Integrationtests" type="tests" factoryName="Unittests">
+    <module name="ActiveCollabAPI" />
+    <option name="ENV_FILES" value="" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <option name="SDK_HOME" value="$PROJECT_DIR$/.venv/bin/python" />
+    <option name="SDK_NAME" value="Python 3.10 (ActiveCollabAPI)" />
+    <option name="WORKING_DIRECTORY" value="" />
+    <option name="IS_MODULE_SDK" value="false" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
+    <option name="_new_pattern" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;discover integration_tests&quot;" />
+    <option name="_new_target" value="&quot;&quot;" />
+    <option name="_new_targetType" value="&quot;PATH&quot;" />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Unittests.xml b/.idea/runConfigurations/Unittests.xml
index ab865b6..0a85783 100644
--- a/.idea/runConfigurations/Unittests.xml
+++ b/.idea/runConfigurations/Unittests.xml
@@ -12,7 +12,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="_new_pattern" value="&quot;&quot;" />
-    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;discover tests&quot;" />
     <option name="_new_target" value="&quot;&quot;" />
     <option name="_new_targetType" value="&quot;PATH&quot;" />
     <method v="2" />
diff --git a/ActiveCollabAPI/ACAuthenticator.py b/ActiveCollabAPI/ACAuthenticator.py
index 4c807e1..6dcd140 100644
--- a/ActiveCollabAPI/ACAuthenticator.py
+++ b/ActiveCollabAPI/ACAuthenticator.py
@@ -5,14 +5,12 @@ import json
 import requests
 from requests import Response
 
-from ActiveCollabAPI import AC_LOGIN_BASE_URL, AC_USER_AGENT
+from ActiveCollabAPI import AC_USER_AGENT
 
 
 class ACAuthenticator:
-    base_url = ""
 
-    user = None
-    accounts = None
+    base_url: str = ""
 
     def __init__(self, base_url: str):
         self.base_url = base_url
@@ -32,24 +30,3 @@ class ACAuthenticator:
         return requests.post(self.base_url,
                              data=json.dumps(login_data),
                              headers=self.headers())
-
-    def login_with_check(self, email: str, password: str):
-        res = self.login(email, password)
-
-        if res.status_code != 200:
-            raise Exception('Login failed!')
-
-        login_res = res.json()
-        if login_res['is_ok'] != 1:
-            raise Exception('Login failed! (2)')
-
-        self.user = login_res['user']
-        self.accounts = login_res['accounts']
-        return res
-
-    def find_account(self, value, key='user_display_name'):
-        found = list(filter(lambda a: a[key] == value,
-                            self.accounts))
-        if len(found) == 0:
-            raise Exception("Account '%s=%s' not found!" % (key, value))
-        return found[0]
diff --git a/ActiveCollabAPI/ACTokenAuthenticator.py b/ActiveCollabAPI/ACTokenAuthenticator.py
index ba1f929..dd52398 100644
--- a/ActiveCollabAPI/ACTokenAuthenticator.py
+++ b/ActiveCollabAPI/ACTokenAuthenticator.py
@@ -1,39 +1,18 @@
 import json
 
 import requests
+from requests import Response
 
 from ActiveCollabAPI import AC_USER_AGENT, AC_API_VERSION, AC_API_CLIENT_NAME, AC_API_CLIENT_VENDOR
 
 
 class ACTokenAuthenticator:
 
-    account = None
-    user = None
     base_url = ""
-    token = None
 
-    def __init__(self, account, user):
-        self.account = account
-        self.user = user
-        #
-        self.base_url = self.account['url'] + '/api/v%s' % AC_API_VERSION
+    def __init__(self, base_url: str):
+        self.base_url = base_url
 
-    def issue_token_intent(self):
-        # use intent to get a token
-        data = {
-            'intent': self.user['intent'],
-            'client_name': AC_API_CLIENT_NAME,
-            'client_vendor': AC_API_CLIENT_VENDOR
-        }
-        r = requests.post(self.base_url+ '/issue-token-intent',
-                          headers=self.headers(),
-                          data=json.dumps(data))
-        if r.status_code != 200:
-            raise Exception('Error in issuing token intent!')
-        token_res = r.json()
-        if token_res['is_ok'] != 1:
-            raise Exception('Error in issuing token (2)')
-        return token_res['token']
 
     def headers(self):
         return {
@@ -41,3 +20,14 @@ class ACTokenAuthenticator:
             'Accept': 'application/json',
             'User-Agent': AC_USER_AGENT
         }
+
+    def issue_token_intent(self, intent: str) -> Response:
+        # use intent to get a token
+        data = {
+            'intent': intent,
+            'client_name': AC_API_CLIENT_NAME,
+            'client_vendor': AC_API_CLIENT_VENDOR
+        }
+        return requests.post(self.base_url+ '/issue-token-intent',
+                          headers=self.headers(),
+                          data=json.dumps(data))
diff --git a/ActiveCollabAPI/AcAccount.py b/ActiveCollabAPI/AcAccount.py
new file mode 100644
index 0000000..292187a
--- /dev/null
+++ b/ActiveCollabAPI/AcAccount.py
@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class AcAccount:
+    name: int
+    url: str
+    display_name: str
+    user_display_name: str
+    position: int
+    class_: str
+    status: str
diff --git a/ActiveCollabAPI/AcSession.py b/ActiveCollabAPI/AcSession.py
new file mode 100644
index 0000000..723ec95
--- /dev/null
+++ b/ActiveCollabAPI/AcSession.py
@@ -0,0 +1,13 @@
+from dataclasses import dataclass
+
+from ActiveCollabAPI.AcAccount import AcAccount
+from ActiveCollabAPI.AcToken import AcToken
+from ActiveCollabAPI.AcUser import AcUser
+
+
+@dataclass
+class AcSession:
+    user: AcUser
+    accounts: [AcAccount]
+    cur_account: AcAccount
+    token: AcToken
diff --git a/ActiveCollabAPI/AcToken.py b/ActiveCollabAPI/AcToken.py
new file mode 100644
index 0000000..98083a4
--- /dev/null
+++ b/ActiveCollabAPI/AcToken.py
@@ -0,0 +1,6 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class AcToken:
+    token: str
diff --git a/ActiveCollabAPI/AcUser.py b/ActiveCollabAPI/AcUser.py
new file mode 100644
index 0000000..98f8f93
--- /dev/null
+++ b/ActiveCollabAPI/AcUser.py
@@ -0,0 +1,9 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class AcUser:
+    avatar_url: str
+    first_name: str
+    last_name: str
+    intent: str
diff --git a/ActiveCollabAPI/ActiveCollab.py b/ActiveCollabAPI/ActiveCollab.py
new file mode 100644
index 0000000..ee83937
--- /dev/null
+++ b/ActiveCollabAPI/ActiveCollab.py
@@ -0,0 +1,62 @@
+from dataclasses import dataclass
+
+from ActiveCollabAPI import AC_API_VERSION
+from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
+from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
+from ActiveCollabAPI.AcAccount import AcAccount
+from ActiveCollabAPI.AcSession import AcSession
+from ActiveCollabAPI.AcToken import AcToken
+from ActiveCollabAPI.AcUser import AcUser
+
+
+@dataclass
+class AcLoginResponse:
+    user: AcUser
+    accounts: list[AcAccount]
+
+
+class ActiveCollab:
+    base_url: str = ""
+
+    def __init__(self, base_url: str):
+        self.base_url = base_url
+
+    def login_to_first_account(self, email: str, password: str) -> AcSession:
+        login_res = self.user_login(email, password)
+        cur_account = self.select_first_account(login_res.accounts)
+        token = self.create_token(cur_account, login_res.user)
+        session = AcSession(login_res.user, login_res.accounts, cur_account, token)
+        return session
+
+    def user_login(self, email: str, password: str) -> AcLoginResponse:
+        auth = ACAuthenticator(self.base_url)
+        res = auth.login(email, password)
+        if res.status_code != 200:
+            raise Exception('Login failed!')
+        res_data = res.json()
+        if res_data['is_ok'] != 1:
+            raise Exception('Login failed! (2)')
+
+        def map_acccount(a) -> AcAccount:
+            a["class_"] = a["class"]
+            del a["class"]
+            return AcAccount(**a)
+
+        accounts = list(map(lambda a: map_acccount(a), res_data['accounts']))
+        return AcLoginResponse(AcUser(**res_data['user']), accounts)
+
+    def select_first_account(self, accounts: list[AcAccount]) -> AcAccount:
+        return accounts[0]
+
+    def create_token(self, account: AcAccount, user: AcUser) -> AcToken:
+        authenticator = ACTokenAuthenticator(account.url + '/api/v%s' % AC_API_VERSION)
+        res = authenticator.issue_token_intent(user.intent)
+        if res.status_code != 200:
+            raise Exception('Request token failed!')
+        res_data = res.json()
+        if res_data['is_ok'] != 1:
+            raise Exception('Request token failed! (2)')
+        return AcToken(res_data["token"])
+
+    def get_projects(self):
+        pass
diff --git a/Dockerfile b/Dockerfile
index e12d8b2..767211f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get clean \
     && apt-get update \
     && apt-get upgrade -y
-RUN apt-get install -y python3 python3-pip
+RUN apt-get install -y python3 python3-pip build-essential
 COPY requirements.txt /tmp/requirements.txt
 RUN pip3 install -r /tmp/requirements.txt
 
diff --git a/integration_tests/__init__.py b/integration_tests/__init__.py
new file mode 100644
index 0000000..139597f
--- /dev/null
+++ b/integration_tests/__init__.py
@@ -0,0 +1,2 @@
+
+
diff --git a/integration_tests/test_Integration_AcLogin.py b/integration_tests/test_Integration_AcLogin.py
new file mode 100644
index 0000000..fbe4a9c
--- /dev/null
+++ b/integration_tests/test_Integration_AcLogin.py
@@ -0,0 +1,22 @@
+import json
+from pprint import pprint
+from unittest import TestCase
+
+from ActiveCollabAPI.ActiveCollab import ActiveCollab
+
+with open("test-config.json", "r") as cfg:
+    config = json.load(cfg)
+
+
+class Test_Integration_Login(TestCase):
+
+    def test_login_success(self):
+        ac = ActiveCollab(config["base_url"])
+        session = ac.login_to_first_account(config["username"], config["password"])
+        pprint(session)
+
+        self.assertEqual(config["first_name"], session.user.first_name)
+        self.assertEqual(config["last_name"], session.user.last_name)
+
+        self.assertEqual(1, len(session.accounts))
+        self.assertGreater(len(session.token.token), 5)
diff --git a/main.py b/main.py
index d7f882b..fe3c53d 100644
--- a/main.py
+++ b/main.py
@@ -12,6 +12,8 @@ from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
 # the only thing missing will be the response.body which is not logged.
 from http.client import HTTPConnection
 
+from ActiveCollabAPI.ActiveCollab import ActiveCollab
+
 HTTPConnection.debuglevel = 1
 
 logging.basicConfig()  # you need to initialize logging, otherwise you will not see anything from requests
@@ -30,10 +32,10 @@ def main():
     account_name = config['LOGIN']['account_name']
 
     # 1. you need to log in to get a session and a list of accounts
-    auth = ACAuthenticator(AC_LOGIN_BASE_URL)
-    auth.login_with_check(username, password)
-    # use first account
-    account = auth.find_account(account_name)
+    ac = ActiveCollab(AC_LOGIN_BASE_URL)
+    session = ac.login(username, password)
+    account = ac.get_account(session)  # default returning first account
+    token = ac.get_token(account, session.user)
 
     # 2. you need to get a token for this account
     token = ACTokenAuthenticator(account, auth.user).issue_token_intent()
diff --git a/test-config.json b/test-config.json
new file mode 100644
index 0000000..c989bc4
--- /dev/null
+++ b/test-config.json
@@ -0,0 +1,8 @@
+{
+  "base_url": "https://activecollab.com/api/v1/external/login",
+  "username": "packend_ja.05@icloud.com",
+  "password": "myqkyc-muntuh-haRti6",
+
+  "first_name": "packend_ja",
+  "last_name": ".05@icloud.com"
+}
\ No newline at end of file
diff --git a/tests/test_ACAuthenticator.py b/tests/test_ACAuthenticator.py
index 98d9b3d..9bf9725 100644
--- a/tests/test_ACAuthenticator.py
+++ b/tests/test_ACAuthenticator.py
@@ -7,14 +7,6 @@ from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
 
 
 class TestACAuthenticator(TestCase):
-    def test_headers(self):
-        authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
-        headers = authenticator.headers()
-        self.assertIn('Content-Type', headers)
-        self.assertEqual('application/json; charset=utf8', headers['Content-Type'])
-        self.assertIn('Accept', headers)
-        self.assertEqual('application/json', headers['Accept'])
-        self.assertIn('User-Agent', headers)
 
     def mock_login_success(self):
         return {
@@ -37,10 +29,6 @@ class TestACAuthenticator(TestCase):
                 "intent": "random-string"}
         }
 
-    def mock_login_failed(self):
-        return {
-            "is_ok": 3
-        }
 
     def test_login_success_gets_user_and_accounts_list(self):
         with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
@@ -50,7 +38,7 @@ class TestACAuthenticator(TestCase):
             email = "collab@example.com"
             password = "VeryS3cret!"
             authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
-            response = authenticator.login_with_check(email, password)
+            response = authenticator.login(email, password)
 
             self.assertEqual(200, response.status_code)
             res_data = response.json()
@@ -62,24 +50,38 @@ class TestACAuthenticator(TestCase):
             self.assertGreater(len(accounts), 0)
             self.assertEqual(12345678, accounts[0]["name"])
 
-    def test_login_failed_http401(self):
-        with self.assertRaises(Exception) as exc:
-            with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
-                mock_post.return_value.status_code = 401
-                mock_post.return_value.json.return_value = self.mock_login_failed()
 
-                email = "collab@example.com"
-                password = "VeryS3cret!"
-                authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
-                authenticator.login_with_check(email, password)
+    def mock_login_failed(self):
+        return {
+            "is_ok": 0
+        }
 
     def test_login_failed_not_ok(self):
-        with self.assertRaises(Exception) as exc:
-            with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
-                mock_post.return_value.status_code = 200
-                mock_post.return_value.json.return_value = self.mock_login_failed()
+        with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+            mock_post.return_value.status_code = 200
+            mock_post.return_value.json.return_value = self.mock_login_failed()
 
-                email = "collab@example.com"
-                password = "VeryS3cret!"
-                authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
-                authenticator.login_with_check(email, password)
+            email = "collab@example.com"
+            password = "VeryS3cret!"
+            authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+            response = authenticator.login(email, password)
+
+            self.assertEqual(200, response.status_code)
+            res_data = response.json()
+            self.assertNotEqual(1, res_data['is_ok'])
+
+
+    def mock_login_forbidden(self):
+        return {
+        }
+    def test_login_forbidden(self):
+        with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+            mock_post.return_value.status_code = 401
+            mock_post.return_value.json.return_value = self.mock_login_forbidden()
+
+            email = "collab@example.com"
+            password = "VeryS3cret!"
+            authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+            response = authenticator.login(email, password)
+
+            self.assertEqual(401, response.status_code)
diff --git a/tests/test_ACTokenAuthenticator.py b/tests/test_ACTokenAuthenticator.py
new file mode 100644
index 0000000..3af05ef
--- /dev/null
+++ b/tests/test_ACTokenAuthenticator.py
@@ -0,0 +1,59 @@
+from unittest import TestCase
+from unittest.mock import patch
+
+from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
+
+
+class TestACTokenAuthenticator(TestCase):
+
+    def mock_token_success(self):
+        return {
+            "is_ok": 1,
+            "token": "abcdef"
+        }
+
+    def test_issue_token_intent_success(self):
+        with patch("ActiveCollabAPI.ACTokenAuthenticator.requests.post") as mock_post:
+            mock_post.return_value.status_code = 200
+            mock_post.return_value.json.return_value = self.mock_token_success()
+
+            auth = ACTokenAuthenticator("http://mock")
+            res = auth.issue_token_intent("this-is-the-token-intent-string")
+
+            self.assertEqual(200, res.status_code)
+            res_data = res.json()
+            self.assertEqual(1, res_data["is_ok"])
+
+    def mock_token_not_ok(self):
+        return {
+            "is_ok": 0,
+            "token": "abcdef"
+        }
+
+    def test_issue_token_intent_not_ok(self):
+        with patch("ActiveCollabAPI.ACTokenAuthenticator.requests.post") as mock_post:
+            mock_post.return_value.status_code = 200
+            mock_post.return_value.json.return_value = self.mock_token_not_ok()
+
+            auth = ACTokenAuthenticator("http://mock")
+            res = auth.issue_token_intent("this-is-the-token-intent-string")
+
+            self.assertEqual(200, res.status_code)
+            res_data = res.json()
+            self.assertNotEqual(1, res_data["is_ok"])
+
+    def mock_token_forbidden(self):
+        return {
+        }
+
+    def test_issue_token_intent_forbidden(self):
+        with patch("ActiveCollabAPI.ACTokenAuthenticator.requests.post") as mock_post:
+            mock_post.return_value.status_code = 401
+            mock_post.return_value.json.return_value = self.mock_token_forbidden()
+
+            auth = ACTokenAuthenticator("http://mock")
+            res = auth.issue_token_intent("this-is-the-token-intent-string")
+
+            self.assertEqual(401, res.status_code)
+
+

From 3d6fc320304464ee5792346f6634a5ec08a8886f Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Sat, 24 Feb 2024 17:42:26 +0000
Subject: [PATCH 04/10] Add get projects

---
 ActiveCollabAPI/ACClient.py                   |  8 +--
 ActiveCollabAPI/AcLoginResponse.py            | 10 ++++
 ActiveCollabAPI/AcProject.py                  | 54 +++++++++++++++++++
 ActiveCollabAPI/ActiveCollab.py               | 23 +++++---
 integration_tests/test_Integration_AcLogin.py | 11 ++--
 5 files changed, 92 insertions(+), 14 deletions(-)
 create mode 100644 ActiveCollabAPI/AcLoginResponse.py
 create mode 100644 ActiveCollabAPI/AcProject.py

diff --git a/ActiveCollabAPI/ACClient.py b/ActiveCollabAPI/ACClient.py
index 6cc400b..4deaca9 100644
--- a/ActiveCollabAPI/ACClient.py
+++ b/ActiveCollabAPI/ACClient.py
@@ -3,6 +3,8 @@ import json
 import requests
 
 from ActiveCollabAPI import AC_USER_AGENT, AC_API_VERSION
+from ActiveCollabAPI.AcAccount import AcAccount
+from ActiveCollabAPI.AcToken import AcToken
 
 
 class ACClient:
@@ -10,17 +12,17 @@ class ACClient:
     account = None
     token = None
 
-    def __init__(self, account, token):
+    def __init__(self, account: AcAccount, token: AcToken):
         self.account = account
         self.token = token
         #
-        self.base_url = self.account['url'] + '/api/v%d' % AC_API_VERSION
+        self.base_url = self.account.url + '/api/v%d' % AC_API_VERSION
 
     def headers(self):
         return {
             'Content-Type': 'application/json; charset=utf8',
             'Accept': 'application/json',
-            'X-Angie-AuthApiToken': self.token,
+            'X-Angie-AuthApiToken': self.token.token,
             'User-Agent': AC_USER_AGENT
         }
 
diff --git a/ActiveCollabAPI/AcLoginResponse.py b/ActiveCollabAPI/AcLoginResponse.py
new file mode 100644
index 0000000..4105ea8
--- /dev/null
+++ b/ActiveCollabAPI/AcLoginResponse.py
@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+from ActiveCollabAPI.AcUser import AcUser
+from ActiveCollabAPI.AcAccount import AcAccount
+
+
+@dataclass
+class AcLoginResponse:
+    user: AcUser
+    accounts: list[AcAccount]
diff --git a/ActiveCollabAPI/AcProject.py b/ActiveCollabAPI/AcProject.py
new file mode 100644
index 0000000..4e4b814
--- /dev/null
+++ b/ActiveCollabAPI/AcProject.py
@@ -0,0 +1,54 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class AcProject:
+    based_on_id: int
+    based_on_type: str
+    body: str
+    body_formatted: str
+    budget: float
+    budget_type: str
+    budgeting_interval: str
+    category_id: int
+    class_: str
+    company_id: int
+    completed_by_id: int
+    completed_on: int
+    count_discussions: int
+    count_files: int
+    count_notes: int
+    count_tasks: int
+    created_by_email: str
+    created_by_id: int
+    created_by_name: str
+    created_on: int
+    currency_id: int
+    email: str
+    file_size: int
+    id: int
+    is_billable: bool
+    is_client_reporting_enabled: bool
+    is_completed: bool
+    is_estimate_visible_to_subcontractors: bool
+    is_sample: bool
+    is_tracking_enabled: bool
+    is_trashed: bool
+    label_id: int
+    last_activity_on: int
+    leader_id: int
+    members: list[int]
+    members_can_change_billable: bool
+    name: str
+    project_number: int
+    trashed_by_id: int
+    trashed_on: int
+    updated_by_id: int
+    updated_on: int
+    url_path: str
+
+
+def project_from_json(json_obj: dict) -> AcProject:
+    json_obj["class_"] = json_obj["class"]
+    del json_obj["class"]
+    return AcProject(**json_obj)
diff --git a/ActiveCollabAPI/ActiveCollab.py b/ActiveCollabAPI/ActiveCollab.py
index ee83937..20f24d8 100644
--- a/ActiveCollabAPI/ActiveCollab.py
+++ b/ActiveCollabAPI/ActiveCollab.py
@@ -2,22 +2,23 @@ from dataclasses import dataclass
 
 from ActiveCollabAPI import AC_API_VERSION
 from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
+from ActiveCollabAPI.ACClient import ACClient
 from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
 from ActiveCollabAPI.AcAccount import AcAccount
+from ActiveCollabAPI.AcLoginResponse import AcLoginResponse
+from ActiveCollabAPI.AcProject import AcProject, project_from_json
 from ActiveCollabAPI.AcSession import AcSession
 from ActiveCollabAPI.AcToken import AcToken
 from ActiveCollabAPI.AcUser import AcUser
 
 
-@dataclass
-class AcLoginResponse:
-    user: AcUser
-    accounts: list[AcAccount]
-
 
 class ActiveCollab:
+
     base_url: str = ""
 
+    session: AcSession = None
+
     def __init__(self, base_url: str):
         self.base_url = base_url
 
@@ -25,8 +26,8 @@ class ActiveCollab:
         login_res = self.user_login(email, password)
         cur_account = self.select_first_account(login_res.accounts)
         token = self.create_token(cur_account, login_res.user)
-        session = AcSession(login_res.user, login_res.accounts, cur_account, token)
-        return session
+        self.session = AcSession(login_res.user, login_res.accounts, cur_account, token)
+        return self.session
 
     def user_login(self, email: str, password: str) -> AcLoginResponse:
         auth = ACAuthenticator(self.base_url)
@@ -59,4 +60,10 @@ class ActiveCollab:
         return AcToken(res_data["token"])
 
     def get_projects(self):
-        pass
+        client = ACClient(self.session.cur_account, self.session.token)
+        res = client.get_projects()
+        if res.status_code != 200:
+            raise Exception("Error %d" % res.status_code)
+        res_data = res.json()
+        projects = list(map(lambda p: project_from_json(p), res_data))
+        return projects
diff --git a/integration_tests/test_Integration_AcLogin.py b/integration_tests/test_Integration_AcLogin.py
index fbe4a9c..827ed95 100644
--- a/integration_tests/test_Integration_AcLogin.py
+++ b/integration_tests/test_Integration_AcLogin.py
@@ -13,10 +13,15 @@ class Test_Integration_Login(TestCase):
     def test_login_success(self):
         ac = ActiveCollab(config["base_url"])
         session = ac.login_to_first_account(config["username"], config["password"])
-        pprint(session)
-
         self.assertEqual(config["first_name"], session.user.first_name)
         self.assertEqual(config["last_name"], session.user.last_name)
-
         self.assertEqual(1, len(session.accounts))
         self.assertGreater(len(session.token.token), 5)
+
+    def test_get_projects(self):
+        ac = ActiveCollab(config["base_url"])
+        ac.login_to_first_account(config["username"], config["password"])
+        projects = ac.get_projects()
+        self.assertGreater(len(projects), 0)
+        self.assertEqual('Project', projects[0].class_)
+        self.assertGreater(projects[0].id, 0)

From bec839e98e1930179a7ad36855845f5eb9bd5aaa Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Sat, 24 Feb 2024 17:46:46 +0000
Subject: [PATCH 05/10] Refactor create AcAccount from json

---
 ActiveCollabAPI/AcAccount.py    |  6 ++++++
 ActiveCollabAPI/ActiveCollab.py | 10 ++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ActiveCollabAPI/AcAccount.py b/ActiveCollabAPI/AcAccount.py
index 292187a..0b3c254 100644
--- a/ActiveCollabAPI/AcAccount.py
+++ b/ActiveCollabAPI/AcAccount.py
@@ -10,3 +10,9 @@ class AcAccount:
     position: int
     class_: str
     status: str
+
+
+def account_from_json(a) -> AcAccount:
+    a["class_"] = a["class"]
+    del a["class"]
+    return AcAccount(**a)
diff --git a/ActiveCollabAPI/ActiveCollab.py b/ActiveCollabAPI/ActiveCollab.py
index 20f24d8..f25750f 100644
--- a/ActiveCollabAPI/ActiveCollab.py
+++ b/ActiveCollabAPI/ActiveCollab.py
@@ -4,7 +4,7 @@ from ActiveCollabAPI import AC_API_VERSION
 from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
 from ActiveCollabAPI.ACClient import ACClient
 from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
-from ActiveCollabAPI.AcAccount import AcAccount
+from ActiveCollabAPI.AcAccount import AcAccount, account_from_json
 from ActiveCollabAPI.AcLoginResponse import AcLoginResponse
 from ActiveCollabAPI.AcProject import AcProject, project_from_json
 from ActiveCollabAPI.AcSession import AcSession
@@ -37,13 +37,7 @@ class ActiveCollab:
         res_data = res.json()
         if res_data['is_ok'] != 1:
             raise Exception('Login failed! (2)')
-
-        def map_acccount(a) -> AcAccount:
-            a["class_"] = a["class"]
-            del a["class"]
-            return AcAccount(**a)
-
-        accounts = list(map(lambda a: map_acccount(a), res_data['accounts']))
+        accounts = list(map(lambda a: account_from_json(a), res_data['accounts']))
         return AcLoginResponse(AcUser(**res_data['user']), accounts)
 
     def select_first_account(self, accounts: list[AcAccount]) -> AcAccount:

From 17f3f29c763473f49d5efd744f509b762d8e9048 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Sun, 25 Feb 2024 12:37:47 +0000
Subject: [PATCH 06/10] Add first version for usage as CLI Tool

NOT FINISHED!
---
 ActiveCollabAPI/AcAccount.py    |   9 ++
 ActiveCollabAPI/AcProject.py    |  11 +++
 ActiveCollabAPI/AcSession.py    |  10 ++
 ActiveCollabAPI/AcUser.py       |   9 ++
 ActiveCollabAPI/ActiveCollab.py |   5 +
 README.md                       |  46 ++++-----
 main.py                         | 162 +++++++++++++-------------------
 7 files changed, 125 insertions(+), 127 deletions(-)

diff --git a/ActiveCollabAPI/AcAccount.py b/ActiveCollabAPI/AcAccount.py
index 0b3c254..6e691e8 100644
--- a/ActiveCollabAPI/AcAccount.py
+++ b/ActiveCollabAPI/AcAccount.py
@@ -1,3 +1,4 @@
+import dataclasses
 from dataclasses import dataclass
 
 
@@ -11,6 +12,14 @@ class AcAccount:
     class_: str
     status: str
 
+    def to_dict(self):
+        d = dataclasses.asdict(self)
+        d["class"] = d["class_"]
+        del d["class_"]
+        return d
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
 
 def account_from_json(a) -> AcAccount:
     a["class_"] = a["class"]
diff --git a/ActiveCollabAPI/AcProject.py b/ActiveCollabAPI/AcProject.py
index 4e4b814..07b91ce 100644
--- a/ActiveCollabAPI/AcProject.py
+++ b/ActiveCollabAPI/AcProject.py
@@ -1,3 +1,5 @@
+import dataclasses
+import json
 from dataclasses import dataclass
 
 
@@ -47,6 +49,15 @@ class AcProject:
     updated_on: int
     url_path: str
 
+    def to_dict(self):
+        d = dataclasses.asdict(self)
+        d["class"] = d["class_"]
+        del d["class_"]
+        return d
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
+
 
 def project_from_json(json_obj: dict) -> AcProject:
     json_obj["class_"] = json_obj["class"]
diff --git a/ActiveCollabAPI/AcSession.py b/ActiveCollabAPI/AcSession.py
index 723ec95..32b707c 100644
--- a/ActiveCollabAPI/AcSession.py
+++ b/ActiveCollabAPI/AcSession.py
@@ -1,3 +1,5 @@
+import dataclasses
+import json
 from dataclasses import dataclass
 
 from ActiveCollabAPI.AcAccount import AcAccount
@@ -11,3 +13,11 @@ class AcSession:
     accounts: [AcAccount]
     cur_account: AcAccount
     token: AcToken
+
+    def to_dict(self):
+        d = dataclasses.asdict(self)
+        d["accounts"] = list(map(lambda a: a.to_dict(), self.accounts))
+        return d
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
\ No newline at end of file
diff --git a/ActiveCollabAPI/AcUser.py b/ActiveCollabAPI/AcUser.py
index 98f8f93..6e15351 100644
--- a/ActiveCollabAPI/AcUser.py
+++ b/ActiveCollabAPI/AcUser.py
@@ -1,3 +1,5 @@
+import dataclasses
+import json
 from dataclasses import dataclass
 
 
@@ -7,3 +9,10 @@ class AcUser:
     first_name: str
     last_name: str
     intent: str
+
+    def to_dict(self):
+        d = dataclasses.asdict(self)
+        return d
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
\ No newline at end of file
diff --git a/ActiveCollabAPI/ActiveCollab.py b/ActiveCollabAPI/ActiveCollab.py
index f25750f..47a000d 100644
--- a/ActiveCollabAPI/ActiveCollab.py
+++ b/ActiveCollabAPI/ActiveCollab.py
@@ -53,6 +53,11 @@ class ActiveCollab:
             raise Exception('Request token failed! (2)')
         return AcToken(res_data["token"])
 
+    def get_info(self):
+        client = ACClient(self.session.cur_account, self.session.token)
+        res = client.get_info()
+        return res.json()
+
     def get_projects(self):
         client = ACClient(self.session.cur_account, self.session.token)
         res = client.get_projects()
diff --git a/README.md b/README.md
index 9279c70..66c8d17 100644
--- a/README.md
+++ b/README.md
@@ -14,39 +14,29 @@
 2. Request a token for some Account (user could have multiple accounts) using the Account `url` and the users `intent`
 3. Use the token to authenticate for every other API-Call
 
-Example login:
+## CLI (Work in progress)
 
-```python
-auth = ACAuthenticator()
-session = auth.login(username, password)
-pprint(session)
-user = session['user']
-# use first account
-account = auth.find_account(account_name)
-```
+> activecollab [options] [command] [object] [arguments]
 
-Example request token
+### Options
 
-```python
-token = ACTokenAuthenticator(account, user).issue_token_intent()
-pprint(token)
-```
+- config=<file> - read config from file (json)
 
-Example client request
+### Command
 
-```python
-ac = ACClient(account, token)
-res = ac.get_projects()
-pprint(res.json())
-```
+- list
+- get
+- create
+- update
+- delete
+- 
+### Object
 
-## Configuration
+- info - get Info like version nummer from server
+- project
+- task
+- subtask
+- people
+- invoice
 
-config.ini:
 
-```ini
-[LOGIN]
-username = you@example.com
-password = very-secret
-account_name = "#123456"
-```
diff --git a/main.py b/main.py
index fe3c53d..4eae362 100644
--- a/main.py
+++ b/main.py
@@ -1,115 +1,79 @@
-import configparser
-import logging
+import argparse
+import json
 from pprint import pprint
 
-from ActiveCollabAPI import AC_LOGIN_BASE_URL
-from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
-from ActiveCollabAPI.ACClient import ACClient
-from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
-
-# Enabling debugging at http.client level (requests->urllib3->http.client)
-# you will see the REQUEST, including HEADERS and DATA, and RESPONSE with HEADERS but without DATA.
-# the only thing missing will be the response.body which is not logged.
-from http.client import HTTPConnection
-
 from ActiveCollabAPI.ActiveCollab import ActiveCollab
 
-HTTPConnection.debuglevel = 1
 
-logging.basicConfig()  # you need to initialize logging, otherwise you will not see anything from requests
-logging.getLogger().setLevel(logging.DEBUG)
-requests_log = logging.getLogger("urllib3")
-requests_log.setLevel(logging.DEBUG)
-requests_log.propagate = True
+def run(args, config):
+    # run the command
+    ac = ActiveCollab(config["base_url"])
+    ac.login_to_first_account(config["username"], config["password"])
+    output = None
+    if args.object == "info":
+        output = run_info(ac, args)
+    if args.object == "account":
+        output = run_account(ac, args)
+    if args.object == "project":
+        output = run_project(ac, args, output)
+    return output
+
+
+def run_account(ac, args):
+    if args.command == "list":
+        return ac.session.to_dict()
+
+
+def run_project(ac, args, output):
+    if args.command == "list":
+        output = list(map(lambda p: p.to_dict(), ac.get_projects()))
+    return output
+
+
+def run_info(ac, args):
+    output = ac.get_info()
+    return output
+
+
+def serialize_output(output):
+    # serialize the output
+    return json.dumps(output)
+
+
+def load_config(args):
+    with open(args.config, "r", encoding="utf8") as fh:
+        config = json.load(fh)
+    return config
 
 
 def main():
-    config = configparser.ConfigParser()
-    config.read('config.ini')
+    # parse arguments
+    parser = argparse.ArgumentParser(
+        prog='activecollab',
+        description='This is a CLI Client to Active-Collab Service',
+        epilog='This is not a offical tool provided by the AC Guys!')
+    parser.add_argument('-c', '--config', required=True,
+                        help="use the named config file")
+    parser.add_argument('-v', '--version', action='store_true',
+                        help="show version information for this tool")
 
-    username = config['LOGIN']['username']
-    password = config['LOGIN']['password']
-    account_name = config['LOGIN']['account_name']
+    subparsers = parser.add_subparsers(help='sub-command help')
 
-    # 1. you need to log in to get a session and a list of accounts
-    ac = ActiveCollab(AC_LOGIN_BASE_URL)
-    session = ac.login(username, password)
-    account = ac.get_account(session)  # default returning first account
-    token = ac.get_token(account, session.user)
+    # account list
+    parser_account = subparsers.add_parser('account', help='account help')
+    parser_account.set_defaults(object='account')
+    parser_account.add_argument('command', choices=["list"], help='list all accessible accounts')
 
-    # 2. you need to get a token for this account
-    token = ACTokenAuthenticator(account, auth.user).issue_token_intent()
-    # pprint(token)
+    # project list get
+    parser_project = subparsers.add_parser('project', help='project help')
+    parser_project.set_defaults(object='project')
+    parser_project.add_argument('command', choices=["list"], help='what to do with the account help')
 
-    # 3. now you can query the API
-    ac = ACClient(account, token)
+    args = parser.parse_args()
 
-    # check version
-    res = ac.get_info()
-    ac_version = res.json()
-    pprint(ac_version)
-    if ac_version['version'] != '7.4.337':
-        raise Exception("Supporting only Version 7.4.337!")
-
-    # get a list of all projects
-    # res = ac.get_projects()
-    # pprint(res.json())
-
-    # get task with sub-tasks
-    # "https://app.activecollab.com/416910/projects/310/tasks/6260"
-    # project_id = 310
-    # task_id = 6260
-    # task_res = ac.get_project_task(project_id, task_id)
-    # pprint(task_res.json())
-    # task = task_res.json()
-    # ac.delete_all_open_subtasks(task)
-
-    # create a new subtask for the task without assignment
-    # subtask = {
-    #     "task_id": task_id,
-    #     "project_id": project_id,
-    #     "assignee_id": "",
-    #     "body": "test qqq"
-    # }
-    # res = ac.create_subtask(subtask)
-    # pprint(res.json())
-
-    # # bulk create subtasks
-    # subtask_texts = []
-    # with open("sub-tasks.txt", "r", encoding="utf-8") as fh:
-    #     for line in fh:
-    #         subtask_texts.append(line.rstrip('\n'))
-    # create
-    # for text in subtask_texts:
-    #     subtask['body'] = text
-    #     ac.create_subtask(subtask)
-    # delete
-    # for text in subtask_texts:
-    #     subtask = ac.find_subtask_with_body(task, text)
-    #     if subtask is not None:
-    #         print(subtask)
-    #         ac.delete_subtask(subtask)
-
-    # # unassign a single subtask
-    # subtask_id = 12203
-    # subtask_res = ac.get_project_task_subtask(project_id, task_id, subtask_id)
-    # # pprint(subtask_res.json())
-    # subtask = subtask_res.json()['single']
-    # res = ac.unassign_sub_task(subtask)
-    # pprint(res.json())
-
-    # delete a subtask
-    # subtask = {
-    #     "task_id": task_id,
-    #     "project_id": project_id,
-    #     "id": 13764
-    # }
-    # res = ac.delete_subtask(subtask)
-    # pprint(res.json())
-
-    res = ac.get_projects()
-    if res.status_code == 200:
-        pprint(res.json())
+    config = load_config(args)
+    output = run(args, config)
+    print(serialize_output(output))
 
 
 if __name__ == "__main__":

From 4de1c6d96aeb54ada2d40811482dce3d3a573c23 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Sun, 25 Feb 2024 12:43:15 +0000
Subject: [PATCH 07/10] Fix CLI get info

NOT FINISHED!
---
 main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main.py b/main.py
index 4eae362..3d85052 100644
--- a/main.py
+++ b/main.py
@@ -59,6 +59,10 @@ def main():
 
     subparsers = parser.add_subparsers(help='sub-command help')
 
+    # info list
+    parser_account = subparsers.add_parser('info', help='info help')
+    parser_account.set_defaults(object='info')
+
     # account list
     parser_account = subparsers.add_parser('account', help='account help')
     parser_account.set_defaults(object='account')

From 88fb3107ce869a379846484ba650b4163bdfce34 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Sun, 25 Feb 2024 12:43:23 +0000
Subject: [PATCH 08/10] Fix README

NOT FINISHED!
---
 README.md | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 66c8d17..d0804f7 100644
--- a/README.md
+++ b/README.md
@@ -16,27 +16,35 @@
 
 ## CLI (Work in progress)
 
-> activecollab [options] [command] [object] [arguments]
+> activecollab [options] [object] [command] {arguments}
+
+The output will be always serialized to JSON.
+
 
 ### Options
 
+Mandatory options:
 - config=<file> - read config from file (json)
 
-### Command
-
-- list
-- get
-- create
-- update
-- delete
-- 
 ### Object
 
-- info - get Info like version nummer from server
-- project
+- info - print version nummer from server
+- account - all accounts you have access to with your login
+- project - manage projects in Active Collab
+
+Future:
 - task
 - subtask
 - people
 - invoice
 
+### Command
+
+- list - List all items
+
+Future:
+- get
+- create
+- update
+- delete
 

From b9b823df1f5b1d16d575006fb1cb8c8ec58c1d36 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Thu, 29 Feb 2024 16:13:43 +0000
Subject: [PATCH 09/10] Implemented Subtask List & create

Example shell script see "create-subtasks.sh"

NOT FINISHED!
---
 .gitignore                      |  3 +-
 ActiveCollabAPI/ACClient.py     |  9 ++--
 ActiveCollabAPI/AcSubtask.py    | 46 +++++++++++++++++
 ActiveCollabAPI/ActiveCollab.py | 19 +++++--
 create-subtasks.sh              |  7 +++
 main.py                         | 26 ++++++++++
 sub-tasks.txt                   | 91 ++++++++++++++++++++-------------
 7 files changed, 157 insertions(+), 44 deletions(-)
 create mode 100644 ActiveCollabAPI/AcSubtask.py
 create mode 100755 create-subtasks.sh

diff --git a/.gitignore b/.gitignore
index 28dbaf8..4012092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 config.ini
 .venv/
 __pycache__/
-config-mira.ini
+/config-mira.ini
+/config-mira.json
diff --git a/ActiveCollabAPI/ACClient.py b/ActiveCollabAPI/ACClient.py
index 4deaca9..a83ce27 100644
--- a/ActiveCollabAPI/ACClient.py
+++ b/ActiveCollabAPI/ACClient.py
@@ -4,6 +4,7 @@ import requests
 
 from ActiveCollabAPI import AC_USER_AGENT, AC_API_VERSION
 from ActiveCollabAPI.AcAccount import AcAccount
+from ActiveCollabAPI.AcSubtask import AcSubtask
 from ActiveCollabAPI.AcToken import AcToken
 
 
@@ -92,12 +93,12 @@ class ACClient:
         return self._delete('projects/%d/tasks/%s/subtasks/%s' %
                             (project_id, task_id, subtask_id))
 
-    def create_subtask(self, subtask):
-        project_id = subtask['project_id']
-        task_id = subtask['task_id']
+    def create_subtask(self, subtask: AcSubtask):
+        project_id = subtask.project_id
+        task_id = subtask.task_id
         return self._post('projects/%d/tasks/%s/subtasks' %
                           (project_id, task_id),
-                          data=subtask)
+                          data=subtask.to_dict())
 
     # find subtask with matching body
     def find_subtask_with_body(self, task, body, is_completed=False):
diff --git a/ActiveCollabAPI/AcSubtask.py b/ActiveCollabAPI/AcSubtask.py
new file mode 100644
index 0000000..6fcbbf5
--- /dev/null
+++ b/ActiveCollabAPI/AcSubtask.py
@@ -0,0 +1,46 @@
+import dataclasses
+import json
+from dataclasses import dataclass
+
+
+@dataclass
+class AcSubtask:
+    task_id: int
+    project_id: int
+    name: str = None
+    body: str = None
+    assignee_id: int = 0
+    delegated_by_id: int = 0
+    created_on: int = None
+    created_by_id: int = None
+    created_by_name: str = None
+    created_by_email: str = None
+    url_path: str = ""
+    id: int = 0
+    due_on: int = 0
+    fake_assignee_name: str = None
+    fake_assignee_email: str = None
+    class_: str = "Subtask"
+    completed_by_id: int = 0
+    is_completed: bool = False
+    is_trashed: bool = False
+    trashed_on: int = 0
+    trashed_by_id: int = 0
+    updated_on: int = 0
+    position: int = 0
+    completed_on: int = 0
+
+    def to_dict(self):
+        d = dataclasses.asdict(self)
+        d["class"] = d["class_"]
+        del d["class_"]
+        return d
+
+    def to_json(self):
+        return json.dumps(self.to_dict())
+
+
+def subtask_from_json(json_obj: dict) -> AcSubtask:
+    json_obj["class_"] = json_obj["class"]
+    del json_obj["class"]
+    return AcSubtask(**json_obj)
diff --git a/ActiveCollabAPI/ActiveCollab.py b/ActiveCollabAPI/ActiveCollab.py
index 47a000d..b4323a5 100644
--- a/ActiveCollabAPI/ActiveCollab.py
+++ b/ActiveCollabAPI/ActiveCollab.py
@@ -1,4 +1,5 @@
 from dataclasses import dataclass
+from pprint import pprint
 
 from ActiveCollabAPI import AC_API_VERSION
 from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
@@ -8,13 +9,12 @@ from ActiveCollabAPI.AcAccount import AcAccount, account_from_json
 from ActiveCollabAPI.AcLoginResponse import AcLoginResponse
 from ActiveCollabAPI.AcProject import AcProject, project_from_json
 from ActiveCollabAPI.AcSession import AcSession
+from ActiveCollabAPI.AcSubtask import AcSubtask, subtask_from_json
 from ActiveCollabAPI.AcToken import AcToken
 from ActiveCollabAPI.AcUser import AcUser
 
 
-
 class ActiveCollab:
-
     base_url: str = ""
 
     session: AcSession = None
@@ -58,7 +58,7 @@ class ActiveCollab:
         res = client.get_info()
         return res.json()
 
-    def get_projects(self):
+    def get_projects(self) -> list[AcProject]:
         client = ACClient(self.session.cur_account, self.session.token)
         res = client.get_projects()
         if res.status_code != 200:
@@ -66,3 +66,16 @@ class ActiveCollab:
         res_data = res.json()
         projects = list(map(lambda p: project_from_json(p), res_data))
         return projects
+
+    def get_subtasks(self, project_id: int, task_id: int) -> list[AcSubtask]:
+        client = ACClient(self.session.cur_account, self.session.token)
+        res = client.get_project_task(project_id, task_id)
+        res_data = res.json()
+        subtasks = list(map(lambda sub: subtask_from_json(sub), res_data["subtasks"]))
+        return subtasks
+
+    def create_subtask(self, subtask: AcSubtask):
+        client = ACClient(self.session.cur_account, self.session.token)
+        res = client.create_subtask(subtask)
+        res_data = res.json()
+        return res_data
diff --git a/create-subtasks.sh b/create-subtasks.sh
new file mode 100755
index 0000000..c214989
--- /dev/null
+++ b/create-subtasks.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+while IFS= read -r TEXT
+  do
+    python3 main.py -c ./config-mira.json subtask create --project 310 --task 6253 --body "$TEXT"
+  done
+
diff --git a/main.py b/main.py
index 3d85052..faa054e 100644
--- a/main.py
+++ b/main.py
@@ -2,6 +2,7 @@ import argparse
 import json
 from pprint import pprint
 
+from ActiveCollabAPI.AcSubtask import AcSubtask
 from ActiveCollabAPI.ActiveCollab import ActiveCollab
 
 
@@ -16,6 +17,8 @@ def run(args, config):
         output = run_account(ac, args)
     if args.object == "project":
         output = run_project(ac, args, output)
+    if args.object == "subtask":
+        output = run_subtask(ac, args)
     return output
 
 
@@ -30,6 +33,21 @@ def run_project(ac, args, output):
     return output
 
 
+def run_subtask(ac, args):
+    pprint(args)
+    output = None
+    if args.command == "list":
+        output = list(map(lambda sub: sub.to_dict(), ac.get_subtasks(args.project, args.task)))
+    if args.command == "create":
+        subtask = AcSubtask(
+            project_id=args.project,
+            task_id=args.task,
+            body=args.body
+        )
+        output = ac.create_subtask(subtask)
+    return output
+
+
 def run_info(ac, args):
     output = ac.get_info()
     return output
@@ -73,6 +91,14 @@ def main():
     parser_project.set_defaults(object='project')
     parser_project.add_argument('command', choices=["list"], help='what to do with the account help')
 
+    # subtask
+    parser_subtask = subparsers.add_parser('subtask', help='subtask help')
+    parser_subtask.set_defaults(object='subtask')
+    parser_subtask.add_argument('command', choices=["list", "create"], help='what to do with the account help')
+    parser_subtask.add_argument('--project', type=int, required=True)
+    parser_subtask.add_argument('--task', type=int, required=True)
+    parser_subtask.add_argument('--body', type=str)
+
     args = parser.parse_args()
 
     config = load_config(args)
diff --git a/sub-tasks.txt b/sub-tasks.txt
index 8689bc3..2980b30 100644
--- a/sub-tasks.txt
+++ b/sub-tasks.txt
@@ -1,36 +1,55 @@
-S3 Bucket "320dev-public" is archived
-S3 Bucket "320east-acm2-archive" is archived
-S3 Bucket "assets-prodeuall1-320east" is archived
-S3 Bucket "assets-sdds-01-320east" is archived
-S3 Bucket "backups-mattermost" is archived
-S3 Bucket "bucket.noc.320east.io" is archived
-S3 Bucket "lcmx-master-320east" is archived
-S3 Bucket "lcmx-prodeuall1-320east" is archived
-S3 Bucket "shop320-backups" is archived
-S3 Bucket "320dev-public" is deleted
-S3 Bucket "320east-acm2-archive" is deleted
-S3 Bucket "assets-prodeuall1-320east" is deleted
-S3 Bucket "assets-sdds-01-320east" is deleted
-S3 Bucket "backups-mattermost" is deleted
-S3 Bucket "backups-prodeuall1-320east" is deleted
-S3 Bucket "bigdataioav-idev0052-prodeuall1-320east" is deleted
-S3 Bucket "bucket.noc.320east.io" is deleted
-S3 Bucket "lcmx-master-320east" is deleted
-S3 Bucket "lcmx-prodeuall1-320east" is deleted
-S3 Bucket "shop320-backups" is deleted
-Cloudfront Distribution "E7R0HGAKU10KT - Production d1w1tdkpk45r2q.cloudfront.net sdds.homeok.io assets-sdds-01-320east.s3.eu-west-1.amazonaws.com" is removed
-Cloudfront Distribution "E1YAR9WILYEAOR - Production d283m0l3zuk2cl.cloudfront.net bucket.noc.320east.io.s3.eu-west-1.amazonaws.com" is removed
-Cloudfront Distribution "E2HUPIVJFDUSWF - Production dvfi2qvbg5wxw.cloudfront.net www.pds.companyok.io, pds.companyok.io assets-pds-companyok.s3.amazonaws.com" is removed
-Cloudfront Distribution "E2Q6TWJX3L3TRS - Production d3gvb7cyihtwwp.cloudfront.net s3-h38-lcm.320east.net.s3.amazonaws.com" is removed
-Cloudfront Distribution "E215TJ62TWJBBU - Production d2aseehijcy5it.cloudfront.net assets-sdds.s3.amazonaws.com" is removed
-IAM User "320east-ansible" is removed
-IAM User "backup" is removed
-IAM User "cs" is removed
-IAM User "docker-registry" is removed
-IAM User "io-bigdataioav-prod320" is removed
-IAM User "lcm-h38-prod Active" is removed
-IAM User "mattermost-backup" is removed
-IAM Usergroup "admin" is removed
-IAM Usergroup "ansible" is removed
-IAM Usergroup "backup" is removed
-IAM Usergroup "lcm" is removed
\ No newline at end of file
+PDF Export for Space '320EAST Human Resources (HR)' done
+PDF Export for Space '320EAST Legal' done
+PDF Export for Space '320EAST Management (MGT)' done
+PDF Export for Space '320EAST Management (MGT) Leaders' done
+PDF Export for Space '320EAST Marketing (MKTG)' done
+PDF Export for Space '320EAST Office Management (OM)' done
+PDF Export for Space '320EAST Partner Management (PARMGT)' done
+PDF Export for Space '320EAST Procurement & Supply (PROSU)' done
+PDF Export for Space '320EAST Program Management (PROGMGT)' done
+PDF Export for Space '320EAST PROSU Risk Management (PROR)' done
+PDF Export for Space '320EAST Research & Development (TELA)' done
+PDF Export for Space '320EAST Sales & Business Development (HOKOCOKO)' done
+PDF Export for Space 'ak.320east.de' done
+PDF Export for Space 'Antonio Sciara' done
+PDF Export for Space 'Atlassian 320EAST' done
+PDF Export for Space 'calvin.chen.ngstb.com' done
+PDF Export for Space 'catherine.tang.tv2next.com' done
+PDF Export for Space 'cs.320east.de' done
+PDF Export for Space 'dp.320east.de' done
+PDF Export for Space 'Emilia Biche' done
+PDF Export for Space 'ewe.320east.de' done
+PDF Export for Space 'hansen.he.tv2next.com' done
+PDF Export for Space 'hap.320east.de' done
+PDF Export for Space 'hs.320east.de' done
+PDF Export for Space 'jl.320east.de' done
+PDF Export for Space 'jle.320east.de' done
+PDF Export for Space 'Kaumudi Deshmukh' done
+PDF Export for Space 'ks.320east.de' done
+PDF Export for Space 'll.320east.de' done
+PDF Export for Space 'Myrthe Günther' done
+PDF Export for Space 'Pooja Naringrekar' done
+PDF Export for Space 'rain.chen.tv2next.com' done
+PDF Export for Space 'Robert Uhlmann' done
+PDF Export for Space 'sa.320east.de' done
+PDF Export for Space 'silke.heim.awpartner.de' done
+PDF Export for Space 'tgr.320east.de' done
+PDF Export for Space 'thomas.link.awpartner.de' done
+PDF Export for Space 'thomas.wei.ngstb.com' done
+PDF Export for Space 'tig.320east.de' done
+PDF Export for Space 'tiz.320east.de' done
+PDF Export for Space 'TNC320 Readme' done
+PDF Export for Space 'TNC Accounting (AFI)' done
+PDF Export for Space 'TNC Board' done
+PDF Export for Space 'TNC Business Unit sprint:bricks' done
+PDF Export for Space 'TNC Human Resources (HR)' done
+PDF Export for Space 'TNC Marketing (MKTG)' done
+PDF Export for Space 'TNC Office Management (OM)' done
+PDF Export for Space 'TNC Product Development (PD)' done
+PDF Export for Space 'TNC Public' done
+PDF Export for Space 'TNC Purchase' done
+PDF Export for Space 'TNC Quality Assurance (QA)' done
+PDF Export for Space 'TNC Sales' done
+PDF Export for Space 'ts.320east.de' done
+PDF Export for Space 'zh.320east.de' done
+PDF Export for Space 'zhengyi.tv2next.com' done
\ No newline at end of file

From 488b4b6e9e489a60cb94ad81e8704b016e0d6906 Mon Sep 17 00:00:00 2001
From: cs <carsten@s10r.de>
Date: Fri, 1 Mar 2024 08:44:08 +0000
Subject: [PATCH 10/10] Cleanup some code

NOT FINISHED!
---
 ActiveCollabAPI/AcAccount.py                  |  5 ++--
 ...{ACAuthenticator.py => AcAuthenticator.py} |  2 +-
 ActiveCollabAPI/{ACClient.py => AcClient.py}  |  5 +++-
 ActiveCollabAPI/AcProject.py                  |  4 ++--
 ActiveCollabAPI/AcSession.py                  |  4 ++--
 ActiveCollabAPI/AcSubtask.py                  |  4 ++--
 ...thenticator.py => AcTokenAuthenticator.py} |  2 +-
 ActiveCollabAPI/AcUser.py                     |  6 ++---
 ActiveCollabAPI/ActiveCollab.py               | 23 ++++++++++---------
 TODO.md                                       | 17 ++++++++++++++
 ...thenticator.py => test_AcAuthenticator.py} | 16 ++++++-------
 ...icator.py => test_AcTokenAuthenticator.py} | 16 ++++++-------
 12 files changed, 63 insertions(+), 41 deletions(-)
 rename ActiveCollabAPI/{ACAuthenticator.py => AcAuthenticator.py} (96%)
 rename ActiveCollabAPI/{ACClient.py => AcClient.py} (98%)
 rename ActiveCollabAPI/{ACTokenAuthenticator.py => AcTokenAuthenticator.py} (96%)
 create mode 100644 TODO.md
 rename tests/{test_ACAuthenticator.py => test_AcAuthenticator.py} (85%)
 rename tests/{test_ACTokenAuthenticator.py => test_AcTokenAuthenticator.py} (76%)

diff --git a/ActiveCollabAPI/AcAccount.py b/ActiveCollabAPI/AcAccount.py
index 6e691e8..99de25b 100644
--- a/ActiveCollabAPI/AcAccount.py
+++ b/ActiveCollabAPI/AcAccount.py
@@ -1,4 +1,5 @@
 import dataclasses
+import json
 from dataclasses import dataclass
 
 
@@ -12,13 +13,13 @@ class AcAccount:
     class_: str
     status: str
 
-    def to_dict(self):
+    def to_dict(self) -> dict:
         d = dataclasses.asdict(self)
         d["class"] = d["class_"]
         del d["class_"]
         return d
 
-    def to_json(self):
+    def to_json(self) -> json:
         return json.dumps(self.to_dict())
 
 def account_from_json(a) -> AcAccount:
diff --git a/ActiveCollabAPI/ACAuthenticator.py b/ActiveCollabAPI/AcAuthenticator.py
similarity index 96%
rename from ActiveCollabAPI/ACAuthenticator.py
rename to ActiveCollabAPI/AcAuthenticator.py
index 6dcd140..76a9bee 100644
--- a/ActiveCollabAPI/ACAuthenticator.py
+++ b/ActiveCollabAPI/AcAuthenticator.py
@@ -8,7 +8,7 @@ from requests import Response
 from ActiveCollabAPI import AC_USER_AGENT
 
 
-class ACAuthenticator:
+class AcAuthenticator:
 
     base_url: str = ""
 
diff --git a/ActiveCollabAPI/ACClient.py b/ActiveCollabAPI/AcClient.py
similarity index 98%
rename from ActiveCollabAPI/ACClient.py
rename to ActiveCollabAPI/AcClient.py
index a83ce27..49d927f 100644
--- a/ActiveCollabAPI/ACClient.py
+++ b/ActiveCollabAPI/AcClient.py
@@ -8,7 +8,10 @@ from ActiveCollabAPI.AcSubtask import AcSubtask
 from ActiveCollabAPI.AcToken import AcToken
 
 
-class ACClient:
+class AcClient:
+    """
+    Active Collab REST API Client
+    """
     base_url = None
     account = None
     token = None
diff --git a/ActiveCollabAPI/AcProject.py b/ActiveCollabAPI/AcProject.py
index 07b91ce..9366ada 100644
--- a/ActiveCollabAPI/AcProject.py
+++ b/ActiveCollabAPI/AcProject.py
@@ -49,13 +49,13 @@ class AcProject:
     updated_on: int
     url_path: str
 
-    def to_dict(self):
+    def to_dict(self) -> dict:
         d = dataclasses.asdict(self)
         d["class"] = d["class_"]
         del d["class_"]
         return d
 
-    def to_json(self):
+    def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
 
diff --git a/ActiveCollabAPI/AcSession.py b/ActiveCollabAPI/AcSession.py
index 32b707c..60a163c 100644
--- a/ActiveCollabAPI/AcSession.py
+++ b/ActiveCollabAPI/AcSession.py
@@ -14,10 +14,10 @@ class AcSession:
     cur_account: AcAccount
     token: AcToken
 
-    def to_dict(self):
+    def to_dict(self) -> dict:
         d = dataclasses.asdict(self)
         d["accounts"] = list(map(lambda a: a.to_dict(), self.accounts))
         return d
 
-    def to_json(self):
+    def to_json(self) -> str:
         return json.dumps(self.to_dict())
\ No newline at end of file
diff --git a/ActiveCollabAPI/AcSubtask.py b/ActiveCollabAPI/AcSubtask.py
index 6fcbbf5..bbc5b26 100644
--- a/ActiveCollabAPI/AcSubtask.py
+++ b/ActiveCollabAPI/AcSubtask.py
@@ -30,13 +30,13 @@ class AcSubtask:
     position: int = 0
     completed_on: int = 0
 
-    def to_dict(self):
+    def to_dict(self) -> dict:
         d = dataclasses.asdict(self)
         d["class"] = d["class_"]
         del d["class_"]
         return d
 
-    def to_json(self):
+    def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
 
diff --git a/ActiveCollabAPI/ACTokenAuthenticator.py b/ActiveCollabAPI/AcTokenAuthenticator.py
similarity index 96%
rename from ActiveCollabAPI/ACTokenAuthenticator.py
rename to ActiveCollabAPI/AcTokenAuthenticator.py
index dd52398..1d41022 100644
--- a/ActiveCollabAPI/ACTokenAuthenticator.py
+++ b/ActiveCollabAPI/AcTokenAuthenticator.py
@@ -6,7 +6,7 @@ from requests import Response
 from ActiveCollabAPI import AC_USER_AGENT, AC_API_VERSION, AC_API_CLIENT_NAME, AC_API_CLIENT_VENDOR
 
 
-class ACTokenAuthenticator:
+class AcTokenAuthenticator:
 
     base_url = ""
 
diff --git a/ActiveCollabAPI/AcUser.py b/ActiveCollabAPI/AcUser.py
index 6e15351..214be3b 100644
--- a/ActiveCollabAPI/AcUser.py
+++ b/ActiveCollabAPI/AcUser.py
@@ -10,9 +10,9 @@ class AcUser:
     last_name: str
     intent: str
 
-    def to_dict(self):
+    def to_dict(self) -> dict:
         d = dataclasses.asdict(self)
         return d
 
-    def to_json(self):
-        return json.dumps(self.to_dict())
\ No newline at end of file
+    def to_json(self) -> str:
+        return json.dumps(self.to_dict())
diff --git a/ActiveCollabAPI/ActiveCollab.py b/ActiveCollabAPI/ActiveCollab.py
index b4323a5..68c2aa0 100644
--- a/ActiveCollabAPI/ActiveCollab.py
+++ b/ActiveCollabAPI/ActiveCollab.py
@@ -1,10 +1,8 @@
-from dataclasses import dataclass
-from pprint import pprint
 
 from ActiveCollabAPI import AC_API_VERSION
-from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
-from ActiveCollabAPI.ACClient import ACClient
-from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
+from ActiveCollabAPI.AcAuthenticator import AcAuthenticator
+from ActiveCollabAPI.AcClient import AcClient
+from ActiveCollabAPI.AcTokenAuthenticator import AcTokenAuthenticator
 from ActiveCollabAPI.AcAccount import AcAccount, account_from_json
 from ActiveCollabAPI.AcLoginResponse import AcLoginResponse
 from ActiveCollabAPI.AcProject import AcProject, project_from_json
@@ -15,6 +13,9 @@ from ActiveCollabAPI.AcUser import AcUser
 
 
 class ActiveCollab:
+    """
+    Active Collab Client library comming from the use case
+    """
     base_url: str = ""
 
     session: AcSession = None
@@ -30,7 +31,7 @@ class ActiveCollab:
         return self.session
 
     def user_login(self, email: str, password: str) -> AcLoginResponse:
-        auth = ACAuthenticator(self.base_url)
+        auth = AcAuthenticator(self.base_url)
         res = auth.login(email, password)
         if res.status_code != 200:
             raise Exception('Login failed!')
@@ -44,7 +45,7 @@ class ActiveCollab:
         return accounts[0]
 
     def create_token(self, account: AcAccount, user: AcUser) -> AcToken:
-        authenticator = ACTokenAuthenticator(account.url + '/api/v%s' % AC_API_VERSION)
+        authenticator = AcTokenAuthenticator(account.url + '/api/v%s' % AC_API_VERSION)
         res = authenticator.issue_token_intent(user.intent)
         if res.status_code != 200:
             raise Exception('Request token failed!')
@@ -54,12 +55,12 @@ class ActiveCollab:
         return AcToken(res_data["token"])
 
     def get_info(self):
-        client = ACClient(self.session.cur_account, self.session.token)
+        client = AcClient(self.session.cur_account, self.session.token)
         res = client.get_info()
         return res.json()
 
     def get_projects(self) -> list[AcProject]:
-        client = ACClient(self.session.cur_account, self.session.token)
+        client = AcClient(self.session.cur_account, self.session.token)
         res = client.get_projects()
         if res.status_code != 200:
             raise Exception("Error %d" % res.status_code)
@@ -68,14 +69,14 @@ class ActiveCollab:
         return projects
 
     def get_subtasks(self, project_id: int, task_id: int) -> list[AcSubtask]:
-        client = ACClient(self.session.cur_account, self.session.token)
+        client = AcClient(self.session.cur_account, self.session.token)
         res = client.get_project_task(project_id, task_id)
         res_data = res.json()
         subtasks = list(map(lambda sub: subtask_from_json(sub), res_data["subtasks"]))
         return subtasks
 
     def create_subtask(self, subtask: AcSubtask):
-        client = ACClient(self.session.cur_account, self.session.token)
+        client = AcClient(self.session.cur_account, self.session.token)
         res = client.create_subtask(subtask)
         res_data = res.json()
         return res_data
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..29a0281
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,17 @@
+
+## Backlog
+
+* Tests for CLI
+* pack with https://python-poetry.org
+* publish first version on github
+* complete [API](https://developers.activecollab.com/api-documentation/index.html)
+  * Project list, get, create, delete
+  * Task list, get, create, delete
+  * Tasklist
+  * Subtask list, get, create, delete
+  * Attachments
+  * Companies
+  * Users
+  * Teams
+  * Notes
+* support for paging
diff --git a/tests/test_ACAuthenticator.py b/tests/test_AcAuthenticator.py
similarity index 85%
rename from tests/test_ACAuthenticator.py
rename to tests/test_AcAuthenticator.py
index 9bf9725..912e83b 100644
--- a/tests/test_ACAuthenticator.py
+++ b/tests/test_AcAuthenticator.py
@@ -3,10 +3,10 @@ from unittest import TestCase
 from unittest.mock import patch
 
 from ActiveCollabAPI import AC_LOGIN_BASE_URL
-from ActiveCollabAPI.ACAuthenticator import ACAuthenticator
+from ActiveCollabAPI.AcAuthenticator import AcAuthenticator
 
 
-class TestACAuthenticator(TestCase):
+class TestAcAuthenticator(TestCase):
 
     def mock_login_success(self):
         return {
@@ -31,13 +31,13 @@ class TestACAuthenticator(TestCase):
 
 
     def test_login_success_gets_user_and_accounts_list(self):
-        with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+        with patch("ActiveCollabAPI.AcAuthenticator.requests.post") as mock_post:
             mock_post.return_value.status_code = 200
             mock_post.return_value.json.return_value = self.mock_login_success()
 
             email = "collab@example.com"
             password = "VeryS3cret!"
-            authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+            authenticator = AcAuthenticator(AC_LOGIN_BASE_URL)
             response = authenticator.login(email, password)
 
             self.assertEqual(200, response.status_code)
@@ -57,13 +57,13 @@ class TestACAuthenticator(TestCase):
         }
 
     def test_login_failed_not_ok(self):
-        with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+        with patch("ActiveCollabAPI.AcAuthenticator.requests.post") as mock_post:
             mock_post.return_value.status_code = 200
             mock_post.return_value.json.return_value = self.mock_login_failed()
 
             email = "collab@example.com"
             password = "VeryS3cret!"
-            authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+            authenticator = AcAuthenticator(AC_LOGIN_BASE_URL)
             response = authenticator.login(email, password)
 
             self.assertEqual(200, response.status_code)
@@ -75,13 +75,13 @@ class TestACAuthenticator(TestCase):
         return {
         }
     def test_login_forbidden(self):
-        with patch("ActiveCollabAPI.ACAuthenticator.requests.post") as mock_post:
+        with patch("ActiveCollabAPI.AcAuthenticator.requests.post") as mock_post:
             mock_post.return_value.status_code = 401
             mock_post.return_value.json.return_value = self.mock_login_forbidden()
 
             email = "collab@example.com"
             password = "VeryS3cret!"
-            authenticator = ACAuthenticator(AC_LOGIN_BASE_URL)
+            authenticator = AcAuthenticator(AC_LOGIN_BASE_URL)
             response = authenticator.login(email, password)
 
             self.assertEqual(401, response.status_code)
diff --git a/tests/test_ACTokenAuthenticator.py b/tests/test_AcTokenAuthenticator.py
similarity index 76%
rename from tests/test_ACTokenAuthenticator.py
rename to tests/test_AcTokenAuthenticator.py
index 3af05ef..c4dca12 100644
--- a/tests/test_ACTokenAuthenticator.py
+++ b/tests/test_AcTokenAuthenticator.py
@@ -1,10 +1,10 @@
 from unittest import TestCase
 from unittest.mock import patch
 
-from ActiveCollabAPI.ACTokenAuthenticator import ACTokenAuthenticator
+from ActiveCollabAPI.AcTokenAuthenticator import AcTokenAuthenticator
 
 
-class TestACTokenAuthenticator(TestCase):
+class TestAcTokenAuthenticator(TestCase):
 
     def mock_token_success(self):
         return {
@@ -13,11 +13,11 @@ class TestACTokenAuthenticator(TestCase):
         }
 
     def test_issue_token_intent_success(self):
-        with patch("ActiveCollabAPI.ACTokenAuthenticator.requests.post") as mock_post:
+        with patch("ActiveCollabAPI.AcTokenAuthenticator.requests.post") as mock_post:
             mock_post.return_value.status_code = 200
             mock_post.return_value.json.return_value = self.mock_token_success()
 
-            auth = ACTokenAuthenticator("http://mock")
+            auth = AcTokenAuthenticator("http://mock")
             res = auth.issue_token_intent("this-is-the-token-intent-string")
 
             self.assertEqual(200, res.status_code)
@@ -31,11 +31,11 @@ class TestACTokenAuthenticator(TestCase):
         }
 
     def test_issue_token_intent_not_ok(self):
-        with patch("ActiveCollabAPI.ACTokenAuthenticator.requests.post") as mock_post:
+        with patch("ActiveCollabAPI.AcTokenAuthenticator.requests.post") as mock_post:
             mock_post.return_value.status_code = 200
             mock_post.return_value.json.return_value = self.mock_token_not_ok()
 
-            auth = ACTokenAuthenticator("http://mock")
+            auth = AcTokenAuthenticator("http://mock")
             res = auth.issue_token_intent("this-is-the-token-intent-string")
 
             self.assertEqual(200, res.status_code)
@@ -47,11 +47,11 @@ class TestACTokenAuthenticator(TestCase):
         }
 
     def test_issue_token_intent_forbidden(self):
-        with patch("ActiveCollabAPI.ACTokenAuthenticator.requests.post") as mock_post:
+        with patch("ActiveCollabAPI.AcTokenAuthenticator.requests.post") as mock_post:
             mock_post.return_value.status_code = 401
             mock_post.return_value.json.return_value = self.mock_token_forbidden()
 
-            auth = ACTokenAuthenticator("http://mock")
+            auth = AcTokenAuthenticator("http://mock")
             res = auth.issue_token_intent("this-is-the-token-intent-string")
 
             self.assertEqual(401, res.status_code)