feature: refactors the current generic apptype structure and applies dependency inversion to the client

Author: elitonzky

.coveragerc

@@ -10,6 +10,7 @@ omit =
     marketplace/connect/*
     marketplace/wpp_templates/requests.py
     *urls.py*
+    marketplace/interfaces/*
 
 [report]
 fail_under = 70

marketplace/connect/client.py

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

marketplace/core/serializers.py

@@ -6,6 +6,7 @@
 if TYPE_CHECKING:
     from marketplace.core.types.base import AppType  # pragma: no cover
 
+
 User = get_user_model()
 
 

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

@@ -11,8 +11,6 @@
 
 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,9 +57,7 @@ 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,10 +44,7 @@ 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,9 +118,7 @@ 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,9 +27,7 @@ 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/base.py

@@ -5,8 +5,3 @@
 class ExternalAppType(AppType):
     platform = App.PLATFORM_WENI_FLOWS
     category = AppType.CATEGORY_EXTERNAL
-
-    # TODO: uncomment this method
-    # @abstractproperty
-    # def flows_type_code(self) -> str:
-    #     pass

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

@@ -21,10 +21,7 @@ class Meta:
         read_only_fields = ("code", "uuid", "platform")
 
     def create(self, validated_data):
-        # TODO: Send the responsibility of this method to the AppTypeBaseSerializer and create an object from the type
-        from .type import GenericType
-
-        validated_data["platform"] = GenericType.platform
+        validated_data["platform"] = self.type_class.platform
         return super().create(validated_data)
 
 
@@ -52,11 +49,11 @@ def validate(self, attrs: dict):
     def _create_channel(self, attrs: dict, app: App) -> str:
         request = self.context.get("request")
         user = request.user
-        flows_type_code = app.config.get("flows_type_code")
-        client = ConnectProjectClient()
-        return client.create_external_service(
-            user.email, app.project_uuid, attrs, flows_type_code
+        external_code = app.config.get("external_code")
+        response = app.apptype.create(
+            ConnectProjectClient(), user.email, app.project_uuid, attrs, external_code
         )
+        return response
 
 
 class GenericConfigureSerializer(AppTypeBaseSerializer):