Merge branch 'develop' into feature/pre-commit

weni-ai · Aug 3, 2022 · 60600e9 · 60600e9
2 parents 6f98bd9 + cb5c3e8
commit 60600e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 24 deletions.
diff --git a/bothub/api/v2/internal/connect_rest_client.py b/bothub/api/v2/internal/connect_rest_client.py
@@ -2,7 +2,6 @@
 from typing import List, Dict
 
 from django.conf import settings
-from django.core.cache import cache
 
 
 class ConnectRESTClient:
@@ -28,21 +27,15 @@ def get_auth_token(self) -> str:
     def list_classifiers(
         self, project_uuid: str, user_email: str
     ) -> List[Dict[str, str]]:
-        cache_key = f"LIST_CLASSIFIER_CACHE_KEY:project_uuid:{project_uuid}:user_email:{user_email}"
-        cache_result = cache.get(cache_key, None)
-        if cache_result is None:
-            request = requests.get(
-                url=f"{self.base_url}/v1/organization/project/list_classifier/",
-                headers=self.headers,
-                params={"project_uuid": project_uuid, "user_email": user_email},
-            )
-            cache.set(cache_key, request.json().get("data"), settings.CACHE_TTL)
-            return request.json().get("data")
-        else:
-            return cache_result
+        request = requests.get(
+            url=f"{self.base_url}/v1/organization/project/list_classifier/",
+            headers=self.headers,
+            params={"project_uuid": project_uuid, "user_email": user_email},
+        )
 
-    def list_authorizations(self, project_uuid: str, user_email: str) -> List[str]:
+        return request.json()["data"]
 
+    def list_authorizations(self, project_uuid: str, user_email: str) -> List[str]:
         classifiers = self.list_classifiers(
             project_uuid=project_uuid, user_email=user_email
         )
@@ -53,7 +46,7 @@ def get_authorization_classifier(
         self, project_uuid: str, authorization_uuid: str, user_email: str
     ) -> str:
         """
-        Receives a authorization UUID and returns the respective classifier UUID
+        Recives a authorization UUID and returns the respective classifier UUID
         """
         classifiers = self.list_classifiers(project_uuid, user_email)
         classifier = filter(
@@ -71,8 +64,6 @@ def remove_authorization(
             authorization_uuid,
             user_email,
         )
-        cache_key = f"LIST_CLASSIFIER_CACHE_KEY:project_uuid:{project_uuid}:user_email:{user_email}"
-        cache.delete(cache_key)
         request = requests.delete(
             url=f"{self.base_url}/v1/organization/project/destroy_classifier/",
             headers=self.headers,
@@ -82,11 +73,6 @@ def remove_authorization(
         return request.json()
 
     def create_classifier(self, **kwargs):
-        project_uuid = kwargs.get("project_uuid")
-        user_email = kwargs.get("user_email")
-        cache_key = f"LIST_CLASSIFIER_CACHE_KEY:project_uuid:{project_uuid}:user_email:{user_email}"
-        cache.delete(cache_key)
-
         request = requests.post(
             url=f"{self.base_url}/v1/organization/project/create_classifier/",
             headers=self.headers,

diff --git a/bothub/settings.py b/bothub/settings.py
@@ -626,5 +626,3 @@
 ]
 
 REPOSITORY_BLOCK_USER_LOGS = env.list("REPOSITORY_BLOCK_USER_LOGS", default=[])
-
-CACHE_TTL = env.int("CACHE_TTL", default=180)