From 8ddbc1e1210dbcfce748a1fe446729fbfdbc15f7 Mon Sep 17 00:00:00 2001
From: tiagovla <tiagovla@gmail.com>
Date: Mon, 3 Oct 2022 22:11:14 -0300
Subject: [PATCH] refactor: extract request logic

---
 ppgee/client.py | 33 +++++++--------------------------
 ppgee/http.py   | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 26 deletions(-)
 create mode 100644 ppgee/http.py

diff --git a/ppgee/client.py b/ppgee/client.py
index d7bbbd8..67a3595 100644
--- a/ppgee/client.py
+++ b/ppgee/client.py
@@ -1,11 +1,9 @@
 import aiohttp
 import asyncio
 import logging
-from datetime import date
-from ppgee.errors import RequestException
+from ppgee.http import HttpClient
 
 logger = logging.getLogger(__name__)
-URL_BASE = "https://www.ppgee.ufmg.br/ppgeenet"
 
 
 class PPGEE:
@@ -13,9 +11,11 @@ class PPGEE:
         self.user = user
         self.password = password
         self.session: aiohttp.ClientSession
+        self.http: HttpClient
 
     async def __aenter__(self):
         self.session = aiohttp.ClientSession()
+        self.http = HttpClient(self.session)
         await self.login()
         return self
 
@@ -25,33 +25,14 @@ class PPGEE:
         if self.session:
             await self.session.close()
 
-    async def _request(self, method: str, url: str, **kwargs) -> str:
-        async with self.session.request(method, url, **kwargs) as resp:
-            if resp.status != 200:
-                raise RequestException(
-                    f"Request to url {url} with method {method} failed with status code {resp.status}."
-                )
-            return await resp.text()
-
     async def login(self) -> str:
-        logger.debug("Sending request to login.")
-        data: dict[str, str] = {"login": self.user, "senha": self.password}
-        return await self._request("post", f"{URL_BASE}/login.php", data=data)
+        return await self.http.login(self.user, self.password)
 
     async def frequency(self) -> str:
-        logger.debug("Sending request to frequency.")
-        return await self._request("get", f"{URL_BASE}/afreq.php")
+        return await self.http.frequency()
 
     async def frequency_confirmation(self) -> str:
-        logger.debug("Sending request to confirm frequency.")
-        today = date.today()
-        data: dict[str, str] = {
-            "freqano": str(today.year),
-            "freqmes": str(today.month),
-            "confirma": "checkbox",
-        }
-        return await self._request("POST", f"{URL_BASE}/afreqpasso2.php", data=data)
+        return await self.http.frequency_confirmation()
 
     async def logoff(self) -> str:
-        logger.debug("Sending request to logoff.")
-        return await self._request("get", f"{URL_BASE}/logoff.php")
+        return await self.http.logoff()
diff --git a/ppgee/http.py b/ppgee/http.py
new file mode 100644
index 0000000..4daf32d
--- /dev/null
+++ b/ppgee/http.py
@@ -0,0 +1,42 @@
+from datetime import date
+import logging
+
+import aiohttp
+
+from ppgee.errors import RequestException
+
+URL_BASE = "https://www.ppgee.ufmg.br/ppgeenet"
+logger = logging.getLogger(__name__)
+
+
+class HttpClient:
+    def __init__(self, session: aiohttp.ClientSession):
+        self.session = session
+
+    async def _request(self, method: str, url: str, **kwargs) -> str:
+        async with self.session.request(method, url, **kwargs) as resp:
+            logger.debug(f"Request: {url} Status: {resp.status}")
+            if resp.status != 200:
+                raise RequestException(
+                    f"Request to url {url} with method {method} failed with status code {resp.status}."
+                )
+            return await resp.text()
+
+    async def login(self, user: str, password: str) -> str:
+        data: dict[str, str] = {"login": user, "senha": password}
+        return await self._request("post", f"{URL_BASE}/login.php", data=data)
+
+    async def frequency(self) -> str:
+        return await self._request("get", f"{URL_BASE}/afreq.php")
+
+    async def frequency_confirmation(self) -> str:
+        today = date.today()
+        data: dict[str, str] = {
+            "freqano": str(today.year),
+            "freqmes": str(today.month),
+            "confirma": "checkbox",
+        }
+        return await self._request("POST", f"{URL_BASE}/afreqpasso2.php", data=data)
+
+    async def logoff(self) -> str:
+        return await self._request("get", f"{URL_BASE}/logoff.php")