Merge pull request #17 from itk-dev-rpa/feature/revert_bad_revert

Feature/revert bad revert

Author: ghbm-itk

ITK_dev_shared_components/SAP/opret_kundekontakt.py

@@ -1,4 +1,4 @@
-"""This module provides a single function to conviniently peform the action 'opret-kundekontaker' in SAP."""
+"""This module provides a single function to conveniently perform the action 'opret-kundekontaker' in SAP."""
 
 from typing import Literal
 import win32clipboard
@@ -11,7 +11,7 @@ def opret_kundekontakter(session, fp:str, aftaler:list[str] | None,
     """Creates a kundekontakt on the given FP and aftaler.
 
     Args:
-        session (COM Object): The SAP session to peform the action.
+        session (COM Object): The SAP session to preform the action.
         fp (str): The forretningspartner number.
         aftaler (list[str] | None): A list of aftaler to put the kundekontakt on. If empty or None the kundekontakt will be created on fp-level.
         art (str): The art of the kundekontakt.

ITK_dev_shared_components/graph/authentication.py

@@ -3,33 +3,7 @@
 
 import msal
 
-def authorize_by_username_password(username: str, password: str, *, client_id: str, tenant_id: str) -> GraphAccess:
-    """Get a bearer token for the given user.
-    This is used in most other Graph API calls.
-
-    Args:
-        username: The username of the user (email address).
-        password: The password of the user.
-        client_id: The Graph API client id in 8-4-4-12 format.
-        tenant_id: The Graph API tenant id in 8-4-4-12 format.
-    
-    Returns:
-        GraphAccess: The GraphAccess object used to authorize Graph access.
-    """
-    authority = f"https://login.microsoftonline.com/{tenant_id}"
-    scopes = ["https://graph.microsoft.com/.default"]
-
-    app = msal.PublicClientApplication(client_id, authority=authority)
-    app.acquire_token_by_username_password(username, password, scopes)
-
-    graph_access = GraphAccess(app, scopes)
-
-    # Test connection
-    graph_access.get_access_token()
-
-    return graph_access
-
-
+# pylint: disable-next=too-few-public-methods
 class GraphAccess:
     """An object that handles access to the Graph api.
     This object should not be created directly but instead
@@ -41,7 +15,7 @@ def __init__(self, app: msal.PublicClientApplication, scopes: list[str]) -> str:
 
     def get_access_token(self):
         """Get the access token to Graph.
-        This function automatically reuses an existing token 
+        This function automatically reuses an existing token
         or refreshes an expired one.
 
         Raises:
@@ -60,3 +34,30 @@ def get_access_token(self):
             raise RuntimeError(f"Token could not be acquired. {token['error_description']}")
 
         raise RuntimeError("Something went wrong. No error description was returned from Graph.")
+
+
+def authorize_by_username_password(username: str, password: str, *, client_id: str, tenant_id: str) -> GraphAccess:
+    """Get a bearer token for the given user.
+    This is used in most other Graph API calls.
+
+    Args:
+        username: The username of the user (email address).
+        password: The password of the user.
+        client_id: The Graph API client id in 8-4-4-12 format.
+        tenant_id: The Graph API tenant id in 8-4-4-12 format.
+    
+    Returns:
+        GraphAccess: The GraphAccess object used to authorize Graph access.
+    """
+    authority = f"https://login.microsoftonline.com/{tenant_id}"
+    scopes = ["https://graph.microsoft.com/.default"]
+
+    app = msal.PublicClientApplication(client_id, authority=authority)
+    app.acquire_token_by_username_password(username, password, scopes)
+
+    graph_access = GraphAccess(app, scopes)
+
+    # Test connection
+    graph_access.get_access_token()
+
+    return graph_access

ITK_dev_shared_components/graph/mail.py

@@ -10,6 +10,7 @@
 
 
 @dataclass
+# pylint: disable-next=too-many-instance-attributes
 class Email:
     """A class representing an email."""
     user: str
@@ -316,26 +317,3 @@ def _get_request(endpoint: str, graph_access: GraphAccess) -> requests.models.Re
     response.raise_for_status()
 
     return response
-
-
-if __name__ == '__main__':
-    import os, json, authentication
-    def main():
-        credentials = json.loads(os.environ['GraphAPI'])
-        client_id = credentials['client_id']
-        tenant_id = credentials['tenant_id']
-        username = credentials['username']
-        password = credentials['password']
-
-        graph_access = authentication.authorize_by_username_password(username, password, client_id=client_id, tenant_id=tenant_id)
-
-        emails = get_emails_from_folder("itk-rpa@mkb.aarhus.dk", "Indbakke/Graph Test/Undermappe", graph_access)
-        email = emails[0]
-
-        print(repr(email.get_text()))
-
-        # move_email(email, "Indbakke/Graph Test/Undermappe2", graph_access)
-
-        # list_email_attachments(email, graph_access)
-
-    main()

tests/test_opret_kundekontakt.py

@@ -0,0 +1,36 @@
+"""Test relating to the module SAP.opret_kundekontakt."""
+
+import unittest
+import os
+from ITK_dev_shared_components.SAP import sap_login, multi_session, opret_kundekontakt
+
+class TestOpretKundekontakt(unittest.TestCase):
+    """Test relating to the module SAP.opret_kundekontakt."""
+    def setUp(self):
+        sap_login.kill_sap()
+        user, password = os.environ['SAP Login'].split(';')
+        sap_login.login_using_cli(user, password)
+
+    def tearDown(self):
+        sap_login.kill_sap()
+
+
+    def test_opret_kundekontakt(self):
+        """Test the function opret_kundekontakter."""
+        fp = "25564617"
+        aftaler = ("2544577", "1990437", "1473781")
+
+        session = multi_session.get_all_SAP_sessions()[0]
+
+        # Test with 3 aftaler
+        opret_kundekontakt.opret_kundekontakter(session, fp, aftaler, 'Orientering', "Test 1")
+
+        # Test with 1 aftale
+        opret_kundekontakt.opret_kundekontakter(session, fp, aftaler[0:1], 'Automatisk', "Test 2")
+
+        # Test with 0 aftaler
+        opret_kundekontakt.opret_kundekontakter(session, fp, None, 'Returpost', "Test 3")
+
+
+if __name__ == '__main__':
+    unittest.main()