add requirements.txt and clear up

requirements.txt

@@ -0,0 +1,4 @@
+requests==2.22.0
+beautifulsoup4==4.8.2
+selenium==3.141.0
+SQLAlchemy==1.3.13

stock_prophet/data/__init__.py

@@ -0,0 +1,21 @@
+import data.db_connection as connector
+
+USERNAME = 'stonkboy'
+PASSWORD = 'stonks228'
+DB_NAME = 'stonks_db'
+HOST = 'localhost'
+PORT = '5432'
+
+
+class Database:
+
+    def __init__(self, username=USERNAME, password=PASSWORD, db_name=DB_NAME, host=HOST, port=PORT):
+        con, meta_data = connector.connect(username, password, db_name, host, port)
+
+        if con:
+            self.stocks, self.analytics, self.markets, self.company = connector.create_table(meta_data)
+
+            meta_data.create_all(con)
+            print("Connect successful! You're awesome!")
+        else:
+            print("Connect is poo!")

stock_database/stokdb.py → stock_prophet/data/db_connection.py

@@ -1,16 +1,16 @@
 import sqlalchemy
 from sqlalchemy import create_engine, MetaData, Table, Column, Integer, String, Date, ForeignKey, Float
-import psycopg2
 
 
-def connect(user, password, database, host='localhost', port='5432'):
+def connect(user, password, database, host, port):
     # postgresql://user:password@host:port/database
     url = 'postgresql+psycopg2://{}:{}@{}:{}/{}'
     url = url.format(user, password, host, port, database)
 
     try:
         con = create_engine(url, client_encoding='utf8')
         meta_data = MetaData(bind=con, reflect=True)
+
     except sqlalchemy.exc.OperationalError:
         print("Database doesn't exists or username/password incorrect.")
         return False, False
@@ -22,19 +22,19 @@ def create_table(meta_data):
     try:
         stoks = Table(
             'stoks', meta_data,
-            Column('id_company', Integer, primary_key=True),
+            Column('id_company', Integer, ForeignKey('company.id_company'), primary_key=True),
             Column('date', Date, primary_key=True),
             Column('high', Float),
             Column('low', Float),
             Column('open', Float),
             Column('close', Float),
             Column('vol', Float)
 
-        )   
+        )
 
         analytics = Table(
             'analytics', meta_data,
-            Column('id_anal', Integer, ForeignKey('stoks.id_company')),
+            Column('id_anal', Integer, primary_key=True),
             Column('name', String),
             Column('rating', Float)
         )
@@ -48,30 +48,15 @@ def create_table(meta_data):
 
         company = Table(
             'company', meta_data,
-            Column('id_compamy', Integer, ForeignKey('stoks.id_company')),
+            Column('id_compamy', Integer, primary_key=True),
             Column('name', String),
             Column('linkname', String),
             Column('id_market', Integer, ForeignKey('markets.id_market'))
         )
     except sqlalchemy.exc.InvalidRequestError:
         print("All table is already.")
         return meta_data.tables['stoks'], meta_data.tables['analytics'], \
-            meta_data.tables['markets'], meta_data.tables['company']
+               meta_data.tables['markets'], meta_data.tables['company']
     else:
         return stoks, analytics, markets, company
 
-
-con, meta_data = connect('stonkboy', 'stonks228', 'stonks_db')
-
-if con != False: 
-    stoks, analytics, markets, company =  create_table(meta_data)
-
-    meta_data.create_all(con)
-    print("Connect successful! You're awesome!")       
-else:
-    print("Connect is poo!")
-
-
-
-
-