Merge pull request #56 from PyAr/cantidad_de_votos_por_proyecto

WinnaZ · web-flow · commit 6f9e6bcae3d4 · 2023-03-25T17:33:33.000-03:00
Cantidad de votos por proyecto 2
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,6 @@ USER root
 
 COPY . /pycamp/telegram_bot
 WORKDIR /pycamp/telegram_bot
-RUN pip3 install -U .
+RUN pip3 install -U -e .
 
 CMD [ "python", "bin/run_bot.py" ]
diff --git a/README.md b/README.md
@@ -64,8 +64,8 @@ elegido en la envvar `PYCAMP_BOT_MASTER_KEY`
 * `/empezar_carga_proyectos` habilita la carga de los proyectos. En este punto los pycampistas pueden cargar sus proyectos,
 enviandole al bot el comando `/cargar_proyecto`
 * `/terminar_carga_proyectos` termina carga proyectos
-* `/empezar_votacion`  activa la votacion (a partir de ahora los pycampistas pueden votar con `/votar`)
-* `/terminar_votacion` termina la votacion
+* `/empezar_votacion_proyectos`  activa la votacion (a partir de ahora los pycampistas pueden votar con `/votar`)
+* `/terminar_votacion_proyectos` termina la votacion
 
 Para generar el schedule:
 
diff --git a/bin/pycamp_manager.py b/bin/pycamp_manager.py
@@ -1,10 +1,10 @@
 import argparse
 import datetime
-import logging
 from pycamp_bot.models import Pycamp
 from pycamp_bot.models import Pycampista
 from pycamp_bot.models import PycampistaAtPycamp
 from pycamp_bot.models import models_db_connection
+from pycamp_bot.logger import logger
 
 
 def parse_args():
@@ -59,20 +59,20 @@ def parse_args():
 
     if args.wich == 'pycampista':
         if args.add:
-            logging.info('Adding pycampista')
+            logger.info('Adding pycampista')
             pycampista = Pycampista.create(username=args.name)
 
         if args.arrive:
             arrive_time = datetime.datetime.fromisoformat(args.arrive)
-            logging.info('Changing arrive time to {}'.format(arrive_time))
+            logger.info('Changing arrive time to {}'.format(arrive_time))
             pycampista = Pycampista.select().where(
                 Pycampista.username == args.name)[0]
             pycampista.arrive = arrive_time
             pycampista.save()
 
         if args.departure:
             departure_time = datetime.datetime.fromisoformat(args.departure)
-            logging.info('Changing departure time to {}'.format(departure_time))
+            logger.info('Changing departure time to {}'.format(departure_time))
             pycampista = Pycampista.select().where(
                 Pycampista.username == args.name)[0]
             pycampista.leave = departure_time
@@ -83,20 +83,20 @@ def parse_args():
         print(pycampista)
     elif args.wich == 'pycamp':
         if args.add:
-            logging.info('Adding pycamp')
+            logger.info('Adding pycamp')
             pycamp = Pycamp.create(headquarters=args.name)
 
         if args.init:
             init_time = datetime.datetime.fromisoformat(args.init)
-            logging.info('Changing init time to {}'.format(init_time))
+            logger.info('Changing init time to {}'.format(init_time))
             pycamp = Pycamp.select().where(
                 Pycamp.headquarters == args.name)[0]
             pycamp.init = init_time
             pycamp.save()
 
         if args.end:
             end_time = datetime.datetime.fromisoformat(args.end)
-            logging.info('Changing end time to {}'.format(end_time))
+            logger.info('Changing end time to {}'.format(end_time))
             pycamp = Pycamp.select().where(
                 Pycamp.headquarters == args.name)[0]
             pycamp.end = end_time
diff --git a/bin/run_bot.py b/bin/run_bot.py
@@ -1,4 +1,3 @@
-import logging
 import os
 from telegram.ext import Application
 from pycamp_bot.commands import auth
@@ -11,12 +10,7 @@
 from pycamp_bot.commands import schedule
 from pycamp_bot.commands import announcements
 from pycamp_bot.models import models_db_connection
-
-
-logging.basicConfig(
-    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-    level=logging.INFO)
-logger = logging.getLogger(__name__)
+from pycamp_bot.logger import logger
 
 
 def set_handlers(application):
diff --git a/docs/source/comandos_bot.rst b/docs/source/comandos_bot.rst
@@ -14,8 +14,8 @@ Comandos de Administrador
 - ``/empezar_pycamp``: Setea la fecha de inicio del pycamp activo.
 - ``/empezar_carga_proyectos``: Habilita la carga de los proyectos. En este punto los pycampistas pueden cargar sus proyectos, enviandole al bot el comando ``/cargar_proyecto``.
 - ``/terminar_carga_proyectos``: Termina carga proyectos.
-- ``/empezar_votacion``: Activa la votacion (a partir de ahora los pycampistas pueden votar con ``/votar``).
-- ``/terminar_votacion``: Termina la votacion.
+- ``/empezar_votacion_proyectos``: Activa la votacion (a partir de ahora los pycampistas pueden votar con ``/votar``).
+- ``/terminar_votacion_proyectos``: Termina la votacion.
 - ``/cronogramear``: Pregunta los dias y slot por día para poder crear el cronograma.
 - ``/cambiar_slot``: Toma un nombre de proyecto y un slot; y te cambia ese proyecto a ese slot.
 
diff --git a/docs/source/instalacion_entorno.rst b/docs/source/instalacion_entorno.rst
@@ -58,12 +58,18 @@ Para ejecutar el bot primero contruya la imagen:
 
     docker build -t pycamp_bot:latest .
 
-Ahora inicie el contenedor:
+Ahora inicie el contenedor por primera vez:
 
 .. code-block:: bash
 
     docker run -e "TOKEN=TOKEN_PERSONAL" -e "PYCAMP_BOT_MASTER_KEY=KEY" -v ./:/pycamp/telegram_bot --name pycamp_telegram_bot pycamp_bot
 
+Luego puede arrancar con:
+
+.. code-block:: bash
+
+    docker start -ia pycamp_telegram_bot
+
 Para ejecutar los test:
 
 .. code-block:: bash
diff --git a/src/pycamp_bot/commands/announcements.py b/src/pycamp_bot/commands/announcements.py
@@ -1,12 +1,8 @@
-import logging
 from telegram.ext import CommandHandler
 from pycamp_bot.models import Project, Pycampista, Vote
 from pycamp_bot.commands.auth import get_admins_username
 
 
-logger = logging.getLogger(__name__)
-
-
 async def announce(update, context):
     username = update.message.from_user.username
     admins = get_admins_username()
diff --git a/src/pycamp_bot/commands/auth.py b/src/pycamp_bot/commands/auth.py
@@ -1,10 +1,7 @@
-import logging
 import os
 from telegram.ext import CommandHandler
 from pycamp_bot.models import Pycampista
-
-
-logger = logging.getLogger(__name__)
+from pycamp_bot.logger import logger
 
 
 def get_admins_username():
diff --git a/src/pycamp_bot/commands/base.py b/src/pycamp_bot/commands/base.py
@@ -1,9 +1,6 @@
-import logging
 from telegram.ext import CommandHandler
 from pycamp_bot.commands.help_msg import get_help
-
-
-logger = logging.getLogger(__name__)
+from pycamp_bot.logger import logger
 
 
 async def msg_to_active_pycamp_chat(bot, text):
diff --git a/src/pycamp_bot/commands/manage_pycamp.py b/src/pycamp_bot/commands/manage_pycamp.py
@@ -1,12 +1,10 @@
 import datetime
-import logging
 from telegram.ext import CommandHandler
 from pycamp_bot.models import Pycamp
 from pycamp_bot.models import Pycampista
 from pycamp_bot.models import PycampistaAtPycamp
 from pycamp_bot.commands.auth import admin_needed
-
-logger = logging.getLogger(__name__)
+from pycamp_bot.logger import logger
 
 
 def get_pycamp_by_name(name):
@@ -19,11 +17,10 @@ def get_pycamp_by_name(name):
 
 
 def get_active_pycamp():
-    active = Pycamp.select().where(Pycamp.active == True)
+    active = Pycamp.select().where(Pycamp.active)
     if active.count() == 0:
         return False, None
-    else:
-        return True, active[0]
+    return True, active[0]
 
 
 def active_needed(f):
diff --git a/src/pycamp_bot/commands/projects.py b/src/pycamp_bot/commands/projects.py
@@ -1,16 +1,14 @@
-import logging
 from telegram.ext import ConversationHandler, CommandHandler, MessageHandler, filters
 from pycamp_bot.models import Pycampista, Project, Vote
 from pycamp_bot.commands.base import msg_to_active_pycamp_chat
 from pycamp_bot.commands.manage_pycamp import active_needed, get_active_pycamp
 from pycamp_bot.commands.auth import admin_needed
+from pycamp_bot.logger import logger
 
 
 current_projects = {}
 NOMBRE, DIFICULTAD, TOPIC = ["nombre", "dificultad", "topic"]
 
-logger = logging.getLogger(__name__)
-
 
 def load_authorized(f):
     async def wrap(*args, **kargs):
diff --git a/src/pycamp_bot/commands/schedule.py b/src/pycamp_bot/commands/schedule.py
@@ -1,4 +1,3 @@
-import logging
 import string
 from telegram.ext import ConversationHandler, CommandHandler, MessageHandler, filters
 from pycamp_bot.models import Project, Slot, Pycampista, Vote
@@ -9,8 +8,6 @@
 
 DAY_LETTERS = []
 
-logger = logging.getLogger(__name__)
-
 
 def _dictToString(dicto):
     if dicto:
diff --git a/src/pycamp_bot/commands/voting.py b/src/pycamp_bot/commands/voting.py
@@ -1,29 +1,27 @@
-import logging
+import functools
 import peewee
 from telegram import InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import CommandHandler, CallbackQueryHandler
 from pycamp_bot.commands.base import msg_to_active_pycamp_chat
 from pycamp_bot.commands.auth import admin_needed
 from pycamp_bot.commands.manage_pycamp import active_needed, get_active_pycamp
 from pycamp_bot.models import Pycampista, Project, Vote
+from pycamp_bot.logger import logger
 
 
-logger = logging.getLogger(__name__)
-
-
-def vote_authorized(f):
-    async def wrap(*args, **kargs):
+def vote_authorized(func):
+    @functools.wraps(func)
+    async def wrap(*args):
         logger.info('Vote authorized wrapper')
 
         update, context = args
         is_active, pycamp = get_active_pycamp()
         if pycamp.vote_authorized:
-           await f(*args)
+            await func(update, context)
         else:
             await context.bot.send_message(
                 chat_id=update.message.chat_id,
-                text="La eleccion no está autorizada. Avisale a un admin\
-                (/admins)!")
+                text="La eleccion no está autorizada. Avisale a un admin (/admins)!")
     return wrap
 
 
diff --git a/src/pycamp_bot/logger.py b/src/pycamp_bot/logger.py
@@ -0,0 +1,41 @@
+"""Módulo para hacer loggeos."""
+
+import logging
+
+
+LOG_FORMAT = '[%(asctime)s] - [%(filename)s %(lineno)d] %(levelname)s:'
+LOG_DATE_FORMAT = '%Y:%m:%d %H:%M:%S'
+
+
+class LogFormatter(logging.Formatter):
+    """Formateador del log."""
+    grey = "\x1b[38;20m"
+    blue = "\x1b[34;20m"
+    yellow = "\x1b[33;20m"
+    red = "\x1b[31;20m"
+    bold_red = "\x1b[31;1m"
+    reset = "\x1b[0m"
+
+    FORMATS = {
+        logging.DEBUG: LOG_FORMAT + ' ' + grey + '%(message)s' + reset,
+        logging.INFO: LOG_FORMAT + ' ' + blue + '%(message)s' + reset,
+        logging.WARNING: LOG_FORMAT + ' ' + yellow + '%(message)s' + reset,
+        logging.ERROR: LOG_FORMAT + ' ' + red + '%(message)s' + reset,
+        logging.CRITICAL: LOG_FORMAT + ' ' + bold_red + '%(message)s' + reset,
+    }
+
+    def format(self, record):
+        log_formatter = logging.Formatter(
+            fmt=self.FORMATS.get(record.levelno),
+            datefmt=LOG_DATE_FORMAT
+        )
+        return log_formatter.format(record)
+
+
+formatter = LogFormatter()
+ch = logging.StreamHandler()
+ch.setFormatter(formatter)
+logger = logging.getLogger(__name__)
+logger.addHandler(ch)
+logger.setLevel(logging.DEBUG)
+logger.propagate = False
