fix: change client from connect to flows

Author: elitonzky

marketplace/connect/client.py

@@ -3,7 +3,6 @@
 from django.conf import settings
 
 from rest_framework.exceptions import ValidationError
-from marketplace.interfaces.connect import ConnectInterface
 
 
 class ConnectAuth:
@@ -23,9 +22,7 @@ def auth_header(self) -> dict:
         return {"Authorization": self.__get_auth_token()}
 
 
-class ConnectProjectClient(
-    ConnectAuth, ConnectInterface
-):  # TODO: change class name to FlowsRESTClient
+class ConnectProjectClient(ConnectAuth):  # TODO: change class name to FlowsRESTClient
     base_url = settings.FLOWS_REST_ENDPOINT
     use_connect_v2 = settings.USE_CONNECT_V2
 

marketplace/core/types/channels/generic/views.py

@@ -11,6 +11,8 @@
 
 from marketplace.applications.models import AppTypeAsset
 
+from . import type as type_
+
 from django.conf import settings
 
 IMPORTANCE_CHANNELS_ORDER = settings.IMPORTANCE_CHANNELS_ORDER

marketplace/core/types/channels/instagram/serializers.py

@@ -57,7 +57,9 @@ def _create_channel(self, attrs: dict, app: App) -> str:
             "page_name": attrs.get("page_name"),
             "page_id": attrs.get("page_id"),
         }
-        response = client.create_channel(user.email, app.project_uuid, payload, app.flows_type_code)
+        response = client.create_channel(
+            user.email, app.project_uuid, payload, app.flows_type_code
+        )
 
         return response
 

marketplace/core/types/channels/telegram/serializers.py

@@ -44,7 +44,10 @@ def _create_channel(self, attrs: dict, app: App) -> str:
         user = self.context.get("request").user
         client = ConnectProjectClient()
         return client.create_channel(
-            user.email, app.project_uuid, {"auth_token": attrs.get("token")}, app.flows_type_code
+            user.email,
+            app.project_uuid,
+            {"auth_token": attrs.get("token")},
+            app.flows_type_code,
         )
 
 

marketplace/core/types/channels/weni_web_chat/serializers.py

@@ -118,7 +118,9 @@ def _create_channel(self) -> str:
         data = {"name": name, "base_url": settings.SOCKET_BASE_URL}
 
         client = ConnectProjectClient()
-        return client.create_channel(user.email, self.app.project_uuid, data, self.app.flows_type_code)
+        return client.create_channel(
+            user.email, self.app.project_uuid, data, self.app.flows_type_code
+        )
 
     def generate_script(self, attrs):
         """

marketplace/core/types/channels/whatsapp_demo/views.py

@@ -27,7 +27,9 @@ def perform_create(self, serializer):
         )
 
         client = ConnectProjectClient()
-        result = client.create_channel(user.email, str(instance.project_uuid), data, instance.flows_type_code)
+        result = client.create_channel(
+            user.email, str(instance.project_uuid), data, instance.flows_type_code
+        )
 
         instance.config["title"] = result.get("name")
         instance.config["channelUuid"] = result.get("uuid")

marketplace/core/types/externals/generic/serializers.py

@@ -2,7 +2,7 @@
 
 from marketplace.core.serializers import AppTypeBaseSerializer
 from marketplace.applications.models import App
-from marketplace.connect.client import ConnectProjectClient
+from marketplace.flows.client import FlowsClient
 
 
 class GenericExternalSerializer(AppTypeBaseSerializer):
@@ -51,7 +51,7 @@ def _create_channel(self, attrs: dict, app: App) -> str:
         user = request.user
         external_code = app.config.get("external_code")
         response = app.apptype.create(
-            ConnectProjectClient(), user.email, app.project_uuid, attrs, external_code
+            FlowsClient(), user.email, str(app.project_uuid), attrs, external_code
         )
         return response
 

marketplace/core/types/externals/generic/tests/test_views.py

@@ -23,7 +23,7 @@
 
 from typing import Any
 from marketplace.interfaces.flows import FlowsInterface
-from marketplace.interfaces.connect import ConnectInterface
+
 
 apptype = GenericExternalAppType()
 
@@ -70,11 +70,6 @@ def release_external_service(self, uuid: str, user_email: str) -> Any:
         response.status_code = 200
         return response
 
-
-class MockConnectClient(ConnectInterface):
-    base_url = "connect test"
-    use_connect_v2 = "test"
-
     def create_external_service(
         self, user: str, project_uuid: str, type_fields: dict, type_code: str
     ):
@@ -97,17 +92,17 @@ def setUpClass(cls):
             "marketplace.core.types.externals.generic.views.FlowsClient",
             MockFlowsClient,
         )
-        cls.patch_connect_client = patch(
-            "marketplace.core.types.externals.generic.serializers.ConnectProjectClient",
-            MockConnectClient,
+        cls.patch_serializer_flows_client = patch(
+            "marketplace.core.types.externals.generic.serializers.FlowsClient",
+            MockFlowsClient,
         )
         cls.patch_flows_client.start()
-        cls.patch_connect_client.start()
+        cls.patch_serializer_flows_client.start()
 
     @classmethod
     def tearDownClass(cls):
         cls.patch_flows_client.stop()
-        cls.patch_connect_client.stop()
+        cls.patch_serializer_flows_client.stop()
         super().tearDownClass()
 
     def setUp(self):

marketplace/core/types/externals/generic/type.py

@@ -1,7 +1,6 @@
 from .views import GenericExternalsViewSet
 
 from marketplace.interfaces.flows import FlowsInterface
-from marketplace.interfaces.connect import ConnectInterface
 
 from marketplace.core.types.base import AppType, GenericAppType
 
@@ -22,7 +21,7 @@ def release(cls, client: FlowsInterface, uuid: str, user_email: str):
     @classmethod
     def create(
         cls,
-        client: ConnectInterface,
+        client: FlowsInterface,
         user: str,
         project_uuid: str,
         attrs: dict,

marketplace/flows/client.py

@@ -71,6 +71,17 @@ def create_external_service(
         )
         return response
 
+    def list_external_types(self, flows_type_code=None):
+        url = f"{self.base_url}/api/v2/internals/generic/externals/"
+
+        if flows_type_code:
+            url = f"{self.base_url}/api/v2/internals/generic/externals/{str(flows_type_code)}"
+
+        response = self.make_request(
+            url, method="GET", headers=self.authentication_instance.headers
+        )
+        return response.json()
+
     def make_request(self, url: str, method: str, headers=None, data=None, params=None):
         try:
             response = requests.request(

marketplace/interfaces/connect.py

@@ -4,6 +4,11 @@
 
 class FlowsInterface(ABC):
     @abstractmethod
+    def create_external_service(
+        self, user: str, project: str, type_fields: dict, type_code: str
+    ) -> Any:
+        pass
+
     def list_external_types(self, flows_type_code=None) -> Any:
         pass