refactor API endpoints to streamline request handling; add logging for requests and responses; enhance meme management functionality

Author: summerduck

endpoints/base_endpoint.py

@@ -1,6 +1,10 @@
 import os
 import logging
 from faker import Faker
+import requests
+from requests import Request
+from typing import Optional
+import rlogger
 
 # import requests
 
@@ -9,10 +13,39 @@
 
 
 class BaseEndpoint:
-    url = "http://167.172.172.115:52355"
-    response = None
-    json = None
-    fake = Faker()
+    def __init__(self):
+        self.url = "http://167.172.172.115:52355"
+        self.request = None  # Store the request
+        self.response = None  # Store the response
+        self.fake = Faker()
+
+    def _send_request(
+        self,
+        method: str,
+        endpoint: str,
+        headers: Optional[dict] = None,
+        **kwargs,
+    ) -> requests.Response:
+        headers = self._set_default_headers(headers)
+        url = self._build_endpoint_url(endpoint)
+
+        self.request = Request(
+            method,
+            url,
+            headers=headers,
+            **kwargs,
+        )
+        rlogger.requests_logging(self.request)
+
+        self.response = requests.request(
+            method,
+            url,
+            headers=headers,
+            **kwargs,
+        )
+        rlogger.response_logging(self.response)
+
+        return self.response
 
     def _build_endpoint_url(
         self,
@@ -26,9 +59,9 @@ def _set_default_headers(
         headers=None,
     ):
         """Set default headers if not provided"""
-        if headers is None:
-            headers = self.headers
-        return headers
+        return (
+            self._default_headers_with_authorization() if headers is None else headers
+        )
 
     def _generate_tags(
         self,

endpoints/delete_meme.py

@@ -1,36 +1,30 @@
+import os
 import requests
+from requests import Request
 import allure
 import logging
 from faker import Faker
+from typing import Optional
 from endpoints.base_endpoint import BaseEndpoint
-from loggers import apply_logging_decorators
 
 # Initialize logger
 logger = logging.getLogger(__name__)
 
 
-@apply_logging_decorators
 class DeleteMeme(BaseEndpoint):
-    fake = Faker()
-    response = None  # Add this line to store the response
-    endpoint_with_id = "/meme/{id}"
-
     def __init__(self):
-        self.headers = self._default_headers_with_authorization()
+        super().__init__()
 
     @allure.step("Delete name")
     def delete_meme_by_id(
         self,
         id: int,
         *,
         headers=None,
-        endpoint_with_id="/meme/{id}",
     ) -> requests.Response:
-        headers = self._set_default_headers(headers)
-        url = self._build_endpoint_url(endpoint_with_id.format(id=id))
-
-        self.response = requests.delete(
-            url,
+        self.response = self._send_request(
+            "DELETE",
+            f"/meme/{id}",
             headers=headers,
         )
         return self.response

endpoints/get_meme.py

@@ -1,34 +1,29 @@
 import os
 import requests
+from requests import Request
 import allure
 import logging
 from faker import Faker
 from typing import Optional
 from endpoints.base_endpoint import BaseEndpoint
-from loggers import apply_logging_decorators
 
 # Initialize logger and Faker
 logger = logging.getLogger(__name__)
 
 
-@apply_logging_decorators
 class GetMeme(BaseEndpoint):
-    response = None  # Store the response
-
     def __init__(self):
-        self.headers = self._default_headers_with_authorization()
+        super().__init__()
 
     @allure.step("Get all memes")
     def get_all_memes(
         self,
         headers=None,
     ) -> requests.Response:
         """Fetches all memes from the API."""
-        headers = self._set_default_headers(headers)
-        url = self._build_endpoint_url("/meme")
-
-        self.response = requests.get(
-            url,
+        self.response = self._send_request(
+            "GET",
+            "/meme",
             headers=headers,
         )
         return self.response
@@ -41,11 +36,9 @@ def get_meme_by_id(
         headers=None,
     ) -> requests.Response:
         """Get a meme by ID"""
-        headers = self._set_default_headers(headers)
-        url = self._build_endpoint_url(f"/meme/{id}")
-
-        self.response = requests.get(
-            url,
+        self.response = self._send_request(
+            "GET",
+            f"/meme/{id}",
             headers=headers,
         )
         return self.response

endpoints/post_meme.py

@@ -5,19 +5,14 @@
 from faker import Faker
 from typing import Optional
 from endpoints.base_endpoint import BaseEndpoint
-from loggers import apply_logging_decorators
 
 # Initialize logger and Faker
 logger = logging.getLogger(__name__)
 
 
-@apply_logging_decorators
 class PostMeme(BaseEndpoint):
-    response = None  # Store the response
-    meme_id = None  # Store the meme id
-
     def __init__(self):
-        self.headers = self._default_headers_with_authorization()
+        super().__init__()
 
     @allure.step("Step name")
     def post_new_meme(
@@ -30,22 +25,18 @@ def post_new_meme(
         headers=None,
     ) -> requests.Response:
         """Make a POST request to the /meme endpoint"""
-        text = text or self._generate_text()
-        meme_url = url or self._generate_url()
-        tags = tags or self._generate_tags()
-        info = info or self._generate_picture_info()
-        headers = self._set_default_headers(headers)
-        endpoint_url = self._build_endpoint_url("/meme")
+        json = {
+            "text": text or self._generate_text(),
+            "url": url or self._generate_url(),
+            "tags": tags or self._generate_tags(),
+            "info": info or self._generate_picture_info(),
+        }
 
-        self.response = requests.post(
-            endpoint_url,
+        self.response = self._send_request(
+            "POST",
+            "/meme",
             headers=headers,
-            json={
-                "text": text,
-                "url": meme_url,
-                "tags": tags,
-                "info": info,
-            },
+            json=json,
         )
         return self.response
 

endpoints/put_meme.py

@@ -2,6 +2,7 @@
 import allure
 import logging
 from faker import Faker
+from typing import Optional
 from endpoints.base_endpoint import BaseEndpoint
 
 # Initialize logger
@@ -13,7 +14,28 @@ class PutMeme(BaseEndpoint):
     response = None  # Add this line to store the response
 
     @allure.step("Step name")
-    def method_name(
+    def put_meme_by_id(
         self,
+        *,
+        text: Optional[str] = None,
+        url: Optional[str] = None,
+        tags: Optional[list] = None,
+        info: Optional[object] = None,
+        headers=None,
     ) -> requests.Response:
-        pass
+        """Make a POST request to the /meme endpoint"""
+        json = {
+            "id": id,
+            "text": text or self._generate_text(),
+            "url": url or self._generate_url(),
+            "tags": tags or self._generate_tags(),
+            "info": info or self._generate_picture_info(),
+        }
+
+        self.response = self._send_request(
+            "POST",
+            "/meme",
+            headers=headers,
+            json=json,
+        )
+        return self.response