refactor(command/database|sondage): update poll model

cogs/poll.py

@@ -88,7 +88,7 @@ class Polls(commands.Cog):
             icon_url=content.get('author').get('icon_url')
         )
         chart_url = URL(chart_base_url + json.dumps(chart_options))
-        e.set_thumbnail(url=chart_url)
+        e.set_thumbnail(url=str(chart_url))
         for field in content.get('fields'):
             e.add_field(
                 name=field.get('name'),

cogs/utils/database.py

@@ -4,7 +4,7 @@ from sqlalchemy.orm import sessionmaker, session
 
 class Database:
     def __init__(self, config):
-        self.engine = create_engine(config.postgresql)
+        self.engine = create_engine(config.postgresql, echo=True)
 
         Session = sessionmaker()
         Session.configure(bind=self.engine)

cogs/utils/models/poll.py

@@ -1,5 +1,6 @@
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy import Column, Integer, Boolean, BigInteger, JSON
+from sqlalchemy import Column, Integer, Text, BigInteger, JSON, ForeignKey
+from sqlalchemy.orm import relationship
 
 Base = declarative_base()
 
@@ -7,15 +8,20 @@ Base = declarative_base()
 class Poll(Base):
     __tablename__ = 'polls'
 
-    id = Column(Integer, primary_key=True)
+    id = Column(Integer, primary_key=True, autoincrement=True)
     channel_id = Column(BigInteger)
     message_id = Column(BigInteger)
-    content = Column(JSON)
-    is_anonymous = Column(Boolean)
-    responses = Column(JSON, nullable=True)
 
-    def __repr__(self):
+    content = Column(JSON)
-        return "<Poll(id='%s', channel_id='%s', message_id='%s', poll='%s', " \
+
-               "is_anonymous='%s', responses='%s')>" % \
+    choice = relationship("Responses")
-               (self.id, self.channel_id, self.message_id, self.content,
+
-                self.is_anonymous, self.responses)
+
+class Responses(Base):
+    __tablename__ = 'responses'
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    user = Column(Text)
+
+    poll_id = Column(Integer, ForeignKey('polls.id'))
+    choice = Column(Integer)

prefixes.json

@@ -1,11 +1,11 @@
 {
   "280805240977227776": [
-    "b!-"
+    "b!"
   ],
   "303633056944881686": [
-    "b!-"
+    "b!"
   ],
   "336642139381301249": [
-    "b!-"
+    "b!"
   ]
 }

requirements.txt

@@ -9,4 +9,5 @@ gitpython
 requests
 psutil
 bcrypt
-tcp_latency
+tcp_latency
+yarl