Merge pull request #13 from JakubDotPy/dev

removed hardcoded user name

Author: JakubDotPy

.idea/codewars_backup.iml

@@ -11,9 +11,6 @@
     **os.environ,  # override loaded values with environment variables
 }
 
-# urls
-USER_URL = fr"{ENV['API_URL']}users/{ENV['CW_USERNAME']}"
-
 CURRENT_DIR = Path.cwd()
 LOGS_DIR = CURRENT_DIR / 'logs'
 OUTPUT_DIR = CURRENT_DIR / 'output'
@@ -23,7 +20,7 @@
 \"\"\"Kata - {name}
 
 completed at: {completed_at:%Y-%m-%d %H:%M:%S}
-by: Jakub Červinka
+by: {completed_by}
 
 {description}
 \"\"\"

config.py

@@ -17,7 +17,6 @@
 
 import config
 from config import ENV
-from config import USER_URL
 from config import setup_logging
 
 urllib3.disable_warnings()
@@ -37,6 +36,7 @@ class Kata:
     code: str = ''
     description: str = ''
     uploaded: bool = False
+    completed_by: str = ''
 
     def __post_init__(self):
         # parse
@@ -71,6 +71,7 @@ def __init__(self):
         self.completed_katas = []
         self.uploaded_katas = set()
         log.debug('Codewars agent prepared')
+        self.username = self.get_username()
 
     @staticmethod
     def _parse_cookie_env(raw_cookie: str) -> dict:
@@ -82,11 +83,22 @@ def _parse_cookie_env(raw_cookie: str) -> dict:
             for key, morsel in cookie.items()
         })
 
-    def get_user_data(self, url: str) -> dict:
+    def get_username(self):
+        """Parse logged-in users' username."""
+        log.debug('getting username')
+        r = self.session.get('http://www.codewars.com/dashboard')
+        user_image = r.html.find('.profile-pic img')[0]
+        username = user_image.attrs['alt'].split()[0]
+        return username
+
+    def get_user_data(self) -> dict:
         """Fetch user info json from public API."""
         log.debug('getting user data')
+        url = fr"{ENV['API_URL']}users/{self.username}"
         r = self.session.get(url, verify=False)
-        return r.json()
+        data = r.json()
+        self.user_full_name = data['name']
+        return data
 
     @staticmethod
     def parse_user_info(user_data: dict) -> str:
@@ -103,7 +115,7 @@ def load_completed_katas_data(self):
         Save it internally for later use.
         """
         log.debug('loading katas data')
-        url = fr"{USER_URL}/code-challenges/completed"
+        url = fr"{ENV['API_URL']}users/{self.username}/code-challenges/completed"
 
         self.completed_katas = []
 
@@ -152,6 +164,7 @@ def _parse_response(response: Response) -> tuple[str, str]:
 
     def create_kata_obj(self, kata_data: dict) -> Kata:
         """Create kata instance from api and parsed data."""
+        kata_data['completed_by'] = self.user_full_name
         kata = Kata(**kata_data)
         kata.description, kata.code = self.get_kata_data(kata.id)
         return kata
@@ -174,7 +187,7 @@ def main():
     # prepare online agent
     cw = CodewarsAgent()
 
-    user_data = cw.get_user_data(USER_URL)
+    user_data = cw.get_user_data()
     log.info(cw.parse_user_info(user_data))
 
     # load completed katas info from public api