update endpoints

Author: summerduck

endpoints/base_endpoint.py

@@ -14,10 +14,11 @@
 
 class BaseEndpoint:
     def __init__(self):
-        self.url = "http://167.172.172.115:52355"
-        self.request = None  # Store the request
-        self.response = None  # Store the response
+        self.url = os.getenv("BASE_URL")
+        self.request = None
+        self.response = None
         self.fake = Faker()
+        self.meme_id = None
 
     def _send_request(
         self,
@@ -35,15 +36,15 @@ def _send_request(
             headers=headers,
             **kwargs,
         )
-        rlogger.requests_logging(self.request)
+        rlogger.requests_logging(self.request, endpoint)
 
         self.response = requests.request(
             method,
             url,
             headers=headers,
             **kwargs,
         )
-        rlogger.response_logging(self.response)
+        rlogger.response_logging(self.response, endpoint)
 
         return self.response
 

endpoints/delete_meme.py

@@ -1,9 +1,6 @@
-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
 
@@ -20,7 +17,7 @@ def delete_meme_by_id(
         self,
         id: int,
         *,
-        headers=None,
+        headers: Optional[dict] = None,
     ) -> requests.Response:
         self.response = self._send_request(
             "DELETE",

endpoints/get_meme.py

@@ -1,9 +1,6 @@
-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
 
@@ -18,7 +15,7 @@ def __init__(self):
     @allure.step("Get all memes")
     def get_all_memes(
         self,
-        headers=None,
+        headers: Optional[dict] = None,
     ) -> requests.Response:
         """Fetches all memes from the API."""
         self.response = self._send_request(
@@ -31,9 +28,9 @@ def get_all_memes(
     @allure.step("Get a meme by ID")
     def get_meme_by_id(
         self,
-        id,
+        id: int,
         *,
-        headers=None,
+        headers: Optional[dict] = None,
     ) -> requests.Response:
         """Get a meme by ID"""
         self.response = self._send_request(

endpoints/post_meme.py

@@ -1,8 +1,6 @@
-import os
 import requests
 import allure
 import logging
-from faker import Faker
 from typing import Optional
 from endpoints.base_endpoint import BaseEndpoint
 
@@ -21,8 +19,8 @@ def post_new_meme(
         text: Optional[str] = None,
         url: Optional[str] = None,
         tags: Optional[list] = None,
-        info: Optional[object] = None,
-        headers=None,
+        info: Optional[dict] = None,
+        headers: Optional[dict] = None,
     ) -> requests.Response:
         """Make a POST request to the /meme endpoint"""
         json = {
@@ -38,8 +36,9 @@ def post_new_meme(
             headers=headers,
             json=json,
         )
-        return self.response
 
-    def receive_post_meme_id(self):
-        meme_id = self.response.json()["id"]
-        return meme_id
+        # Store the meme ID if the request was successful
+        if self.response.status_code == 200:
+            self.meme_id = self.response.json()["id"]
+
+        return self.response

endpoints/put_meme.py

@@ -1,7 +1,6 @@
 import requests
 import allure
 import logging
-from faker import Faker
 from typing import Optional
 from endpoints.base_endpoint import BaseEndpoint
 
@@ -10,18 +9,19 @@
 
 
 class PutMeme(BaseEndpoint):
-    fake = Faker()
-    response = None  # Add this line to store the response
+    def __init__(self):
+        super().__init__()
 
     @allure.step("Step name")
     def put_meme_by_id(
         self,
+        id: int,
         *,
         text: Optional[str] = None,
         url: Optional[str] = None,
         tags: Optional[list] = None,
-        info: Optional[object] = None,
-        headers=None,
+        info: Optional[dict] = None,
+        headers: Optional[dict] = None,
     ) -> requests.Response:
         """Make a POST request to the /meme endpoint"""
         json = {