Parametro Check y Mix de Create() para Template y Message

botmaker/resources/base.py

@@ -1,3 +1,45 @@
+from botmaker.exc import InvalidPhoneNumber
+from botmaker.helpers import sanitize_phone_number
+
+
 class Resource:
     _client = None
     _endpoint = None
+
+    @classmethod
+    def commonCreate(
+            cls,
+            from_: str,
+            to: str,
+            chat_platform: str,
+            check_phone: bool,
+            **data):
+        from_ = sanitize_phone_number(from_)
+        if check_phone:
+            if chat_platform == 'whatsapp' and check_phone:
+                checked = cls._client.check_whatsapp_contact(from_, to)
+                if not checked:
+                    raise InvalidPhoneNumber(
+                        f"'{to} is not from valid WhatsApp contact")
+                else:
+                    to = checked
+            else:
+                to = sanitize_phone_number(to)
+        else:
+            to = sanitize_phone_number(to)
+        to = sanitize_phone_number(to)
+        body = dict(
+            chatPlatform=chat_platform,
+            chatChannelNumber=from_,
+            platformContactId=to,
+        )
+
+        if cls._endpoint == '/message/v3':
+            body['messageText'] = data['message_text']
+            resp = cls._client.post(cls._endpoint, body)
+            return cls(resp['id'], from_, to, data['message_text'])
+        if cls._endpoint == '/intent/v2':
+            body['ruleNameOrId'] = data['template']
+            body['params'] = data['params']
+            resp = cls._client.post(cls._endpoint, body)
+            return cls(resp['id'], from_, to, data['template'], data['params'])

botmaker/resources/messages.py

@@ -1,8 +1,4 @@
 from dataclasses import dataclass
-
-from botmaker.exc import InvalidPhoneNumber
-from botmaker.helpers import sanitize_phone_number
-
 from .base import Resource
 
 
@@ -21,27 +17,16 @@ def create(
             from_: str,
             to: str,
             message_text: str,
+            check_phone: bool = False,
             chat_platform: str = 'whatsapp'
     ):
         """
         Based on
         https://botmakeradmin.github.io/docs/es/#/messages-api?id=enviando-mensajes-a-los-usuarios
         """
-        from_ = sanitize_phone_number(from_)
-        if chat_platform == 'whatsapp':
-            checked = cls._client.check_whatsapp_contact(from_, to)
-            if not checked:
-                raise InvalidPhoneNumber(
-                    f"'{to} is not from valid WhatsApp contact")
-            else:
-                to = checked
-        else:
-            to = sanitize_phone_number(to)
-        data = dict(
-            chatPlatform=chat_platform,
-            chatChannelNumber=from_,
-            platformContactId=to,
-            messageText=message_text
-        )
-        resp = cls._client.post(cls._endpoint, data)
-        return cls(resp['id'], from_, to, message_text)
+        return cls.commonCreate(
+            from_,
+            to,
+            chat_platform,
+            check_phone,
+            message_text=message_text)

botmaker/resources/template_messages.py

@@ -1,8 +1,4 @@
 from dataclasses import dataclass, field
-
-from botmaker.exc import InvalidPhoneNumber
-from botmaker.helpers import sanitize_phone_number
-
 from .base import Resource
 
 
@@ -23,28 +19,17 @@ def create(
             to: str,
             template: str,
             chat_platform: str = 'whatsapp',
+            check_phone: bool = True,
             **params
     ):
         """
         Based on
         https://botmakeradmin.github.io/docs/es/#/messages-api?id=templates-messages
         """
-        from_ = sanitize_phone_number(from_)
-        if chat_platform == 'whatsapp':
-            checked = cls._client.check_whatsapp_contact(from_, to)
-            if not checked:
-                raise InvalidPhoneNumber(
-                    f"'{to} is not from valid WhatsApp contact")
-            else:
-                to = checked
-        else:
-            to = sanitize_phone_number(to)
-        data = dict(
-            chatPlatform=chat_platform,
-            chatChannelNumber=from_,
-            platformContactId=to,
-            ruleNameOrId=template,
-            params=params
-        )
-        resp = cls._client.post(cls._endpoint, data)
-        return cls(resp['id'], from_, to, template, params)
+        return cls.commonCreate(
+            from_,
+            to,
+            chat_platform,
+            check_phone,
+            template=template,
+            params=params)

tests/test_messages.py

@@ -23,5 +23,6 @@ def test_invalid_whatsapp_number_message(client):
         client.messages.create(
             '5215500000000',
             '123',
+            check_phone=True,
             message_text='message test',
         )