feat: support add devices flow

eocode · eocode · commit 7ae61fc0dd6d · 2022-10-21T22:57:38.000-05:00
diff --git a/src/app.py b/src/app.py
@@ -1,37 +1,60 @@
 from telegram.ext import CommandHandler, MessageHandler, filters, ConversationHandler
 
-from src.device.interface.device import DEVICES, PHOTO, LOCATION, BIO, skip_location, \
-    location, photo, device, devices, skip_photo, bio
+from src.device.interface.device import device, done, ACTIONABLE, show_response, ADD_MAC, add_mac, SAVE_DEVICE, \
+    save_device
 from src.device.interface.wifi import wifi
 from src.payment.interface.payment import payment
 from src.shared.infrastructure.bot.connector import application
-from src.shared.interface.cancel import cancel_conversation
 from src.shared.interface.messager import message_handler
 from src.user.interface.login import account
-from src.shared.interface.help import help_handler
+from src.shared.interface.help import help_handler, start_handler
 
 
 def start_app():
+    application.add_handler(CommandHandler(["start"], start_handler))
     application.add_handler(CommandHandler(["cuenta"], account))
-    application.add_handler(CommandHandler(["start"], help_handler))
     application.add_handler(CommandHandler(["ayuda"], help_handler))
     application.add_handler(CommandHandler(["pago"], payment))
     application.add_handler(CommandHandler(["wifi"], wifi))
+
+    # Add conversation handler with the states CHOOSING, TYPING_CHOICE and TYPING_REPLY
     conv_handler = ConversationHandler(
         entry_points=[CommandHandler("dispositivos", device)],
         states={
-            DEVICES: [MessageHandler(filters.Regex("^(Mis dispositivos|Agregar uno nuevo)$"), devices)],
-            PHOTO: [MessageHandler(filters.PHOTO, photo), CommandHandler("skip", skip_photo)],
-            LOCATION: [
-                MessageHandler(filters.LOCATION, location),
-                CommandHandler("omitir", skip_location),
+            # CHOOSING: [
+            #     MessageHandler(
+            #         filters.Regex("^(Age|Favourite colour|Number of siblings)$"), regular_choice
+            #     ),
+            #     MessageHandler(filters.Regex("^Something else...$"), custom_choice),
+            # ],
+            # TYPING_CHOICE: [
+            #     MessageHandler(
+            #         filters.TEXT & ~(filters.COMMAND | filters.Regex("^Done$")), regular_choice
+            #     )
+            # ],
+            ACTIONABLE: [
+                MessageHandler(
+                    filters.TEXT & ~(filters.COMMAND | filters.Regex("^Done$")),
+                    show_response,
+                )
+            ],
+            ADD_MAC: [
+                MessageHandler(
+                    filters.TEXT & ~(filters.COMMAND | filters.Regex("^Done$")),
+                    add_mac,
+                )
+            ],
+            SAVE_DEVICE: [
+                MessageHandler(
+                    filters.TEXT & ~(filters.COMMAND | filters.Regex("^Done$")),
+                    save_device,
+                )
             ],
-            BIO: [MessageHandler(filters.TEXT & ~filters.COMMAND, bio)],
         },
-        fallbacks=[CommandHandler("cancelar", cancel_conversation)],
+        fallbacks=[MessageHandler(filters.Regex("^Cancelar$"), done)],
     )
-
     application.add_handler(conv_handler)
+
     application.add_handler(MessageHandler(filters.TEXT, message_handler))
 
     application.run_polling()
diff --git a/src/device/interface/device.py b/src/device/interface/device.py
@@ -1,91 +1,111 @@
+from typing import Dict
+
 from telegram import Update, ReplyKeyboardMarkup, ReplyKeyboardRemove
 from telegram.constants import ChatAction
 from telegram.ext import ContextTypes, ConversationHandler
 
 from src.device.application.request_wifi import request_wifi
+from src.shared.infrastructure.validators.validate_mac import is_valid_mac_address
+
+ACTIONABLE, ADD_MAC, SAVE_DEVICE = range(3)
+options = ["Mis dispositivos", "Agregar uno nuevo"]
 
-DEVICES, PHOTO, LOCATION, BIO = range(4)
-OPTIONS = ["Mis dispositivos", "Agregar uno nuevo"]
+data = {}
 
 
-async def device(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+async def device(update: Update, context: ContextTypes.DEFAULT_TYPE):
     """Starts the conversation and asks the user about their gender."""
-    reply_keyboard = [OPTIONS]
+
+    options = ["Mis dispositivos", "Agregar uno nuevo"]
+
+    reply_keyboard = [
+        options,
+    ]
+    markup = ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True)
 
     await update.message.reply_text(
-        "En está sección podrás agregar y ver los dispositivos que has registrado.\n\n"
-        "Envia /cancelar para terminar la conversación.\n\n"
+        "🧾 Registra y gestiona tus dispositivos aquí.\n"
         "Por favor selecciona una opción para continuar:",
-        reply_markup=ReplyKeyboardMarkup(
-            reply_keyboard, one_time_keyboard=True, input_field_placeholder="Elije:"
-        ),
+        reply_markup=markup,
     )
 
-    return DEVICES
+    return ACTIONABLE
+
 
+async def show_response(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+    """Store info provided by user and ask for the next category."""
+    text = update.message.text
 
-async def devices(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
-    """Stores the selected gender and asks for a photo."""
-    user = update.message.from_user
-    message = update.message.text
-    if message == OPTIONS[0]:
+    if text == options[0]:
         await update.message.reply_text(
-            f"Elegiste: {message}"
+            "A continuación te mostraremos tus dispositivos agregados",
+            reply_markup=ReplyKeyboardRemove()
         )
-        return PHOTO
-    if update.message.text == OPTIONS[1]:
+        return ConversationHandler.END
+    if text == options[1]:
+        types = ['Telefono', 'PC']
+        reply_keyboard = [
+            types,
+        ]
+        markup = ReplyKeyboardMarkup(reply_keyboard, one_time_keyboard=True)
         await update.message.reply_text(
-            f"Elegiste: {message}"
+            "📱 Elige el tipo de dispositivo que agregarás.\n"
+            "La red se optimizará para el tipo de dispositivo que agregues",
+            reply_markup=markup,
         )
-        return PHOTO
 
+        return ADD_MAC
 
-async def photo(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
-    """Stores the photo and asks for a location."""
-    user = update.message.from_user
-    photo_file = await update.message.photo[-1].get_file()
-    await photo_file.download("user_photo.jpg")
-    await update.message.reply_text(
-        "Gorgeous! Now, send me your location please, or send /skip if you don't want to."
-    )
 
-    return LOCATION
+async def add_mac(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+    """Store info provided by user and ask for the next category."""
+
+    type = update.message.text
+    data[update.message.chat_id] = type
 
+    print(type)
 
-async def skip_photo(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
-    """Skips the photo and asks for a location."""
-    user = update.message.from_user
     await update.message.reply_text(
-        "I bet you look great! Now, send me your location please, or send /skip."
+        "Agregaremos un nuevo dispositivo",
+        reply_markup=ReplyKeyboardRemove()
+    )
+    await update.message.reply_text(
+        'Escribe la dirección MAC'
     )
 
-    return LOCATION
+    return SAVE_DEVICE
 
 
-async def location(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
-    """Stores the location and asks for some info about the user."""
-    user = update.message.from_user
-    user_location = update.message.location
-    await update.message.reply_text(
-        "Maybe I can visit you sometime! At last, tell me something about yourself."
-    )
+async def save_device(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+    """Store info provided by user and ask for the next category."""
 
-    return BIO
+    mac = update.message.text
+    print(mac, data.get(update.message.chat_id))
 
+    if is_valid_mac_address(mac):
+        await update.message.reply_text(
+            'Dirección valida',
+            reply_markup=ReplyKeyboardRemove()
+        )
+    else:
+        await update.message.reply_text(
+            '❌ Dirección MAC invalida\nIntenta de nuevo en /dispositivos',
+            reply_markup=ReplyKeyboardRemove()
+        )
 
-async def skip_location(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
-    """Skips the location and asks for info about the user."""
-    user = update.message.from_user
-    await update.message.reply_text(
-        "You seem a bit paranoid! At last, tell me something about yourself."
-    )
+    return ConversationHandler.END
 
-    return BIO
 
+async def done(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
+    """Display the gathered info and end the conversation."""
+    user_data = context.user_data
+    if "choice" in user_data:
+        del user_data["choice"]
 
-async def bio(update: Update, context: ContextTypes.DEFAULT_TYPE) -> int:
-    """Stores the info about the user and ends the conversation."""
-    user = update.message.from_user
-    await update.message.reply_text("Thank you! I hope we can talk again some day.")
+    await update.message.reply_text(
+        f"I learned these facts about you: {user_data}Until next time!",
+        reply_markup=ReplyKeyboardRemove(),
+    )
 
+    user_data.clear()
     return ConversationHandler.END
diff --git a/src/shared/application/request_help.py b/src/shared/application/request_help.py
@@ -8,11 +8,24 @@ def request_help(user):
     response = []
     if access:
         response.append(
-            f"/cuenta Acerca de tu cuenta\n/pago Tú próximo pago\n/wifi Clave de "
-            f"internet\n/dispositivos Registra tus dispositivos\n/problemas Reporta un problema\n/garrafones Compra "
+            f"🪪 /cuenta Acerca de tu cuenta\n💵 /pago Tú próximo pago\n🌐 /wifi Clave de "
+            f"internet\n📱 /dispositivos Registra tus dispositivos\n📬 /problemas Reporta un problema\n💧 /garrafones Compra "
             f"garrafones de "
             f"agua")
     else:
         return get_unnaccess()
 
     return response
+
+
+def request_start(user):
+    usr, access, info = GetAccount().execute(permission='settings', chat_id=user.id,
+                                             name=user.first_name, username=user.username)
+    response = []
+    if access:
+        response.append(
+            f"Hola mi nombre es Cerebro tu asistente digital, comienza gestionando tu /cuenta para comenzar. Una vez activa podrás acceder a todas las funcionalidades")
+    else:
+        return get_unnaccess()
+
+    return response
diff --git a/src/shared/infrastructure/validators/__init__.py b/src/shared/infrastructure/validators/__init__.py
diff --git a/src/shared/infrastructure/validators/validate_mac.py b/src/shared/infrastructure/validators/validate_mac.py
@@ -0,0 +1,26 @@
+import re
+
+
+def is_valid_mac_address(str):
+    # Regex to check valid
+    # MAC address
+    regex = ("^([0-9A-Fa-f]{2}[:-])" +
+             "{5}([0-9A-Fa-f]{2})|" +
+             "([0-9a-fA-F]{4}\\." +
+             "[0-9a-fA-F]{4}\\." +
+             "[0-9a-fA-F]{4})$")
+
+    # Compile the ReGex
+    p = re.compile(regex)
+
+    # If the string is empty
+    # return false
+    if str is None:
+        return False
+
+    # Return if the string
+    # matched the ReGex
+    if re.search(p, str):
+        return True
+    else:
+        return False
diff --git a/src/shared/interface/help.py b/src/shared/interface/help.py
@@ -2,7 +2,7 @@
 from telegram.constants import ChatAction
 from telegram.ext import ContextTypes
 
-from src.shared.application.request_help import request_help
+from src.shared.application.request_help import request_help, request_start
 
 
 async def help_handler(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
@@ -12,3 +12,12 @@ async def help_handler(update: Update, context: ContextTypes.DEFAULT_TYPE) -> No
 
     for m in request_help(update.message.from_user):
         await update.message.reply_text(m)
+
+
+async def start_handler(update: Update, context: ContextTypes.DEFAULT_TYPE) -> None:
+    await update.message.reply_text("Bienvenid@ ...")
+
+    await context.bot.sendChatAction(chat_id=update.message.chat_id, action=ChatAction.TYPING)
+
+    for m in request_start(update.message.from_user):
+        await update.message.reply_text(m)
diff --git a/src/user/application/request_account.py b/src/user/application/request_account.py
@@ -6,11 +6,11 @@ def request_account(user):
     usr, access, info = GetAccount().execute(permission='settings', chat_id=user.id,
                                              name=user.first_name, username=user.username)
 
-    response = [f"Nombre: {info.full_name}\nTelefono: {info.phone}\nActivo: {info.verify}"]
+    response = [f"🧠 Nombre: {info.full_name}\n📱 Telefono: {info.phone}\nActivo: {'🟢' if info.verify else '🔴'}"]
 
     if access:
         response.append(
-            f"Hospedado en {info.room_name.lower()}\nDesde el {info.room_start_date}\n{f'Hasta el {info.room_end_date}' if info.room_end_date is not None else ''}")
+            f"🏡 Hospedado en {info.room_name.lower()}\nDesde el {info.room_start_date}\n{f'Hasta el {info.room_end_date}' if info.room_end_date is not None else ''}")
         response.append(
             f"Consulta más acciones en /ayuda")
 
